Merge "NSB Prox Grafana dashboard updates"

34 files changed, 6514 insertions, 3742 deletions

diff --git a/dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json b/dashboard/Prox_BM_ACL-2Port-1507803762832.json
index 67f8dba01..a0493b1dd 100644
--- a/dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json
+++ b/dashboard/Prox_BM_ACL-2Port-1507803762832.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -329,6 +341,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -351,6 +364,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -388,6 +402,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -408,9 +423,25 @@
               "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,
@@ -419,7 +450,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -443,18 +478,14 @@
         {
           "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,
@@ -474,6 +505,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -496,6 +528,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -533,6 +566,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -553,9 +587,25 @@
               "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,
@@ -564,7 +614,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -586,29 +640,28 @@
           ]
         }
       ],
-      "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,
@@ -628,6 +681,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -650,6 +704,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -687,6 +742,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -707,6 +763,22 @@
               "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",
@@ -718,12 +790,16 @@
           },
           "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,
@@ -742,18 +818,14 @@
         {
           "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,
@@ -773,6 +845,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -795,6 +868,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,48 +887,27 @@
                 ]
               ],
               "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,
@@ -863,11 +916,15 @@
           },
           "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,
@@ -885,9 +942,27 @@
           ]
         }
       ],
-      "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"
@@ -917,15 +992,7 @@
       "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
diff --git a/dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json b/dashboard/Prox_BM_ACL-4Port-1507803770817.json
index 949c454e9..eba2dee87 100644
--- a/dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json
+++ b/dashboard/Prox_BM_ACL-4Port-1507803770817.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,29 +75,29 @@
           "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,
@@ -126,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -242,6 +235,22 @@
               "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",
@@ -253,7 +262,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -280,7 +293,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -288,28 +300,28 @@
           "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,
@@ -330,6 +342,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +365,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +403,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +441,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +479,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +500,25 @@
               "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,
@@ -494,7 +527,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +555,14 @@
         {
           "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,
@@ -549,6 +582,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +605,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +643,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +681,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +719,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +740,25 @@
               "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,
@@ -713,7 +767,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +793,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +834,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +857,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +895,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +916,22 @@
               "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",
@@ -866,12 +943,16 @@
           },
           "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,
@@ -890,18 +971,14 @@
         {
           "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,
@@ -921,6 +998,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -943,6 +1021,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,43 +1040,22 @@
                 ]
               ],
               "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,
@@ -1011,11 +1069,15 @@
           },
           "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,
@@ -1033,12 +1095,30 @@
           ]
         }
       ],
-      "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": [
@@ -1065,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_BM_BNG-4Port-1506596922499.json b/dashboard/Prox_BM_BNG-4Port-1507803777936.json
index f48e931fe..adbfedc37 100644
--- a/dashboard/Prox_BM_BNG-4Port-1506596922499.json
+++ b/dashboard/Prox_BM_BNG-4Port-1507803777936.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,37 +23,31 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,12 +525,16 @@
           },
           "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,
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,12 +765,16 @@
           },
           "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,
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +832,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +914,22 @@
               "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",
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,16 +1093,38 @@
           ]
         }
       ],
-      "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"
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json b/dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json
index 9c67dfe1e..f095c35fa 100644
--- a/dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json
+++ b/dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,12 +525,16 @@
           },
           "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,
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,12 +765,16 @@
           },
           "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,
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +832,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +914,22 @@
               "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",
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,16 +1093,38 @@
           ]
         }
       ],
-      "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"
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD-2Port-1501492823086.json b/dashboard/Prox_BM_L2FWD-2Port-1507804495722.json
index 62e3dbda7..e4b9f93e0 100644
--- a/dashboard/Prox_BM_L2FWD-2Port-1501492823086.json
+++ b/dashboard/Prox_BM_L2FWD-2Port-1507804495722.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -146,6 +140,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -183,6 +178,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -220,6 +216,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -240,9 +237,25 @@
               "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,
@@ -251,7 +264,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +295,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +302,28 @@
           "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,
@@ -327,12 +343,13 @@
           "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": [
                 {
@@ -349,6 +366,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -369,7 +387,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -386,6 +404,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -406,9 +425,25 @@
               "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,
@@ -417,7 +452,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -441,18 +480,14 @@
         {
           "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,
@@ -472,12 +507,13 @@
           "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": [
                 {
@@ -494,6 +530,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -514,7 +551,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -531,6 +568,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -551,9 +589,25 @@
               "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,
@@ -562,7 +616,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -584,29 +642,28 @@
           ]
         }
       ],
-      "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,
@@ -626,12 +683,13 @@
           "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": [
                 {
@@ -648,6 +706,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -668,7 +727,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -685,6 +744,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -705,9 +765,25 @@
               "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,
@@ -716,12 +792,16 @@
           },
           "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,
@@ -740,18 +820,14 @@
         {
           "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,
@@ -771,6 +847,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -793,6 +870,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,6 +891,22 @@
               "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",
@@ -824,11 +918,15 @@
           },
           "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,
@@ -846,19 +944,41 @@
           ]
         }
       ],
