NSB Prox Grafana dashboard updates 21/44921/1
authorAbhijit Sinha <abhijit.sinha@intel.com>
Thu, 12 Oct 2017 10:51:50 +0000 (11:51 +0100)
committerAbhijit Sinha <abhijit.sinha@intel.com>
Thu, 12 Oct 2017 10:51:50 +0000 (11:51 +0100)
JIRA: YARDSTICK-802

Updating the Grafana dashboards with common data
format for all BM and Opensatck Prox tests and
adding minor improvements

- Correct the test description
- Re-run the tests and verify that all the
  fields are graph correct
- Label the axes correctly.
  eg: For Throughput added label "MPPS"

Change-Id: I62b471926fe3c4c8876b70053a92d06f4373e296
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
34 files changed:
dashboard/Prox_BM_ACL-2Port-1507803762832.json [moved from dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json with 81% similarity]
dashboard/Prox_BM_ACL-4Port-1507803770817.json [moved from dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json with 83% similarity]
dashboard/Prox_BM_BNG-4Port-1507803777936.json [moved from dashboard/Prox_BM_BNG-4Port-1506596922499.json with 83% similarity]
dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json [moved from dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json with 83% similarity]
dashboard/Prox_BM_L2FWD-2Port-1507804495722.json [moved from dashboard/Prox_BM_L2FWD-2Port-1501492823086.json with 78% similarity]
dashboard/Prox_BM_L2FWD-4Port-1507804504588.json [moved from dashboard/Prox_BM_L2FWD-4Port-1501498495048.json with 81% similarity]
dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json [moved from dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json with 80% similarity]
dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json [moved from dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json with 83% similarity]
dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json [moved from dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json with 82% similarity]
dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json [moved from dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json with 83% similarity]
dashboard/Prox_BM_L3FWD-2Port-1507803870940.json [moved from dashboard/Prox_BM_L3FWD-2Port-1500900469978.json with 81% similarity]
dashboard/Prox_BM_L3FWD-4Port-1507803878020.json [moved from dashboard/Prox_BM_L3FWD-4Port-1500900168552.json with 84% similarity]
dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json [moved from dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json with 83% similarity]
dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json [moved from dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json with 79% similarity]
dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json [moved from dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json with 82% similarity]
dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json [moved from dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json with 72% similarity]
dashboard/Prox_BM_vPE-4Port-1507804058631.json [moved from dashboard/Prox_BM_vPE-4Port-1507195330973.json with 98% similarity]
dashboard/Prox_Heat_ACL-2Port-1507804110005.json [moved from dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json with 80% similarity]
dashboard/Prox_Heat_ACL-4Port-1507804119688.json [moved from dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json with 83% similarity]
dashboard/Prox_Heat_BNG-4Port-1507804128983.json [moved from dashboard/Prox_Heat_BNG-4Port-1506596971791.json with 83% similarity]
dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json [moved from dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json with 83% similarity]
dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json [moved from dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json with 80% similarity]
dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json [moved from dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json with 81% similarity]
dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json [moved from dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json with 80% similarity]
dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json [moved from dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json with 83% similarity]
dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json [moved from dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json with 82% similarity]
dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json [moved from dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json with 84% similarity]
dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json [moved from dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json with 80% similarity]
dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json [moved from dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json with 81% similarity]
dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json [moved from dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json with 83% similarity]
dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json [moved from dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json with 82% similarity]
dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json [moved from dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json with 83% similarity]
dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json [moved from dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json with 72% similarity]
dashboard/Prox_Heat_vPE-4Port-1507804883050.json [moved from dashboard/Prox_Heat_vPE-4Port-1507195265889.json with 98% similarity]

   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_ACL_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "BM",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_acl-2",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "BM",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now/w",
     "to": "now"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 26,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_ACL-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_ACL_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "BM",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_acl-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "BM",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-06-27T09:43:32.713Z",
-    "to": "2017-06-27T09:46:04.003Z"
+    "from": "2017-10-11T12:04:28.624Z",
+    "to": "2017-10-11T12:10:22.755Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 18,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_ACL-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_BNG-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "BNG"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -61,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "BNG"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-11T08:30:38.655Z",
     "to": "2017-08-11T08:33:45.419Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_BNG-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_BNG-QoS-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "BNG QoS"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG QoS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "BNG QoS"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-11T08:30:38.655Z",
     "to": "2017-08-11T08:33:45.419Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_BNG-QoS-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "L3Fwd VNF stats",
