PAL Trending: Static content

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

13 files changed, 110 insertions, 551 deletions

diff --git a/docs/cpta/trending/data.rst b/docs/cpta/data/index.rst
index 14ada67d8b..14ada67d8b 100644
--- a/docs/cpta/trending/data.rst
+++ b/docs/cpta/data/index.rst
diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index dcefef7f08..c9dd9c58e7 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -6,3 +6,4 @@ Continuous Performance Trending and Analysis
 
     introduction/index
     trending/index
+    data/index
diff --git a/docs/cpta/introduction/index.rst b/docs/cpta/introduction/index.rst
index 944a56e383..5d31b33328 100644
--- a/docs/cpta/introduction/index.rst
+++ b/docs/cpta/introduction/index.rst
@@ -1,181 +1,8 @@
-Introduction
-============
-
-Purpose
--------
-
-With increasing number of features and code changes in the FD.io VPP data plane
-codebase, it is increasingly difficult to measure and detect VPP data plane
-performance changes. Similarly, once degradation is detected, it is getting
-harder to bisect the source code in search of the Bad code change or addition.
-The problem is further escalated by a large combination of compute platforms
-that VPP is running and used on, including Intel Xeon, Intel Atom, ARM Aarch64.
-
-Existing FD.io CSIT continuous performance trending test jobs help, but they
-rely on human factors for anomaly detection, and as such are error prone and
-unreliable, as the volume of data generated by these jobs is growing
-exponentially.
-
-Proposed solution is to eliminate human factor and fully automate performance
-trending, regression and progression detection, as well as bisecting.
-
-This document describes a high-level design of a system for continuous
-measuring, trending and performance change detection for FD.io VPP SW data
-plane. It builds upon the existing CSIT framework with extensions to its
-throughput testing methodology, CSIT data analytics engine
-(PAL – Presentation-and-Analytics-Layer) and associated Jenkins jobs
-definitions.
-
-Continuous Performance Trending and Analysis
---------------------------------------------
-
-Proposed design replaces existing CSIT performance trending jobs and tests with
-new Performance Trending (PT) CSIT module and separate Performance Analysis (PA)
-module ingesting results from PT and analysing, detecting and reporting any
-performance anomalies using historical trending data and statistical metrics.
-PA does also produce trending graphs with summary and drill-down views across
-all specified tests that can be reviewed and inspected regularly by FD.io
-developers and users community.
-
-Trend Analysis
-``````````````
-
-All measured performance trend data is treated as time-series data that can be
-modelled using normal distribution. After trimming the outliers, the average and
-deviations from average are used for detecting performance change anomalies
-following the three-sigma rule of thumb (a.k.a. 68-95-99.7 rule).
-
-Analysis Metrics
-````````````````
-
-Following statistical metrics are proposed as performance trend indicators over
-the rolling window of last <N> sets of historical measurement data:
-
-    #. Quartiles Q1, Q2, Q3 – three points dividing a ranked set of data set
-       into four equal parts, Q2 is the median of the data.
-    #. Inter Quartile Range IQR=Q3-Q1 – measure of variability, used here to
-       eliminate outliers.
-    #. Outliers – extreme values that are at least 1.5*IQR below Q1, or at
-       least 1.5*IQR above Q3.
-    #. Trimmed Moving Average (TMA) – average across the data set of the rolling
-       window of <N> values without the outliers. Used here to calculate TMSD.
-    #. Trimmed Moving Standard Deviation (TMSD) – standard deviation over the
-       data set of the rolling window of <N> values without the outliers,
-       requires calculating TMA. Used here for anomaly detection.
-    #. Moving Median (MM) - median across the data set of the rolling window of
-       <N> values with all data points, including the outliers. Used here for
-       anomaly detection.
-
-Anomaly Detection
-`````````````````
-
-Based on the assumption that all performance measurements can be modelled using
-normal distribution, a three-sigma rule of thumb is proposed as the main
-criteria for anomaly detection.
-
-Three-sigma rule of thumb, aka 68–95–99.7 rule, is a shorthand used to capture
-the percentage of values that lie within a band around the average (mean) in a
-normal distribution within a width of two, four and six standard deviations.
-More accurately 68.27%, 95.45% and 99.73% of the result values should lie within
-one, two or three standard deviations of the mean, see figure below.
-
-To verify compliance of test result with value X against defined trend analysis
-metric and detect anomalies, three simple evaluation criteria are proposed:
-
-::
-
-    Test Result Evaluation      Reported Result     Reported Reason     Trending Graph Markers
-    ==========================================================================================
-          Normal                      Pass              Normal            Part of plot line
-          Regression                  Fail              Regression        Red circle
-          Progression                 Pass              Progression       Green circle
-
-Jenkins job cumulative results:
-
-    #. Pass - if all detection results are Pass or Warning.
-    #. Fail - if any detection result is Fail.
-
-Performance Trending (PT)
-`````````````````````````
-
-CSIT PT runs regular performance test jobs finding MRR, PDR and NDR per test
-cases. PT is designed as follows:
-
-    #. PT job triggers:
-
-        #. Periodic e.g. daily.
-        #. On-demand gerrit triggered.
-        #. Other periodic TBD.
-
-    #. Measurements and calculations per test case:
-
-        #. MRR Max Received Rate
-
-            #. Measured: Unlimited tolerance of packet loss.
-            #. Send packets at link rate, count total received packets, divide
-               by test trial period.
-
-        #. Optimized binary search bounds for PDR and NDR tests:
-
-            #. Calculated: High and low bounds for binary search based on MRR
-               and pre-defined Packet Loss Ratio (PLR).
-            #. HighBound=MRR, LowBound=to-be-determined.
-            #. PLR – acceptable loss ratio for PDR tests, currently set to 0.5%
-               for all performance tests.
-
-        #. PDR and NDR:
-
-            #. Run binary search within the calculated bounds, find PDR and NDR.
-            #. Measured: PDR Partial Drop Rate – limited non-zero tolerance of
-               packet loss.
-            #. Measured: NDR Non Drop Rate - zero packet loss.
-
-    #. Archive MRR, PDR and NDR per test case.
-    #. Archive counters collected at MRR, PDR and NDR.
-
-Performance Analysis (PA)
-`````````````````````````
-
-CSIT PA runs performance analysis, change detection and trending using specified
-trend analysis metrics over the rolling window of last <N> sets of historical
-measurement data. PA is defined as follows:
-
-    #. PA job triggers:
-
-        #. By PT job at its completion.
-        #. Manually from Jenkins UI.
-
-    #. Download and parse archived historical data and the new data:
-
-        #. New data from latest PT job is evaluated against the rolling window
-           of <N> sets of historical data.
-        #. Download RF output.xml files and compressed archived data.
-        #. Parse out the data filtering test cases listed in PA specification
-           (part of CSIT PAL specification file).
-
-    #. Calculate trend metrics for the rolling window of <N> sets of historical data:
-
-        #. Calculate quartiles Q1, Q2, Q3.
-        #. Trim outliers using IQR.
-        #. Calculate TMA and TMSD.
-        #. Calculate normal trending range per test case based on TMA and TMSD.
-
-    #. Evaluate new test data against trend metrics:
-
-        #. If within the range of (TMA +/- 3*TMSD) => Result = Pass,
-           Reason = Normal.
-        #. If below the range => Result = Fail, Reason = Regression.
-        #. If above the range => Result = Pass, Reason = Progression.
-
-    #. Generate and publish results
-
-        #. Relay evaluation result to job result.
-        #. Generate a new set of trend analysis summary graphs and drill-down
-           graphs.
-
-            #. Summary graphs to include measured values with Normal,
-               Progression and Regression markers. MM shown in the background if
-               possible.
-            #. Drill-down graphs to include MM, TMA and TMSD.
-
-        #. Publish trend analysis graphs in html format.
+VPP Performance Trending
+========================
+
+This auto-generated document contains VPP performance trending graphs and data.
+It is generated using CSIT continuous trending test and analysis jobs and is
+updated daily. More detail is available on
+`CSIT Performance Trending and Analysis <https://wiki.fd.io/view/CSIT/PerformanceTrendingAnalysis>`_
+wiki page.
diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index 40ebc522e5..6c6251df3a 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -8,55 +8,37 @@ NIC 10ge2p1x520
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. Container memif Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. Container memif Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. Container memif Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. Container memif Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. Container memif Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. Container memif Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -65,52 +47,34 @@ NIC 40ge2p1xl710
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. Container memif Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. Container memif Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. Container memif Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. Container memif Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. Container memif Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. Container memif Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/index.rst b/docs/cpta/trending/index.rst
index 6014788cb4..dcc50bfe8d 100644
--- a/docs/cpta/trending/index.rst
+++ b/docs/cpta/trending/index.rst
@@ -1,5 +1,5 @@
-VPP Performance Trend
-=====================
+Trending Graphs
+===============
 
 .. toctree::
 