-      "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": [
@@ -885,15 +1005,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD-4Port-1501498495048.json b/dashboard/Prox_BM_L2FWD-4Port-1507804504588.json
index 0933d5031..0a00958bb 100644
--- a/dashboard/Prox_BM_L2FWD-4Port-1501498495048.json
+++ b/dashboard/Prox_BM_L2FWD-4Port-1507804504588.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,7 +422,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -444,7 +460,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,12 +580,13 @@
           "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": [
                 {
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -589,7 +624,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -626,7 +662,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -663,7 +700,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,7 +765,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,12 +832,13 @@
           "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": [
                 {
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -817,7 +876,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,9 +914,25 @@
               "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,
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,19 +1093,41 @@
           ]
         }
       ],
-      "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": [
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json b/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json
index 554006f7c..488d2f272 100644
--- a/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json
+++ b/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,9 +422,25 @@
               "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,
@@ -418,7 +449,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +477,14 @@
         {
           "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,
@@ -473,12 +504,13 @@
           "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": [
                 {
@@ -495,6 +527,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -515,7 +548,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -532,6 +565,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -552,9 +586,25 @@
               "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,
@@ -563,7 +613,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +639,28 @@
           ]
         }
       ],
-      "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,
@@ -627,12 +680,13 @@
           "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": [
                 {
@@ -649,6 +703,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -669,7 +724,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -686,6 +741,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,9 +762,25 @@
               "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,
@@ -717,12 +789,16 @@
           },
           "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,
@@ -741,18 +817,14 @@
         {
           "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,
@@ -772,6 +844,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +867,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +888,22 @@
               "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",
@@ -825,11 +915,15 @@
           },
           "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,
@@ -847,19 +941,41 @@
           ]
         }
       ],
-      "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": [
@@ -886,15 +1002,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json b/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json
index a431a66c2..7ed3f6883 100644
--- a/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json
+++ b/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,29 +75,29 @@
           "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,
@@ -126,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -242,6 +235,22 @@
               "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",
@@ -253,7 +262,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -280,7 +293,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -288,28 +300,28 @@
           "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,
@@ -330,6 +342,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +365,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +403,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +441,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +479,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +500,25 @@
               "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,
@@ -494,7 +527,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +555,14 @@
         {
           "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,
@@ -549,6 +582,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +605,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +643,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +681,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +719,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +740,25 @@
               "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,
@@ -713,7 +767,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +793,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +834,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +857,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +895,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +916,22 @@
               "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",
@@ -866,12 +943,16 @@
           },
           "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,
@@ -890,18 +971,14 @@
         {
           "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,
@@ -921,6 +998,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -943,6 +1021,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,48 +1040,27 @@
                 ]
               ],
               "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,
@@ -1011,11 +1069,15 @@
           },
           "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,
@@ -1033,12 +1095,30 @@
           ]
         }
       ],
-      "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": [
@@ -1065,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json b/dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json
index 112b5cdc4..b2ba076cd 100644
--- a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json
+++ b/dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -406,6 +420,22 @@
               "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",
@@ -417,7 +447,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -441,18 +475,14 @@
         {
           "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,
@@ -472,6 +502,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -551,6 +582,22 @@
               "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",
@@ -562,7 +609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -584,29 +635,28 @@
           ]
         }
       ],
-      "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,
@@ -626,6 +676,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -648,6 +699,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -685,6 +737,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -705,6 +758,22 @@
               "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",
@@ -716,12 +785,16 @@
           },
           "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,
@@ -740,18 +813,14 @@
         {
           "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,
@@ -771,6 +840,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -793,6 +863,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,9 +884,25 @@
               "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,
@@ -824,11 +911,15 @@
           },
           "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,
@@ -846,9 +937,26 @@
           ]
         }
       ],
-      "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"
@@ -878,15 +986,7 @@
       "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
diff --git a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json b/dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json
index c39308224..10054310c 100644
--- a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json
+++ b/dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -349,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -386,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -423,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -460,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -480,6 +498,22 @@
               "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",
@@ -491,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -515,18 +553,14 @@
         {
           "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,
@@ -546,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -699,6 +734,22 @@
               "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",
@@ -710,7 +761,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -732,29 +787,28 @@
           ]
         }
       ],