+          "title": "L2Fwd VNF stats",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2Fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-11T13:40:37.452Z",
-    "to": "2017-07-11T13:42:24.186Z"
+    "from": "2017-10-03T09:39:42.199Z",
+    "to": "2017-10-03T09:47:01.687Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 5,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD-2Port",
+  "version": 9
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L2fwd",
-    "4Port",
-    "BM"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L2fwd",
+    "4Port",
+    "BM"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T10:48:35.874Z",
-    "to": "2017-07-31T10:50:34.033Z"
+    "from": "2017-10-02T08:41:16.579Z",
+    "to": "2017-10-02T08:58:57.509Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD-4Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Multiflow-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port",
-    "L2FWD_Multiflow"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2FWD_Multiflow"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T10:00:17.289Z",
-    "to": "2017-08-03T10:02:23.481Z"
+    "from": "2017-09-29T13:57:22.710Z",
+    "to": "2017-09-29T14:04:48.839Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 5,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Multiflow-2Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Multiflow-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2FWD_Multiflow",
-    "BM"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2FWD Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2FWD_Multiflow",
+    "BM"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T10:26:14.359Z",
-    "to": "2017-08-03T10:28:43.436Z"
+    "from": "now/y",
+    "to": "now/y"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Multiflow-4Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Packet_Touch_Test-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "2Port",
-    "L2Fwd Packet Touch"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "2Port",
+    "L2Fwd Packet Touch"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-19T13:01:50.468Z",
     "to": "2017-07-19T13:04:44.745Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 17,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Packet_Touch-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L2FWD_Packet_Touch_Test-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "L2Fwd packet touch"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "L2Fwd packet touch"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-19T13:49:40.514Z",
