CSIT-1027: Add Index

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

7 files changed, 175 insertions, 165 deletions

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index c9dd9c58e7..e192bb6886 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -7,3 +7,4 @@ Continuous Performance Trending and Analysis
     introduction/index
     trending/index
     data/index
+    indices
diff --git a/docs/cpta/indices.rst b/docs/cpta/indices.rst
new file mode 100644
index 0000000000..6dd08416cb
--- /dev/null
+++ b/docs/cpta/indices.rst
@@ -0,0 +1,4 @@
+Indices and tables
+==================
+
+* :ref:`genindex`
diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst
index b890eeb473..c5ea66ce6e 100644
--- a/docs/cpta/trending/container_memif.rst
+++ b/docs/cpta/trending/container_memif.rst
@@ -13,46 +13,47 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, 64B, 1t1c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520, 64B, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, 64B, 2t2c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520 , 64B, 2t2c- Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520 , 64B, 2t2c- Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, 64B, 4t4c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520, 64B, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-5.html"></iframe><br><br>
 
 IMIX Packet
 ...........
@@ -60,46 +61,47 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
+
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-5.html"></iframe>
-
-    <center><i>Container memif Connections, 10ge2p1x520, IMIX, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-5.html"></iframe><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -113,47 +115,47 @@ L2 Ethernet Switching
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-5.html"></iframe>
-
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-5.html"></iframe>
-
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-5.html"></iframe>
-
-    <center><i>Container memif Connections, 40ge2p1xl710, 64B, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-5.html"></iframe><br><br>
 
 IMIX Packet
 ...........
@@ -161,44 +163,46 @@ IMIX Packet
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-5.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-5.html"></iframe><br><br>
+
 
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 1t1c - Weekly Trend.</i></center><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-5.html"></iframe>
-
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Daily Trend.</i></center><br><br>
+:index:`Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-5.html"></iframe>
-
-    <center><i>Container memif Connections, 40ge2p1xl710, IMIX, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-5.html"></iframe><br><br>
diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst
index cca3464b66..a38ef754c0 100644
--- a/docs/cpta/trending/ip4.rst
+++ b/docs/cpta/trending/ip4.rst
@@ -13,48 +13,47 @@ Base and Scale
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Base and Scale, 10ge2p1x520, 64B, 4t4c - Weekly Trend.</i></center><br><br>
-
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-5.html"></iframe><br><br>
 
 Features
 ````````
@@ -65,47 +64,47 @@ Features
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding - Features, 10ge2p1x520, 64B, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-5.html"></iframe><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -119,44 +118,44 @@ Base, Scale and Features
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-1.html"></iframe><br><br>
 
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend.</i></center><br><br>
+:index:`IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-5.html"></iframe>
-
-    <center><i>IPv4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-5.html"></iframe><br><br>
diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst
index 76c41f0e7f..a44a676fe0 100644
--- a/docs/cpta/trending/ip4_tunnels.rst
+++ b/docs/cpta/trending/ip4_tunnels.rst
@@ -7,44 +7,44 @@ IPv4 Overlay Tunnels
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 1. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-5.html"></iframe>
-
-    <center><i>Figure 2. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 3. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-5.html"></iframe>
-
-    <center><i>Figure 4. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 5. IPv4 Overlay Tunnels - Daily trend.</i></center><br><br>
+:index:`IPv4 Overlay Tunnels, 10ge2p1x520, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-5.html"></iframe>
-
-    <center><i>Figure 6. IPv4 Overlay Tunnels - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-5.html"></iframe><br><br>
diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst
index 6243153871..c3410de1d5 100644
--- a/docs/cpta/trending/ip6.rst
+++ b/docs/cpta/trending/ip6.rst
@@ -10,47 +10,48 @@ NIC 10ge2p1x520
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 1. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-5.html"></iframe>
-
-    <center><i>Figure 2. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 3. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 2t2c - Weekly Trend`.
 
-.. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-5.html"></iframe>
+.. raw:: html
 
-    <center><i>Figure 4. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-1.html"></iframe><br><br>
 
-    <center><i>Figure 5. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 10ge2p1x520, 78B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-5.html"></iframe>
-
-    <center><i>Figure 6. IPv6 Routed-Forwarding, NIC 10ge2p1x520 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-5.html"></iframe><br><br>
 
 NIC 40ge2p1xl710
 ----------------
@@ -61,43 +62,44 @@ NIC 40ge2p1xl710
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 1. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-5.html"></iframe>
-
-    <center><i>Figure 2. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
+
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 3. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-5.html"></iframe>
-
-    <center><i>Figure 4. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 5. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Daily trend.</i></center><br><br>
+:index:`IPv6 Routed-Forwarding, 40ge2p1xl710, 78B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-5.html"></iframe>
-
-    <center><i>Figure 6. IPv6 Routed-Forwarding, NIC 40ge2p1xl710 - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-5.html"></iframe><br><br>
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index 6da2881b4a..6cc929ce75 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -10,44 +10,44 @@ NIC 40ge2p1xl710
 1 Thread, 1 Core
 ~~~~~~~~~~~~~~~~
 
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 1. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 1t1c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-5.html"></iframe>
-
-    <center><i>Figure 2. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-5.html"></iframe><br><br>
 
 2 Threads, 2 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 3. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 2t2c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-5.html"></iframe>
-
-    <center><i>Figure 4. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-5.html"></iframe><br><br>
 
 4 Threads, 4 Cores
 ~~~~~~~~~~~~~~~~~~
 
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Daily Trend`.
+
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-1.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-1.html"></iframe><br><br>
 
-    <center><i>Figure 5. IPSec Crypto HW: IP4 Routed-Forwarding - Daily trend.</i></center><br><br>
+:index:`IPSec Crypto HW: IP4 Routed-Forwarding, 40ge2p1xl710, 64B, 4t4c - Weekly Trend`.
 
 .. raw:: html
 
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-5.html"></iframe>
-
-    <center><i>Figure 6. IPSec Crypto HW: IP4 Routed-Forwarding - Weekly trend.</i></center><br><br>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-5.html"></iframe><br><br>