-      "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,
@@ -774,6 +828,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -796,6 +851,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -833,6 +889,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -853,6 +910,22 @@
               "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",
@@ -864,12 +937,16 @@
           },
           "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,
@@ -888,18 +965,14 @@
         {
           "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,
@@ -919,6 +992,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -941,6 +1015,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,9 +1036,25 @@
               "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,
@@ -972,11 +1063,15 @@
           },
           "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,
@@ -994,19 +1089,40 @@
           ]
         }
       ],
-      "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": [
@@ -1033,15 +1149,7 @@
       "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
diff --git a/dashboard/Prox_BM_L3FWD-2Port-1500900469978.json b/dashboard/Prox_BM_L3FWD-2Port-1507803870940.json
index 45a8c818b..4d8d15b0c 100644
--- a/dashboard/Prox_BM_L3FWD-2Port-1500900469978.json
+++ b/dashboard/Prox_BM_L3FWD-2Port-1507803870940.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -406,6 +420,22 @@
               "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",
@@ -417,7 +447,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -441,18 +475,14 @@
         {
           "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,
@@ -472,6 +502,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -551,6 +582,22 @@
               "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",
@@ -562,7 +609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -584,29 +635,28 @@
           ]
         }
       ],
-      "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,
@@ -626,6 +676,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -648,6 +699,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -685,6 +737,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -705,6 +758,22 @@
               "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",
@@ -716,12 +785,16 @@
           },
           "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,
@@ -740,18 +813,14 @@
         {
           "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,
@@ -771,6 +840,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -793,6 +863,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,9 +884,25 @@
               "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,
@@ -824,11 +911,15 @@
           },
           "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,
@@ -846,19 +937,40 @@
           ]
         }
       ],
-      "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": [
@@ -885,15 +997,7 @@
       "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
diff --git a/dashboard/Prox_BM_L3FWD-4Port-1500900168552.json b/dashboard/Prox_BM_L3FWD-4Port-1507803878020.json
index ec8abbef7..09184cb2d 100644
--- a/dashboard/Prox_BM_L3FWD-4Port-1500900168552.json
+++ b/dashboard/Prox_BM_L3FWD-4Port-1507803878020.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -480,6 +494,22 @@
               "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",
@@ -491,7 +521,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -515,18 +549,14 @@
         {
           "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,
@@ -546,6 +576,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -699,6 +730,22 @@
               "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",
@@ -710,7 +757,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -732,29 +783,28 @@
           ]
         }
       ],
-      "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,
@@ -774,6 +824,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -796,6 +847,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -833,6 +885,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -853,6 +906,22 @@
               "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",
@@ -864,12 +933,16 @@
           },
           "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,
@@ -888,18 +961,14 @@
         {
           "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,
@@ -919,6 +988,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -941,6 +1011,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,9 +1032,25 @@
               "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,
@@ -972,11 +1059,15 @@
           },
           "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,
@@ -994,19 +1085,40 @@
           ]
         }
       ],
-      "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": [
@@ -1033,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json b/dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json
index 7adbd0b66..ebf8aa7ff 100644
--- a/dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json
+++ b/dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,42 +75,29 @@
           "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,
@@ -126,7 +105,7 @@
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
@@ -139,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -161,6 +141,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -198,6 +179,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -235,6 +217,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -255,6 +238,22 @@
               "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",
@@ -266,7 +265,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -288,28 +291,40 @@
           ]
         }
       ],
-      "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,
@@ -330,6 +345,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +368,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +406,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +444,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +482,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +503,25 @@
               "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,
@@ -494,7 +530,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +558,14 @@
         {
           "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,
@@ -549,6 +585,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +608,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +646,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +684,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +722,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +743,25 @@
               "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,
@@ -713,7 +770,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +796,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +837,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +860,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +898,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +919,22 @@
               "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",
@@ -866,12 +946,16 @@
           },
           "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,
@@ -890,18 +974,14 @@
         {
           "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,
@@ -921,6 +1001,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -943,6 +1024,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,48 +1043,27 @@
                 ]
               ],
               "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,
@@ -1011,11 +1072,15 @@
           },
           "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,
@@ -1033,12 +1098,30 @@
           ]
         }
       ],
-      "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": [
@@ -1065,15 +1148,7 @@
       "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
diff --git a/dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json b/dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json
index 5dbe09159..16012b92a 100644
--- a/dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json
+++ b/dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -147,6 +140,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -184,6 +178,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -221,6 +216,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -241,6 +237,22 @@
               "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",
@@ -252,7 +264,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +295,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +302,28 @@
           "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,
@@ -328,6 +343,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +366,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +404,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,6 +425,22 @@
               "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",
@@ -418,7 +452,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +480,14 @@
         {
           "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,
@@ -473,6 +507,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -495,6 +530,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -502,7 +538,7 @@
                 [
                   {
                     "params": [
-                      "tg__0.xe0.in_packets"
+                      "tg__0.xe1.in_packets"
                     ],
                     "type": "field"
                   },
@@ -532,6 +568,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -552,6 +589,22 @@
               "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",
@@ -563,7 +616,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +642,28 @@
           ]
         }
       ],