-    "to": "2017-07-19T13:51:37.781Z"
+    "from": "2017-09-29T13:38:49.432Z",
+    "to": "2017-09-29T13:46:53.369Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L2FWD_Packet_Touch-4Port",
+  "version": 6
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L3FWD-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "L3Fwd",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "L3Fwd",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-24T12:42:38.308Z",
-    "to": "2017-07-24T12:45:12.874Z"
+    "from": "2017-10-02T11:24:07.295Z",
+    "to": "2017-10-02T11:26:12.649Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L3FWD-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_L3FWD-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "L3Fwd"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size",
+          "title": "Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "L3Fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-24T11:06:05.950Z",
-    "to": "2017-07-24T11:09:07.902Z"
+    "from": "2017-09-29T14:12:51.977Z",
+    "to": "2017-09-29T14:19:29.296Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_L3FWD-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_LB_1to4-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BM",
-    "LB"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second with an accepted minimal packet loss for a specified packet size</p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
-        {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
-          "editable": true,
-          "error": false,
-          "height": "40",
-          "id": 8,
-          "isNew": true,
-          "links": [],
-          "mode": "html",
-          "span": 12,
-          "title": "",
-          "type": "text"
-        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 10,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Load Balancer VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
+        {
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
+          "editable": true,
+          "error": false,
+          "height": "40",
+          "id": 8,
+          "links": [],
+          "mode": "html",
+          "span": 12,
+          "title": "",
+          "type": "text"
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_lb-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BM",
+    "LB"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-08-03T17:29:12.741Z",
-    "to": "2017-08-03T17:30:59.111Z"
+    "from": "2017-10-10T13:42:45.059Z",
+    "to": "2017-10-10T13:48:35.750Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_LB_1to4-4Port",
+  "version": 10
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_MPLS_tag_untag_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "MPLS",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.xe0.in_packets"
+                      "tg__0.xe1.in_packets"
                     ],
                     "type": "field"
                   },
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "MPLS",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-14T10:36:36.944Z",
-    "to": "2017-07-14T10:39:35.738Z"
+    "from": "2017-09-28T15:52:05.857Z",
+    "to": "2017-09-28T16:12:48.623Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_MPLS_tagging-2Port",
+  "version": 8
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_MPLS_tag_untag_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "4Port",
-    "MPLS"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats:  Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "4Port",
+    "MPLS"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-10T18:44:50.858Z",
-    "to": "2017-07-10T18:52:56.422Z"
+    "from": "2017-09-28T16:20:28.692Z",
+    "to": "2017-09-28T16:22:45.584Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_MPLS_tagging-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_BM_Packet_Buffering_Test-1Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "BM",
-    "Buffering",
-    "1Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n    given the requirement that the latency of each packet is at least\n    125 millisecond</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet Buffering  VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out vs In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 9,
-          "isNew": true,
+          "grid": {},
+          "id": 2,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "Max Latency",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "C",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.LatencyMax.2"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Latency stats",
+          "title": "TG Throughput Stats",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Latency",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
-          "id": 2,
-          "isNew": true,
+          "grid": {},
+          "id": 5,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "TG TX Throughput",
+              "alias": "TG Packet Size",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.Throughput"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
-            },
-            {
-              "alias": "TG RX Throughput",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.RxThroughput"
+                      "tg__0.PktSize"
                     ],
                     "type": "field"
                   },
               "tags": []
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "TG Throughput Stats",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
-          },
-          "yaxes": [
+          "thresholds": [
             {
-              "format": "pps",
-              "label": "Throughput",
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_YARDSTICK}",
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 5,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": false,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "alias": "TG Packet Size",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_baremetal_buffering-1",
-              "policy": "default",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.PktSize"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "BM",
+    "Buffering",
+    "1Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-14T15:56:09.546Z",
-    "to": "2017-07-14T15:59:17.008Z"
+    "from": "2017-10-10T16:10:20.580Z",
+    "to": "2017-10-10T16:16:35.111Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_BM_Packet_Buffering-1Port",
+  "version": 7
 }
\ No newline at end of file
@@ -51,7 +51,7 @@
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats:  Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
     "list": []
   },
   "time": {
-    "from": "2017-10-04T10:48:59.715Z",
-    "to": "2017-10-04T10:56:46.895Z"
+    "from": "2017-10-09T11:05:30.701Z",
+    "to": "2017-10-09T11:11:21.952Z"
   },
   "timepicker": {
     "refresh_intervals": [
   },
   "timezone": "browser",
   "title": "Prox_BM_vPE-4Port",
-  "version": 6
+  "version": 10
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_ACL_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "Heat",
-    "2Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_ACL_Heat_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "policy": "default",
-              "dsType": "influxdb",
-              "resultFormat": "time_series",
-              "tags": [],
-              "groupBy": [
-                {
-                  "type": "time",
-                  "params": [
-                    "$interval"
-                  ]
-                },
-                {
-                  "type": "fill",
-                  "params": [
-                    "null"
-                  ]
-                }
-              ],
-              "select": [
-                [
-                  {
-                    "type": "field",
-                    "params": [
-                      "tg__0.DropPackets"
-                    ]
-                  },
-                  {
-                    "type": "mean",
-                    "params": []
-                  }
-                ]
-              ],
-              "refId": "B",
-              "measurement": "tc_prox_heat_context_acl-2",
-              "alias": "TG Dropped Packets"
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
+    },
+    {
+      "collapse": false,
+      "height": 250,
+      "panels": [],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Dashboard Row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "Heat",
+    "2Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-07T15:33:56.340Z",
-    "to": "2017-07-07T15:36:11.941Z"
+    "from": "2017-10-11T15:30:57.312Z",
+    "to": "2017-10-11T15:38:33.455Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 7,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_ACL-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_ACL_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "ACL",
-    "Heat",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "ACL VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_acl-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "ACL",
+    "Heat",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-07T15:00:35.628Z",
     "to": "2017-07-07T17:54:24.315Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 12,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_ACL-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_BNG-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BNG",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -61,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BNG",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-09-12T15:44:08.523Z",
     "to": "2017-09-12T15:49:33.638Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_BNG-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_BNG-QoS-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "BNG QoS",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "BNG QoS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "BNG QoS",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-09-12T15:44:08.523Z",
-    "to": "2017-09-12T15:49:33.638Z"
+    "from": "2017-10-04T14:48:46.365Z",
+    "to": "2017-10-04T15:52:41.999Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_BNG-QoS-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "2Port",
-    "Heat",
-    "L2fwd"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "show": true,
+            "sortDesc": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Tgen Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "2Port",
+    "Heat",
+    "L2fwd"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T09:13:44.495Z",
-    "to": "2017-07-31T09:16:49.248Z"
+    "from": "2017-10-03T09:54:49.531Z",
+    "to": "2017-10-03T10:00:54.659Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD-2Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "Heat",
-    "L2fwd",
-    "4Port"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "Heat",
+    "L2fwd",
+    "4Port"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-31T10:37:09.211Z",
-    "to": "2017-07-31T10:39:16.625Z"
+    "from": "2017-10-09T15:07:30.493Z",
+    "to": "2017-10-09T15:12:46.910Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Multiflow-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "2Port",
-    "Heat",
-    "L2FWD_Multiflow"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_Heat_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst  ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2Fwd Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "2Port",
+    "Heat",
+    "L2FWD_Multiflow"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-03T11:34:41.442Z",
     "to": "2017-08-03T11:36:40.434Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Multiflow-2Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Multiflow-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2FWD_Multiflow",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_4Port_Test</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated)  The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L2FWD Multiflow VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2FWD_Multiflow",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-03T11:46:53.873Z",
     "to": "2017-08-03T11:48:46.478Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Multiflow-4Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Packet_Touch_Test-2Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "2Port",
