PAL Trending: Static content

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

9 files changed, 92 insertions, 372 deletions

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/data.rst b/docs/cpta/trending/data.rst
deleted file mode 100644
index 14ada67d8b..0000000000
--- a/docs/cpta/trending/data.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Trending Data
-=============
-
-The data used to generate the trending plots is available in a CSV and
-pretty ASCII formats:
-
-    - `csv format <../_static/vpp/cpta-trending.csv>`_,
-    - `pretty ASCII format <../_static/vpp/cpta-trending.txt>`_,
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>