-      "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,
@@ -627,6 +683,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -649,6 +706,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -686,6 +744,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,6 +765,22 @@
               "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",
@@ -717,12 +792,16 @@
           },
           "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,
@@ -741,18 +820,14 @@
         {
           "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,
@@ -772,6 +847,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +870,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +891,22 @@
               "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",
@@ -825,11 +918,15 @@
           },
           "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,
@@ -847,19 +944,41 @@
           ]
         }
       ],
-      "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": [
@@ -886,15 +1005,7 @@
       "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
diff --git a/dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json b/dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json
index 6e2f568a4..8dba84e0b 100644
--- a/dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json
+++ b/dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,6 +498,22 @@
               "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",
@@ -492,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -700,6 +734,22 @@
               "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",
@@ -711,7 +761,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +787,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +828,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +851,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +889,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +910,22 @@
               "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",
@@ -865,12 +937,16 @@
           },
           "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,
@@ -889,18 +965,14 @@
         {
           "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,
@@ -920,6 +992,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1015,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1036,22 @@
               "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",
@@ -973,11 +1063,15 @@
           },
           "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,
@@ -995,19 +1089,41 @@
           ]
         }
       ],
-      "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": [
@@ -1034,15 +1150,7 @@
       "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
diff --git a/dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json b/dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json
index 01fff32c3..64ee1c52c 100644
--- a/dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json
+++ b/dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -407,6 +420,22 @@
               "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",
@@ -418,7 +447,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +475,14 @@
         {
           "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,
@@ -473,12 +502,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -495,6 +525,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -502,7 +533,7 @@
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
@@ -515,7 +546,7 @@
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -532,6 +563,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -539,7 +571,7 @@
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
@@ -550,48 +582,27 @@
                 ]
               ],
               "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,
@@ -600,12 +611,16 @@
           },
           "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,
@@ -622,29 +637,28 @@
           ]
         }
       ],
-      "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,
@@ -664,12 +678,13 @@
           "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": [
                 {
@@ -686,6 +701,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -693,44 +709,7 @@
                 [
                   {
                     "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"
                   },
@@ -743,112 +722,20 @@
               "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,
@@ -862,11 +749,15 @@
           },
           "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,
@@ -884,19 +775,41 @@
           ]
         }
       ],
-      "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": [
@@ -923,15 +836,7 @@
       "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
diff --git a/dashboard/Prox_BM_vPE-4Port-1507195330973.json b/dashboard/Prox_BM_vPE-4Port-1507804058631.json
index 0802e7c28..52afcaed3 100644
--- a/dashboard/Prox_BM_vPE-4Port-1507195330973.json
+++ b/dashboard/Prox_BM_vPE-4Port-1507804058631.json
@@ -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,
@@ -519,7 +519,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats:  Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -537,7 +537,7 @@
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
@@ -759,7 +759,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -777,7 +777,7 @@
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets ",
               "logBase": 1,
               "max": null,
               "min": null,
@@ -1129,8 +1129,8 @@
     "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": [
@@ -1159,5 +1159,5 @@
   },
   "timezone": "browser",
   "title": "Prox_BM_vPE-4Port",
-  "version": 6
+  "version": 10
 }
\ No newline at end of file
diff --git a/dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json b/dashboard/Prox_Heat_ACL-2Port-1507804110005.json
index 112cb8e4a..417285524 100644
--- a/dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json
+++ b/dashboard/Prox_Heat_ACL-2Port-1507804110005.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,29 +75,29 @@
           "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,
@@ -126,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -242,6 +235,22 @@
               "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",
@@ -253,7 +262,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -280,7 +293,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -288,28 +300,28 @@
           "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,
@@ -330,6 +342,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +365,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +403,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -409,9 +424,25 @@
               "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,
@@ -420,7 +451,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -444,18 +479,14 @@
         {
           "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,
@@ -475,6 +506,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -497,6 +529,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -534,6 +567,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -554,9 +588,25 @@
               "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,
@@ -565,7 +615,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -587,28 +641,28 @@
           ]
         }
       ],
-      "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,
@@ -628,6 +682,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -650,6 +705,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -687,6 +743,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -707,6 +764,22 @@
               "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",
@@ -718,12 +791,16 @@
           },
           "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,