-    "L2Fwd Packet Touch",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "bytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "2Port",
+    "L2Fwd Packet Touch",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-25T14:36:56.312Z",
-    "to": "2017-07-25T14:47:31.476Z"
+    "from": "2017-10-03T10:14:05.964Z",
+    "to": "2017-10-03T10:20:38.843Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Packet_Touch-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L2FWD_Packet_Touch_Test-4Port",
-  "tags": [
-    "NSB",
-    "Prox",
-    "4Port",
-    "L2Fwd packet touch",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
@@ -60,7 +55,6 @@
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -73,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "VNF stats: Packet In, Forward and Dropped",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "NSB",
+    "Prox",
+    "4Port",
+    "L2Fwd packet touch",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-26T17:27:26.963Z",
-    "to": "2017-07-26T17:30:56.567Z"
+    "from": "now/y",
+    "to": "now/y"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L2FWD_Packet_Touch-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L3FWD-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L3Fwd",
-    "2Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L3Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L3Fwd",
+    "2Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-28T17:04:13.512Z",
     "to": "2017-07-28T17:13:15.023Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L3FWD-2Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_L3FWD-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "L3Fwd",
-    "4Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "L3Fwd VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 in packets",
+              "alias": "TG xe-0 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen TX Throughput",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Tgen Tx vs Rx Throughput",
+          "title": "TG Tx vs Rx Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "L3Fwd",
+    "4Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-08-02T13:52:27.313Z",
     "to": "2017-08-02T13:54:35.713Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 3,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_L3FWD-4Port",
+  "version": 4
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_LB_1to4-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "LB",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "25px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "height": "25",
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -75,7 +68,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
-        {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
-          "editable": true,
-          "error": false,
-          "height": "40",
-          "id": 8,
-          "isNew": true,
-          "links": [],
-          "mode": "html",
-          "span": 12,
-          "title": "",
-          "type": "text"
-        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 10,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Load Balancer VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
+        {
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n",
+          "editable": true,
+          "error": false,
+          "height": "40",
+          "id": 8,
+          "links": [],
+          "mode": "html",
+          "span": 12,
+          "title": "",
+          "type": "text"
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Tx vs Rx Throughput",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2.5,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2.5,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                   "type": "fill"
                 }
               ],
-              "measurement": "tc_prox_baremetal_lb-4",
+              "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2.5
             },
             {
-              "alias": "TG Dropped Packets",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_lb-4",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.DropPackets"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2.5
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Packet size and Drop Packets",
+          "title": "TG Packet size",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "LB",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-09-19T12:39:56.933Z",
-    "to": "2017-09-19T12:46:07.167Z"
+    "from": "2017-10-10T13:21:20.290Z",
+    "to": "2017-10-10T13:33:42.920Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_LB_1to4-4Port",
+  "version": 7
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_MPLS_tag_untag_Test-2Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "MPLS",
-    "2Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "MPLS",
+    "2Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-26T16:44:35.417Z",
     "to": "2017-07-26T16:48:07.816Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 1,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_MPLS_tagging-2Port",
+  "version": 5
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_MPLS_tag_untag_Test-4Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "4Port",
-    "MPLS",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and  forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "MPLS VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats:  Out packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port Stats: In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Throughput Stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "pps",
-              "label": "Throughput",
+              "format": "short",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Packet size",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "4Port",
+    "MPLS",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "2017-07-26T17:04:06.296Z",
     "to": "2017-07-26T17:06:02.094Z"
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 2,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_MPLS_tagging-4Port",
+  "version": 3
 }
\ No newline at end of file
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
       "name": "Graph",
       "version": ""
     },
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.1"
-    },
     {
       "type": "datasource",
       "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
     }
   ],