@@ -10,4 +10,3 @@ VPP Performance Trend
     vm_vhost
     container_memif
     ipsec
-    data
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index c8b4f8be33..660d4fd524 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -11,55 +11,37 @@ IPv4 Routed-Forwarding - Base and Scale
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend - base and scale.*
+    <center><i>Figure 1. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend - base and scale.*
+    <center><i>Figure 2. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend - base and scale.*
+    <center><i>Figure 3. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend - base and scale.*
+    <center><i>Figure 4. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend - base and scale.*
+    <center><i>Figure 5. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend - base and scale.*
+    <center><i>Figure 6. IPv4 Routed-Forwarding - Base and Scale, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 
 IPv4 Routed-Forwarding - Features
@@ -69,55 +51,37 @@ IPv4 Routed-Forwarding - Features
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend - features.*
+    <center><i>Figure 1. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend - features.*
+    <center><i>Figure 2. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend - features.*
+    <center><i>Figure 3. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend - features.*
+    <center><i>Figure 4. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend - features.*
+    <center><i>Figure 5. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend - features.*
+    <center><i>Figure 6. IPv4 Routed-Forwarding - Features, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -126,53 +90,34 @@ NIC 40ge2p1xl710
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
-
+    <center><i>Figure 6. IPv4 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst
index a9de1a7614..e7050de140 100644
--- a/docs/cpta/trending/ip4_tunnels.rst
+++ b/docs/cpta/trending/ip4_tunnels.rst
@@ -5,52 +5,34 @@ IPv4 Overlay Tunnels
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 11f4b4176d..1dfbf58f22 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -8,55 +8,37 @@ NIC 10ge2p1x520
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -65,52 +47,34 @@ NIC 40ge2p1xl710
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index 9286a014a5..1607348c91 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -5,52 +5,34 @@ IPSec Crypto HW: IP4 Routed-Forwarding
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst
index 88c2be3e0d..7237d43c04 100644
--- a/docs/cpta/trending/l2.rst
+++ b/docs/cpta/trending/l2.rst
@@ -11,55 +11,37 @@ L2 Ethernet Switching - Base and Scale
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend - base and scale.*
+    <center><i>Figure 1. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend - base and scale.*
+    <center><i>Figure 2. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend - base and scale.*
+    <center><i>Figure 3. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend - base and scale.*
+    <center><i>Figure 4. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend - base and scale.*
+    <center><i>Figure 5. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend - base and scale.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend - base and scale.*
+    <center><i>Figure 6. L2 Ethernet Switching - Base and Scale,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 L2 Ethernet Switching - Features
 ````````````````````````````````