@@ -742,18 +819,14 @@
         {
           "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,
@@ -773,6 +846,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -795,6 +869,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,48 +888,27 @@
                 ]
               ],
               "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,
@@ -863,11 +917,15 @@
           },
           "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,
@@ -885,12 +943,41 @@
           ]
         }
       ],
-      "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": [
@@ -917,15 +1004,7 @@
       "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
diff --git a/dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json b/dashboard/Prox_Heat_ACL-4Port-1507804119688.json
index be45cc1bc..c093c5732 100644
--- a/dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json
+++ b/dashboard/Prox_Heat_ACL-4Port-1507804119688.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,29 +75,29 @@
           "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,
@@ -126,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -242,6 +235,22 @@
               "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",
@@ -253,7 +262,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -280,7 +293,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -288,28 +300,28 @@
           "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,
@@ -330,6 +342,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +365,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +403,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +441,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +479,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +500,25 @@
               "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,
@@ -494,7 +527,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +555,14 @@
         {
           "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,
@@ -549,6 +582,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +605,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +643,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +681,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +719,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +740,25 @@
               "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,
@@ -713,7 +767,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +793,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +834,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +857,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +895,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +916,22 @@
               "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",
@@ -866,12 +943,16 @@
           },
           "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,
@@ -890,18 +971,14 @@
         {
           "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,
@@ -921,6 +998,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -943,6 +1021,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_acl-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,48 +1040,27 @@
                 ]
               ],
               "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,
@@ -1011,11 +1069,15 @@
           },
           "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,
@@ -1033,9 +1095,27 @@
           ]
         }
       ],
-      "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"
@@ -1065,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_Heat_BNG-4Port-1506596971791.json b/dashboard/Prox_Heat_BNG-4Port-1507804128983.json
index f51eb60e5..447b7d67c 100644
--- a/dashboard/Prox_Heat_BNG-4Port-1506596971791.json
+++ b/dashboard/Prox_Heat_BNG-4Port-1507804128983.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,37 +23,31 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,7 +765,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +832,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +914,22 @@
               "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",
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,16 +1093,38 @@
           ]
         }
       ],
-      "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"
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json b/dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json
index 3a6fa7c3a..aeaa6edd5 100644
--- a/dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json
+++ b/dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,12 +525,16 @@
           },
           "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,
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,6 +580,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,12 +765,16 @@
           },
           "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,
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +832,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +914,22 @@
               "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",
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_bng_qos-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,19 +1093,41 @@
           ]
         }
       ],
-      "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": [
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json b/dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json
index fd1eaaafe..fa9a2f321 100644
--- a/dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json
+++ b/dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,9 +422,25 @@
               "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,
@@ -418,7 +449,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +477,14 @@
         {
           "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,
@@ -473,6 +504,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -495,6 +527,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -532,6 +565,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -552,9 +586,25 @@
               "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,
@@ -563,7 +613,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +639,28 @@
           ]
         }
       ],
-      "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,
@@ -615,6 +668,7 @@
             "max": true,
             "min": true,
             "show": true,
+            "sortDesc": true,
             "total": false,
             "values": true
           },
@@ -627,6 +681,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -649,6 +704,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -686,6 +742,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,6 +763,22 @@
               "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",
@@ -717,12 +790,16 @@
           },
           "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,
@@ -741,18 +818,14 @@
         {
           "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,
@@ -772,6 +845,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +868,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +889,22 @@
               "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",
@@ -825,11 +916,15 @@
           },
           "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,
@@ -847,19 +942,41 @@
           ]
         }
       ],
-      "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": [
@@ -886,15 +1003,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json b/dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json
index 009fb08ed..761402dac 100644
--- a/dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json
+++ b/dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,7 +422,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -444,7 +460,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,12 +580,13 @@
           "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": [
                 {
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -589,7 +624,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -626,7 +662,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -663,7 +700,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,7 +765,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,12 +832,13 @@
           "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": [
                 {
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -817,7 +876,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,9 +914,25 @@
               "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,
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,19 +1093,41 @@
           ]
         }
       ],
-      "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": [
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json b/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json
index 557c5c2e7..84b93e7f5 100644
--- a/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json
+++ b/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,9 +422,25 @@
               "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,
@@ -418,7 +449,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +477,14 @@
         {
           "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,
@@ -473,12 +504,13 @@
           "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": [
                 {
@@ -495,6 +527,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -515,7 +548,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -532,6 +565,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -552,9 +586,25 @@
               "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,
@@ -563,7 +613,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +639,28 @@
           ]
         }
       ],
-      "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,
@@ -627,12 +680,13 @@
           "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": [
                 {
@@ -649,6 +703,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -669,7 +724,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -686,6 +741,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,9 +762,25 @@
               "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,
@@ -717,12 +789,16 @@
           },
           "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,
@@ -741,18 +817,14 @@
         {
           "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,
@@ -772,6 +844,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +867,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +888,22 @@
               "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",
@@ -825,11 +915,15 @@
           },
           "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,
@@ -847,16 +941,38 @@
           ]
         }
       ],
-      "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"
@@ -886,15 +1002,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json b/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json
index b48dea039..ae1bf3146 100644
--- a/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json
+++ b/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,29 +75,29 @@
           "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,
@@ -126,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -242,6 +235,22 @@
               "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",
@@ -253,7 +262,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -280,7 +293,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -288,28 +300,28 @@
           "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,
@@ -330,6 +342,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +365,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +403,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +441,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +479,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +500,25 @@
               "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,
@@ -494,7 +527,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +555,14 @@
         {
           "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,
@@ -549,6 +582,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +605,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +643,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +681,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +719,7 @@
                 }
               ],
               "measurement": "tc_prox_baremetal_l3fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +740,25 @@
               "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,