-  "id": null,
-  "title": "Prox_Heat_Packet_Buffering_Test-1Port",
-  "tags": [
-    "yardstick",
-    "NSB",
-    "Prox",
-    "Buffering",
-    "1Port",
-    "Heat"
-  ],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": false,
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n    given the requirement that the latency of each packet is at least\n    125 millisecond</p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -74,7 +67,6 @@
           "error": false,
           "height": "40",
           "id": 7,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "300px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "height": "300",
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "Packet Buffering VNF stats",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
           "type": "text"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Tgen xe-0 Out packets",
+              "alias": "TG xe-0 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
               "tags": []
             },
             {
-              "alias": "Tgen xe-0 In packets",
+              "alias": "TG xe-0 In packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
               "tags": []
             }
           ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
+            },
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
+            }
+          ],
           "timeFrom": null,
           "timeShift": null,
           "title": "TG Port stats: Out vs In packets",
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 9,
-          "isNew": true,
+          "grid": {},
+          "id": 2,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
                 ]
               ],
               "tags": []
+            }
+          ],
+          "thresholds": [
+            {
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "alias": "Max Latency",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "C",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.LatencyMax.2"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG Latency stats",
+          "title": "TG TX vs RX Throughput",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
               "format": "short",
-              "label": "Latency",
+              "label": "Throughput in MPPS",
               "logBase": 1,
               "max": null,
               "min": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_YARDSTICK}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
-          "id": 2,
-          "isNew": true,
+          "grid": {},
+          "id": 5,
           "legend": {
             "alignAsTable": true,
             "avg": true,
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "TG TX Throughput",
+              "alias": "TG Packet Size",
               "dsType": "influxdb",
               "groupBy": [
                 {
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
                 [
                   {
                     "params": [
-                      "tg__0.Throughput"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
-            },
-            {
-              "alias": "TG RX Throughput",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "B",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.RxThroughput"
+                      "tg__0.PktSize"
                     ],
                     "type": "field"
                   },
               "tags": []
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "TG Throughput Stats",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
-          },
-          "yaxes": [
+          "thresholds": [
             {
-              "format": "pps",
-              "label": "Throughput",
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(216, 200, 27, 0.27)",
+              "op": "gt",
+              "value": 2
             },
             {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_YARDSTICK}",
-          "editable": true,
-          "error": false,
-          "fill": 1,
-          "grid": {
-            "threshold1": 2,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": 2,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 5,
-          "isNew": true,
-          "legend": {
-            "alignAsTable": true,
-            "avg": true,
-            "current": false,
-            "max": true,
-            "min": true,
-            "show": true,
-            "total": false,
-            "values": true
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "alias": "TG Packet Size",
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "null"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "tc_prox_heat_context_buffering-1",
-              "policy": "default",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "tg__0.PktSize"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
+              "colorMode": "custom",
+              "fill": true,
+              "fillColor": "rgba(234, 112, 112, 0.22)",
+              "op": "gt",
+              "value": 2
             }
           ],
           "timeFrom": null,
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
-              "format": "short",
+              "format": "decbytes",
               "label": "Packet Size",
               "logBase": 1,
               "max": null,
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "yardstick",
+    "NSB",
+    "Prox",
+    "Buffering",
+    "1Port",
+    "Heat"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
-    "from": "2017-07-26T18:07:01.703Z",
-    "to": "2017-07-26T18:09:21.972Z"
+    "from": "2017-10-10T16:20:59.131Z",
+    "to": "2017-10-10T16:28:03.341Z"
   },
   "timepicker": {
     "refresh_intervals": [
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": false,
-  "schemaVersion": 12,
-  "version": 4,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Prox_Heat_Packet_Buffering-1Port",
+  "version": 4
 }
\ No newline at end of file
@@ -51,7 +51,7 @@
       "height": "100px",
       "panels": [
         {
-          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>",
+          "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>",
           "editable": true,
           "error": false,
           "id": 3,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
     "list": []
   },
   "time": {
-    "from": "2017-10-04T11:02:07.286Z",
-    "to": "2017-10-04T11:10:20.389Z"
+    "from": "2017-10-09T10:53:53.915Z",
+    "to": "2017-10-09T11:00:04.248Z"
   },
   "timepicker": {
     "refresh_intervals": [
   },
   "timezone": "browser",
   "title": "Prox_Heat_vPE-4Port",
-  "version": 8
+  "version": 12
 }
\ No newline at end of file