aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-05-16 15:35:59 +0200
committerTibor Frank <tifrank@cisco.com>2018-05-16 15:35:59 +0200
commit8c0d241b8b4b4289be8333b7fd1d5ce0726414d6 (patch)
treeddaacaff1c30900390f6a7c96739f2c3d4ac7664
parent30f205347619919d15691f4b01da5e730840db38 (diff)
Trending: menu
Change-Id: I8f6528f915c96b5aca8482d8b86db5285e9aa1c9 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--docs/cpta/index.rst44
-rw-r--r--resources/tools/presentation/generator_CPTA.py3
-rw-r--r--resources/tools/presentation/utils.py6
3 files changed, 38 insertions, 15 deletions
diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 3fd92c6f79..bda4ea94a8 100644
--- 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 12ebd46922..883e39f0bd 100644
--- 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 59dbfa634b..ab86bafdd7 100644
--- 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.")