@@ -68,55 +50,37 @@ L2 Ethernet Switching - Features
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend - features.*
+    <center><i>Figure 1. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend - features.*
+    <center><i>Figure 2. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend - features.*
+    <center><i>Figure 3. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend - features.*
+    <center><i>Figure 4. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend - features.*
+    <center><i>Figure 5. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend - features.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend - features.*
+    <center><i>Figure 6. L2 Ethernet Switching - Features,  NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -125,52 +89,34 @@ NIC 40ge2p1xl710
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. L2 Ethernet Switching,  NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
diff --git a/docs/cpta/trending/vm_vhost.rst b/docs/cpta/trending/vm_vhost.rst
index da2c38f833..2a49ab834a 100644
--- a/docs/cpta/trending/vm_vhost.rst
+++ b/docs/cpta/trending/vm_vhost.rst
@@ -8,109 +8,73 @@ NIC 10ge2p1x520
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-1.html"></iframe>
 
-*Figure 7. Daily trend.*
+    <center><i>Figure 5. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-5.html"></iframe>
 
-*Figure 8. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-30.html"></iframe>
-
-*Figure 9. Monthly trend.*
+    <center><i>Figure 6. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-1.html"></iframe>
 
-*Figure 10. Daily trend.*
+    <center><i>Figure 7. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-5.html"></iframe>
 