@@ -713,7 +767,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +793,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +834,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +857,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +895,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +916,22 @@
               "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",
@@ -866,12 +943,16 @@
           },
           "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,
@@ -890,18 +971,14 @@
         {
           "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,
@@ -921,6 +998,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -943,6 +1021,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_multiflow-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,48 +1040,27 @@
                 ]
               ],
               "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,
@@ -1011,11 +1069,15 @@
           },
           "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,
@@ -1033,9 +1095,27 @@
           ]
         }
       ],
-      "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"
@@ -1065,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json b/dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json
index 85e487115..5886074e9 100644
--- a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json
+++ b/dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,44 +23,38 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -406,6 +420,22 @@
               "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",
@@ -417,7 +447,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -441,18 +475,14 @@
         {
           "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,
@@ -472,6 +502,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -551,6 +582,22 @@
               "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",
@@ -562,7 +609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -584,29 +635,28 @@
           ]
         }
       ],
-      "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,
@@ -626,6 +676,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -648,6 +699,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -685,6 +737,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -705,6 +758,22 @@
               "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",
@@ -716,12 +785,16 @@
           },
           "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,
@@ -740,18 +813,14 @@
         {
           "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,
@@ -771,6 +840,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -793,6 +863,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -813,6 +884,22 @@
               "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",
@@ -824,11 +911,15 @@
           },
           "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,
@@ -846,12 +937,29 @@
           ]
         }
       ],
-      "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": [
@@ -878,15 +986,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json b/dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json
index 8b9a0cc90..44d85ef63 100644
--- a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json
+++ b/dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,36 +23,31 @@
       "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,
@@ -81,29 +74,29 @@
           "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,
@@ -124,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -240,6 +234,22 @@
               "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",
@@ -251,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -278,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -286,28 +299,28 @@
           "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,
@@ -327,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -480,6 +494,22 @@
               "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",
@@ -491,7 +521,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -515,18 +549,14 @@
         {
           "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,
@@ -546,6 +576,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -699,6 +730,22 @@
               "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",
@@ -710,7 +757,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -732,29 +783,28 @@
           ]
         }
       ],
-      "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,
@@ -774,6 +824,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -796,6 +847,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -833,6 +885,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -853,6 +906,22 @@
               "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",
@@ -864,12 +933,16 @@
           },
           "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,
@@ -888,18 +961,14 @@
         {
           "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,
@@ -919,6 +988,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -941,6 +1011,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,6 +1032,22 @@
               "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",
@@ -972,11 +1059,15 @@
           },
           "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,
@@ -994,19 +1085,40 @@
           ]
         }
       ],
-      "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": [
@@ -1033,15 +1145,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json b/dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json
index 611ae5f32..cb341f36e 100644
--- a/dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json
+++ b/dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,9 +422,25 @@
               "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,
@@ -418,7 +449,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +477,14 @@
         {
           "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,
@@ -473,12 +504,13 @@
           "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": [
                 {
@@ -495,6 +527,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -515,7 +548,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -532,6 +565,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -552,9 +586,25 @@
               "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,
@@ -563,7 +613,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +639,28 @@
           ]
         }
       ],
-      "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,
@@ -627,12 +680,13 @@
           "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": [
                 {
@@ -649,6 +703,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -669,7 +724,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -686,6 +741,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,9 +762,25 @@
               "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,
@@ -717,12 +789,16 @@
           },
           "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,
@@ -741,18 +817,14 @@
         {
           "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,
@@ -772,6 +844,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +867,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +888,22 @@
               "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",
@@ -825,11 +915,15 @@
           },
           "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,
@@ -847,16 +941,38 @@
           ]
         }
       ],
