X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=9b47083b2b3c02a8cc91c68f3d68c21a94288589;hp=e1b80351b2d14512f02d1c87ba969118c09e8fae;hb=9964155b56020914494f7341c2d1162f2ac9d720;hpb=061ea1864e550ea7f9fbc6bc2a096b2cedd94b96

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index e1b80351b2..9b47083b2b 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:
@@ -90,7 +81,7 @@
       yaxis:
         showticklabels: True
         tickformat: ".3s"
-        title: "Throughput [Mpps]"
+        title: "Throughput [pps]"
         hoverformat: ".4s"
         range: []
         gridcolor: "rgb(238, 238, 238)"
@@ -102,7 +93,7 @@
         showgrid: True
       xaxis:
         showticklabels: True
-        title: "/csit/job/{job}/$id"
+        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>'
         autorange: True
         showgrid: True
         gridcolor: "rgb(238, 238, 238)"
@@ -110,13 +101,14 @@
         fixedrange: False
         zeroline: False
         tickcolor: "rgb(238, 238, 238)"
+        # tickangle: 0
         showline: True
         linewidth: 1
         autotick: True
       margin:
         r: 20
         b: 50
-        t: 50
+        t: 5
         l: 70
       legend:
         orientation: "h"
@@ -127,51 +119,6 @@
       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]}"
@@ -179,15 +126,16 @@
 
 -
   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:
       start: 15
@@ -204,6 +152,89 @@
     pdf:
     - minimal
 
+################################################################################
+###                               T A B L E S                                ###
+################################################################################
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '1T1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '2T2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '4T4C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  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"
+
+
 ################################################################################
 ###                                 C P T A                                  ###
 ################################################################################
@@ -228,8 +259,8 @@
       - "result"
       periods:
       - 1
-      - 14
-      # # - 60
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -240,7 +271,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -252,7 +283,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -264,7 +295,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -276,7 +307,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -288,7 +319,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -302,7 +333,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -314,7 +345,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -326,7 +357,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -340,7 +371,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -352,7 +383,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -364,7 +395,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -376,7 +407,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -388,7 +419,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -400,7 +431,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -409,36 +440,36 @@
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -450,7 +481,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -462,7 +493,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -474,7 +505,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -488,7 +519,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -500,7 +531,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -512,7 +543,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -521,36 +552,36 @@
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -562,7 +593,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -574,7 +605,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -586,7 +617,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -600,7 +631,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -612,7 +643,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -624,7 +655,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -638,7 +669,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -650,7 +681,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -662,7 +693,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -676,7 +707,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -688,7 +719,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -700,7 +731,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -714,7 +745,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -726,7 +757,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -738,7 +769,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -752,7 +783,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -764,7 +795,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -776,7 +807,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -790,7 +821,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -802,7 +833,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -814,7 +845,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -828,7 +859,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -840,7 +871,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -852,7 +883,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -866,7 +897,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -878,7 +909,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -890,7 +921,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -904,7 +935,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -916,7 +947,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -928,7 +959,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -942,7 +973,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -954,7 +985,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -966,7 +997,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -980,7 +1011,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -992,7 +1023,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1004,7 +1035,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1018,7 +1049,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1030,7 +1061,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1042,7 +1073,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1056,7 +1087,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1068,7 +1099,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1080,7 +1111,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1089,37 +1120,37 @@
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1128,37 +1159,37 @@
     - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1167,37 +1198,37 @@
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1206,37 +1237,37 @@
     - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1250,7 +1281,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1262,7 +1293,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1274,7 +1305,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1288,7 +1319,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1300,7 +1331,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1312,7 +1343,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1321,37 +1352,37 @@
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1360,37 +1391,37 @@
     - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} 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
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1404,7 +1435,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1416,7 +1447,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1428,6 +1459,6 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"