-*Figure 11. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-30.html"></iframe>
-
-*Figure 12. Monthly trend.*
+    <center><i>Figure 8. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-1.html"></iframe>
 
-*Figure 13. Daily trend.*
+    <center><i>Figure 9. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-5.html"></iframe>
 
-*Figure 14. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-30.html"></iframe>
-
-*Figure 15. Monthly trend.*
+    <center><i>Figure 10. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-1.html"></iframe>
 
-*Figure 16. Daily trend.*
+    <center><i>Figure 11. VM vhost Connections, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-5.html"></iframe>
 
-*Figure 17. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-30.html"></iframe>
-
-*Figure 18. Monthly trend.*
+    <center><i>Figure 12. VM vhost Connections, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -119,52 +83,34 @@ NIC 40ge2p1xl710
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-1.html"></iframe>
 
-*Figure 1. Daily trend.*
+    <center><i>Figure 1. VM vhost Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-5.html"></iframe>
 
-*Figure 2. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-30.html"></iframe>
-
-*Figure 3. Monthly trend.*
+    <center><i>Figure 2. VM vhost Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 3. VM vhost Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 4. VM vhost Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-1.html"></iframe>
 
-*Figure 4. Daily trend.*
+    <center><i>Figure 5. VM vhost Connections, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
 
 .. raw:: html
 
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-5.html"></iframe>
 
-*Figure 5. Weekly trend.*
-
-.. raw:: html
-
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-30.html"></iframe>
-
-*Figure 6. Monthly trend.*
+    <center><i>Figure 6. VM vhost Connections, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 0c317c05ce..3b8c9fd3ab 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -291,19 +291,21 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
             "color": anomalies_res,
             "colorscale": color_scale,
             "showscale": True,
-
+            "line": {
+                "width": 2
+            },
             "colorbar": {
                 "y": 0.5,
                 "len": 0.8,
-                "title": "Results Clasification",
+                "title": "Circles Marking Data Classification",
                 "titleside": 'right',
                 "titlefont": {
                     "size": 14
                 },
                 "tickmode": 'array',
                 "tickvals": [0.125, 0.375, 0.625, 0.875],
-                "ticktext": ["Outlier", "Regress", "Normal", "Progress"],
-                "ticks": 'outside',
+                "ticktext": ["Outlier", "Regression", "Normal", "Progression"],
+                "ticks": "",
                 "ticklen": 0,
                 "tickangle": -90,
                 "thickness": 10
@@ -313,9 +315,8 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
     traces.append(trace_anomalies)
 
     if show_moving_median:
-        min_periods = moving_win_size / 2 + 1
         data_mean_y = pd.Series(data_y).rolling(
-            window=moving_win_size, min_periods=min_periods).median()
+            window=moving_win_size, min_periods=2).median()
         trace_median = plgo.Scatter(
             x=data_x,
             y=data_mean_y,
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index cde9e3346d..6101425783 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -123,6 +123,8 @@
 #        tracegroupgap: 10
 #        bordercolor: "rgb(238, 238, 238)"
 #        borderwidth: 1
+      hoverlabel:
+        namelength: -1
 
 -
   type: "debug"