-      "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"
@@ -886,15 +1002,7 @@
       "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
diff --git a/dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json b/dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json
index 66aa9e722..f31801932 100644
--- a/dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json
+++ b/dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 Out packets",
+              "alias": "TG xe-1 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,7 +422,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 Out packets",
+              "alias": "TG xe-2 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -424,6 +439,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -444,7 +460,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 Out packets",
+              "alias": "TG xe-3 Out packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -461,6 +477,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -481,9 +498,25 @@
               "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,
@@ -492,7 +525,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +553,14 @@
         {
           "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,
@@ -547,12 +580,13 @@
           "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": [
                 {
@@ -569,6 +603,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -589,7 +624,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-1 in packets",
+              "alias": "TG xe-1 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -606,6 +641,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -626,7 +662,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-2 in packets",
+              "alias": "TG xe-2 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -643,6 +679,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -663,7 +700,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-3 in packets",
+              "alias": "TG xe-3 in packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -680,6 +717,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -700,9 +738,25 @@
               "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,
@@ -711,7 +765,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +791,28 @@
           ]
         }
       ],
-      "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,
@@ -775,12 +832,13 @@
           "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": [
                 {
@@ -797,6 +855,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -817,7 +876,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen RX Throughput",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -834,6 +893,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,9 +914,25 @@
               "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,
@@ -865,12 +941,16 @@
           },
           "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,
@@ -889,18 +969,14 @@
         {
           "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,
@@ -920,6 +996,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1019,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_l3fwd-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1040,22 @@
               "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",
@@ -973,11 +1067,15 @@
           },
           "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,
@@ -995,16 +1093,38 @@
           ]
         }
       ],
-      "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"
@@ -1034,15 +1154,7 @@
       "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
diff --git a/dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json b/dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json
index 261b959b8..05f62571b 100644
--- a/dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json
+++ b/dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,46 +23,39 @@
       "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,
@@ -83,42 +75,29 @@
           "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,
@@ -126,7 +105,7 @@
             "max": true,
             "min": true,
             "rightSide": false,
-            "show": false,
+            "show": true,
             "total": false,
             "values": true
           },
@@ -139,6 +118,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -161,6 +141,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -198,6 +179,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -235,6 +217,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -255,6 +238,22 @@
               "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",
@@ -266,7 +265,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -288,28 +291,40 @@
           ]
         }
       ],
-      "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,
@@ -330,6 +345,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -352,6 +368,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -389,6 +406,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -426,6 +444,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -463,6 +482,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -483,9 +503,25 @@
               "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,
@@ -494,7 +530,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -518,18 +558,14 @@
         {
           "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,
@@ -549,6 +585,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -571,6 +608,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -608,6 +646,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -645,6 +684,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "C",
               "resultFormat": "time_series",
@@ -682,6 +722,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "D",
               "resultFormat": "time_series",
@@ -702,9 +743,25 @@
               "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,
@@ -713,7 +770,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -735,28 +796,28 @@
           ]
         }
       ],
-      "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,
@@ -776,6 +837,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -798,6 +860,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -835,6 +898,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -855,6 +919,22 @@
               "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",
@@ -866,12 +946,16 @@
           },
           "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,
@@ -890,18 +974,14 @@
         {
           "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,
@@ -921,6 +1001,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,7 +1023,8 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "tc_prox_baremetal_lb-4",
+              "measurement": "tc_prox_heat_context_lb-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -961,48 +1043,27 @@
                 ]
               ],
               "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,
@@ -1011,11 +1072,15 @@
           },
           "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,
@@ -1033,12 +1098,30 @@
           ]
         }
       ],
-      "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": [
@@ -1065,15 +1148,7 @@
       "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
diff --git a/dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json b/dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json
index 679b4b45f..8571ad4f5 100644
--- a/dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json
+++ b/dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -407,6 +420,22 @@
               "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",
@@ -418,7 +447,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +475,14 @@
         {
           "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,
@@ -473,6 +502,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -552,6 +582,22 @@
               "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",
@@ -563,7 +609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -585,29 +635,28 @@
           ]
         }
       ],
-      "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,
@@ -627,6 +676,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -649,6 +699,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -686,6 +737,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -706,6 +758,22 @@
               "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",
@@ -717,12 +785,16 @@
           },
           "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,
@@ -741,18 +813,14 @@
         {
           "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,
@@ -772,6 +840,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -794,6 +863,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-2",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -814,6 +884,22 @@
               "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",
@@ -825,11 +911,15 @@
           },
           "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,
@@ -847,16 +937,38 @@
           ]
         }
       ],
-      "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"
@@ -886,15 +998,7 @@
       "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
