Trending: menu

Change-Id: I8f6528f915c96b5aca8482d8b86db5285e9aa1c9
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 3fd92c6..bda4ea9 100644 (file)
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -7,15 +7,39 @@ performance trending and analysis jobs and is updated daily. See
 :ref:`trending_methodology` section for more details including trend
 analysis and anomaly detection methodology.
 
-Contents
---------
+.. toctree::
+   :maxdepth: 2
+   :caption: VPP Performance Dashboard
+
+   Dashboard <introduction/index>
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Trending Methodology
+
+   Methodology <methodology/index>
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Trendline Graphs
+
+   trending/l2
+   trending/ip4
+   trending/ip6
+   trending/ip4_tunnels
+   trending/vm_vhost_l2
+   trending/vm_vhost_ip4
+   trending/container_memif
+   trending/ipsec
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Performance Data
+
+   Download <data/index>
 
 .. toctree::
-    :maxdepth: 6
-    :numbered:
-
-    introduction/index
-    methodology/index
-    trending/index
-    data/index
-    indices
+   :maxdepth: 2
+   :caption: Indices and tables
+
+   Index <indices>

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 12ebd46..883e39f 100644 (file)
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -400,9 +400,6 @@ def _generate_all_charts(spec, input_data):
             )
         except KeyError:
             build_info[build] = ("", "")
-        logging.info("{}: {}, {}".format(build,
-                                         build_info[build][0],
-                                         build_info[build][1]))
 
     # Create the header:
     csv_table = list()

diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py
index 59dbfa6..ab86baf 100644 (file)
--- a/resources/tools/presentation/utils.py
+++ b/resources/tools/presentation/utils.py
@@ -198,8 +198,10 @@ def execute_command(cmd):
 
     stdout, stderr = proc.communicate()
 
-    logging.debug(stdout)
-    logging.debug(stderr)
+    if stdout:
+        logging.info(stdout)
+    if stderr:
+        logging.info(stderr)
 
     if proc.returncode != 0:
         logging.error("    Command execution failed.")