X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=1937a537355a7a2a11b3f488ed0abbd4eda02ef0;hp=9ea9bc7bf43c57bc00f1af34226934ffcb4f8c6b;hb=f31dbcd6553ca6e7436736a5bc3aeec8fe18cad1;hpb=b6de6fb4bcf50cd347df181121602db9ac2c9eec

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 9ea9bc7bf4..1937a53735 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -16,15 +16,6 @@
 
 -
   type: "environment"
-  configuration:
-    # Debug mode:
-    # - Skip:
-    #   - Download of input data files
-    # - Do:
-    #   - Read data from given zip / xml files
-    #   - Set the configuration as it is done in normal mode
-    # If the section "type: debug" is missing, CFG[DEBUG] is set to 0.
-    CFG[DEBUG]: 0
 
   paths:
     # Top level directories:
@@ -77,8 +68,25 @@
   data-sets:
     plot-performance-trending:
       csit-vpp-perf-mrr-daily-master:
+#      - 15
+#      - 20
+#      - 25
+#      - 30
+#      - 35
+#      - 40
+#      - 45
+#      - 50
+#      - 55
+#      - 60
+#      - 65
+#      - 70
+#      - 75
+#      - 80
+#      - 85
+#      - 90
+#      - 95
         start: 15
-        end: 17 #"lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
+        end: "lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
 
   plot-layouts:
     plot-cpta:
@@ -101,79 +109,56 @@
         linewidth: 1
         showgrid: True
       xaxis:
-        showticklabels: True
-        # title: "csit-vpp-perf-mrr-daily-master/vpp-build"
         title: '<a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-vpp-perf-mrr-daily-master-build</a>/<a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-build</a>'
+        type: "date"
         autorange: True
+        fixedrange: False
         showgrid: True
         gridcolor: "rgb(238, 238, 238)"
+        showline: True
         linecolor: "rgb(238, 238, 238)"
-        fixedrange: False
         zeroline: False
-        tickcolor: "rgb(238, 238, 238)"
-        # tickangle: 0
-        showline: True
         linewidth: 1
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
         autotick: True
+        tickformat: "%m%d"
+        rangeselector:
+          buttons:
+          - count: 14
+            label: "2w"
+            step: "day"
+            stepmode: "backward"
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 2
+            label: "2m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+        # rangeslider: {}
       margin:
         r: 20
-        b: 100
+        # b: 200
         t: 5
         l: 70
       legend:
         orientation: "h"
-        traceorder: "normal"
-#        tracegroupgap: 10
-#        bordercolor: "rgb(238, 238, 238)"
-#        borderwidth: 1
+        # y: -0.5
+        xanchor: "center"
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
+        tracegroupgap: 20
+        bordercolor: "rgb(238, 238, 238)"
+        # borderwidth: 1
       hoverlabel:
         namelength: -1
 
--
-  type: "debug"
-  general:
-    input-format: "xml"  # zip or xml
-    extract: "robot-plugin/output.xml"  # Only for zip
-  builds:
-    # The files must be in the directory DIR[WORKING,DATA]
-    csit-vpp-perf-mrr-daily-master:
-    -
-      build: 1
-      file: "{DIR[WORKING,DATA]}/output_mrr_1.xml"
-    -
-      build: 2
-      file: "{DIR[WORKING,DATA]}/output_mrr_2.xml"
-    -
-      build: 3
-      file: "{DIR[WORKING,DATA]}/output_mrr_3.xml"
-    -
-      build: 4
-      file: "{DIR[WORKING,DATA]}/output_mrr_4.xml"
-    -
-      build: 5
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 6
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 7
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 8
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 9
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 10
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 11
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 12
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-
 -
   type: "static"
   src-path: "{DIR[RST]}"
@@ -181,19 +166,37 @@
 
 -
   type: "input"  # Ignored in debug mode
+#  general:
+#    file-name: "robot-plugin.zip"
+#    file-format: ".zip"
+#    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
+#    extract: "robot-plugin/output.xml"
   general:
     file-name: "output.xml.gz"
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
-#    file-name: "robot-plugin.zip"
-#    file-format: ".zip"
-#    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
-#    extract: "robot-plugin/output.xml"
   builds:
     csit-vpp-perf-mrr-daily-master:
+#    - 15
+#    - 20
+#    - 25
+#    - 30
+#    - 35
+#    - 40
+#    - 45
+#    - 50
+#    - 55
+#    - 60
+#    - 65
+#    - 70
+#    - 75
+#    - 80
+#    - 85
+#    - 90
+#    - 95
       start: 15
-      end: 17 #"lastCompletedBuild"  # take all from the 'start'
+      end: "lastCompletedBuild"  # take all from the 'start'
 
 -
   type: "output"
@@ -222,11 +225,12 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
 
 -
   type: "table"
@@ -240,11 +244,12 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
 
 -
   type: "table"
@@ -258,11 +263,33 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.rst"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t2c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.rst"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t4c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.rst"
 
 
 ################################################################################
@@ -281,1214 +308,830 @@
 
 # L2 - x520
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - xl710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - xl710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
 # IPSec
 
-    - title: "VPP 1T1C IPSec 64B Packet Throughput - {period} Trending"
+    - title: "VPP 1T1C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-1t1c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B Packet Throughput - {period} Trending"
+    - title: "VPP 2T2C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-2t2c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B Packet Throughput - {period} Trending"
+    - title: "VPP 4T4C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-4t4c-xl710"
       data: "plot-performance-trending"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
-      periods:
-      - 1
-      # - 14
-      # - 60
       layout: "plot-cpta"