diff --git a/dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json b/dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json
index 727aa9760..16ff81e7b 100644
--- a/dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json
+++ b/dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,6 +340,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -481,6 +494,22 @@
               "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",
@@ -492,7 +521,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +549,14 @@
         {
           "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,
@@ -547,6 +576,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -700,6 +730,22 @@
               "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",
@@ -711,7 +757,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -733,29 +783,28 @@
           ]
         }
       ],
-      "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,
@@ -775,6 +824,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -797,6 +847,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -834,6 +885,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -854,6 +906,22 @@
               "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",
@@ -865,12 +933,16 @@
           },
           "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,
@@ -889,18 +961,14 @@
         {
           "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,
@@ -920,6 +988,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
@@ -942,6 +1011,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_mpls_tagging-4",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -962,6 +1032,22 @@
               "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",
@@ -973,11 +1059,15 @@
           },
           "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,
@@ -995,16 +1085,38 @@
           ]
         }
       ],
-      "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"
@@ -1034,15 +1146,7 @@
       "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
diff --git a/dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json b/dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json
index 2a93af192..76aa0f58f 100644
--- a/dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json
+++ b/dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json
@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
     },
     {
       "type": "panel",
@@ -23,45 +23,38 @@
       "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,
@@ -82,29 +74,29 @@
           "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,
@@ -125,6 +117,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -241,6 +234,22 @@
               "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",
@@ -252,7 +261,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -279,7 +292,6 @@
           "error": false,
           "height": "40",
           "id": 8,
-          "isNew": true,
           "links": [],
           "mode": "html",
           "span": 12,
@@ -287,28 +299,28 @@
           "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,
@@ -328,12 +340,13 @@
           "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": [
                 {
@@ -350,6 +363,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -370,7 +384,7 @@
               "tags": []
             },
             {
-              "alias": "Tgen xe-0 In packets",
+              "alias": "TG xe-0 In packets",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -387,6 +401,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -407,6 +422,22 @@
               "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",
@@ -418,7 +449,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -442,18 +477,14 @@
         {
           "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,
@@ -473,12 +504,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 6,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Min Latency",
+              "alias": "TG TX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -495,6 +527,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -502,7 +535,7 @@
                 [
                   {
                     "params": [
-                      "tg__0.LatencyMin.2"
+                      "tg__0.Throughput"
                     ],
                     "type": "field"
                   },
@@ -515,7 +548,7 @@
               "tags": []
             },
             {
-              "alias": "Avg Latency",
+              "alias": "TG RX Throughput",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -532,6 +565,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -539,7 +573,7 @@
                 [
                   {
                     "params": [
-                      "tg__0.LatencyAvg.2"
+                      "tg__0.RxThroughput"
                     ],
                     "type": "field"
                   },
@@ -550,48 +584,27 @@
                 ]
               ],
               "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,
@@ -600,12 +613,16 @@
           },
           "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,
@@ -622,29 +639,28 @@
           ]
         }
       ],
-      "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,
@@ -664,12 +680,13 @@
           "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": [
                 {
@@ -686,6 +703,7 @@
                 }
               ],
               "measurement": "tc_prox_heat_context_buffering-1",
+              "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -693,44 +711,7 @@
                 [
                   {
                     "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"
                   },
@@ -743,112 +724,20 @@
               "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,
@@ -862,11 +751,15 @@
           },
           "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,
@@ -884,19 +777,41 @@
           ]
         }
       ],
-      "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": [
@@ -923,15 +838,7 @@
       "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
diff --git a/dashboard/Prox_Heat_vPE-4Port-1507195265889.json b/dashboard/Prox_Heat_vPE-4Port-1507804883050.json
index f34673acd..8ee91b4fc 100644
--- a/dashboard/Prox_Heat_vPE-4Port-1507195265889.json
+++ b/dashboard/Prox_Heat_vPE-4Port-1507804883050.json
@@ -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,
@@ -519,7 +519,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG out packets",
+          "title": "TG Port Stats: Out packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -537,7 +537,7 @@
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets Out",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
@@ -759,7 +759,7 @@
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "TG In packets",
+          "title": "TG Port Stats: In packets",
           "tooltip": {
             "msResolution": true,
             "shared": true,
@@ -777,7 +777,7 @@
           "yaxes": [
             {
               "format": "short",
-              "label": "Packets In",
+              "label": "Packets",
               "logBase": 1,
               "max": null,
               "min": null,
@@ -1129,8 +1129,8 @@
     "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": [
@@ -1159,5 +1159,5 @@
   },
   "timezone": "browser",
   "title": "Prox_Heat_vPE-4Port",
-  "version": 8
+  "version": 12
 }
\ No newline at end of file