Fix Grafana dashboards for RFC2544

Fixed dashboards for RFC2544 and for RFC2544 multiframesize

YARDSTICK-1592

Change-Id: I8dfc835804e8e33fbb926dbc76168c58a1f9dd2f
Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com>

2 files changed, 96 insertions, 43 deletions

diff --git a/dashboard/RFC2544_2Port.json b/dashboard/RFC2544_2Port.json
index e6f3265f9..de9448cee 100644
--- a/dashboard/RFC2544_2Port.json
+++ b/dashboard/RFC2544_2Port.json
@@ -1,14 +1,50 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_YARDSTICK",
+      "label": "yardstick",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "influxdb",
+      "pluginName": "InfluxDB"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "influxdb",
+      "name": "InfluxDB",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "table",
+      "name": "Table",
+      "version": ""
+    }
+  ],
   "annotations": {
     "list": [
       {
-        "datasource": "yardstick",
+        "datasource": "${DS_YARDSTICK}",
         "enable": true,
         "hide": false,
         "iconColor": "rgb(248, 255, 0)",
         "limit": 100,
         "name": "status",
-        "query": "SELECT tg__0.collect_stats.Status FROM \"tc_heat_rfc2544_ipv4_1rule_1flow_trex\" WHERE \"tg__0.collect_stats.Status\"='Success' AND task_id='$task_id'",
+        "query": "SELECT tg__0.collect_stats.Status FROM $test_name WHERE \"tg__0.collect_stats.Status\"='Success' AND task_id='$task_id'",
         "showIn": 0,
         "titleColumn": "Status",
         "type": "alert"
@@ -19,7 +55,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "hideControls": false,
-  "id": 6,
+  "id": null,
   "links": [],
   "refresh": false,
   "rows": [
@@ -32,7 +68,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "yardstick",
+          "datasource": "${DS_YARDSTICK}",
           "fill": 0,
           "hideTimeOverride": true,
           "id": 3,
@@ -66,8 +102,8 @@
               "measurement": "/^$test_name$/",
               "orderByTime": "ASC",
               "policy": "default",
-              "query": "SELECT \"tg__0.collect_stats.xe0.InBytes\", \"tg__0.collect_stats.xe0.OutBytes\", \"tg__0.collect_stats.xe1.InBytes\", \"tg__0.collect_stats.xe1.OutBytes\" FROM /^$test_name$/ WHERE \"task_id\" =~ /^$task_id$/ AND \"tg__0.collect_stats.PktSize\" =~ /^$framesize$/ AND $timeFilter",
-              "rawQuery": false,
+              "query": "SELECT \"tg__0.collect_stats.xe0.InBytes\", \"tg__0.collect_stats.xe0.OutBytes\", \"tg__0.collect_stats.xe1.InBytes\", \"tg__0.collect_stats.xe1.OutBytes\" FROM /^$test_name$/ WHERE \"task_id\" =~ /^$task_id$/ AND $timeFilter",
+              "rawQuery": true,
               "refId": "A",
               "resultFormat": "time_series",
               "select": [
@@ -166,7 +202,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "yardstick",
+          "datasource": "${DS_YARDSTICK}",
           "fill": 1,
           "id": 1,
           "legend": {
@@ -196,7 +232,7 @@
               "alias": "$col",
               "dsType": "influxdb",
               "groupBy": [],
-              "measurement": "tc_heat_rfc2544_ipv4_1rule_1flow_trex",
+              "measurement": "/^$test_name$/",
               "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
@@ -273,7 +309,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": null,
+          "datasource": "${DS_YARDSTICK}",
           "fill": 1,
           "id": 5,
           "legend": {
@@ -528,11 +564,8 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "tc_heat_rfc2544_ipv4_1rule_1flow_trex",
-          "value": "tc_heat_rfc2544_ipv4_1rule_1flow_trex"
-        },
-        "datasource": "yardstick",
+        "current": {},
+        "datasource": "${DS_YARDSTICK}",
         "hide": 0,
         "includeAll": false,
         "label": "test_name",
@@ -551,18 +584,15 @@
       },
       {
         "allValue": null,
-        "current": {
-          "text": "004b5387-74b3-4cf0-9597-5198db9e2731",
-          "value": "004b5387-74b3-4cf0-9597-5198db9e2731"
-        },
-        "datasource": "yardstick",
+        "current": {},
+        "datasource": "${DS_YARDSTICK}",
         "hide": 0,
         "includeAll": false,
         "label": "task_id",
         "multi": false,
         "name": "task_id",
         "options": [],
-        "query": "SHOW TAG VALUES FROM $test_name WITH KEY = \"task_id\" ",
+        "query": "SHOW TAG VALUES FROM $test_name WITH KEY = \"task_id\"  ",
         "refresh": 2,
         "regex": "",
         "sort": 0,
@@ -575,8 +605,8 @@
     ]
   },
   "time": {
-    "from": "2019-03-05T12:44:02.829Z",
-    "to": "2019-03-05T13:32:27.585Z"
+    "from": "2019-03-06T13:54:13.610Z",
+    "to": "2019-03-06T13:56:59.693Z"
   },
   "timepicker": {
     "refresh_intervals": [
@@ -605,5 +635,5 @@
   },
   "timezone": "",
   "title": "RFC2544",
-  "version": 2
+  "version": 4
 }
diff --git a/dashboard/RFC2544_2Port_Multiframesize.json b/dashboard/RFC2544_2Port_Multiframesize.json
index f08cf3d47..2d8e9522f 100644
--- a/dashboard/RFC2544_2Port_Multiframesize.json
+++ b/dashboard/RFC2544_2Port_Multiframesize.json
@@ -1,14 +1,44 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_YARDSTICK",
+      "label": "yardstick",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "influxdb",
+      "pluginName": "InfluxDB"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.3"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "influxdb",
+      "name": "InfluxDB",
+      "version": "1.0.0"
+    }
+  ],
   "annotations": {
     "list": [
       {
-        "datasource": "yardstick",
+        "datasource": "${DS_YARDSTICK}",
         "enable": true,
         "hide": false,
         "iconColor": "rgb(248, 255, 0)",
         "limit": 100,
         "name": "status",
-        "query": "SELECT tg__0.collect_stats.Status FROM \"tc_heat_rfc2544_ipv4_1rule_1flow_trex\" WHERE \"tg__0.collect_stats.Status\"='Success' AND task_id='$task_id'",
+        "query": "SELECT tg__0.collect_stats.Status FROM $test_name WHERE \"tg__0.collect_stats.Status\"='Success' AND task_id='$task_id'",
         "showIn": 0,
         "titleColumn": "Status",
         "type": "alert"
@@ -19,7 +49,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "hideControls": false,
-  "id": 2,
+  "id": null,
   "links": [],
   "refresh": false,
   "rows": [
@@ -32,7 +62,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "yardstick",
+          "datasource": "${DS_YARDSTICK}",
           "fill": 0,
           "hideTimeOverride": true,
           "id": 3,
@@ -172,7 +202,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "yardstick",
+          "datasource": "${DS_YARDSTICK}",
           "fill": 1,
           "id": 1,
           "legend": {
@@ -202,7 +232,7 @@
               "alias": "$col",
               "dsType": "influxdb",
               "groupBy": [],
-              "measurement": "tc_heat_rfc2544_ipv4_1rule_1flow_trex",
+              "measurement": "/^$test_name$/",
               "orderByTime": "ASC",
               "policy": "default",
               "refId": "A",
@@ -285,7 +315,7 @@
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": null,
+          "datasource": "${DS_YARDSTICK}",
           "fill": 1,
           "id": 5,
           "legend": {
@@ -408,7 +438,7 @@
           "bars": true,
           "dashLength": 10,
           "dashes": false,
-          "datasource": null,
+          "datasource": "${DS_YARDSTICK}",
           "fill": 1,
           "id": 4,
           "legend": {
@@ -723,11 +753,8 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "tc_heat_rfc2544_ipv4_1rule_1flow_trex",
-          "value": "tc_heat_rfc2544_ipv4_1rule_1flow_trex"
-        },
-        "datasource": "yardstick",
+        "current": {},
+        "datasource": "${DS_YARDSTICK}",
         "hide": 0,
         "includeAll": false,
         "label": "test_name",
@@ -746,11 +773,8 @@
       },
       {
         "allValue": null,
-        "current": {
-          "text": "fdb337ec-11ea-410f-b45e-83f30edb7590",
-          "value": "fdb337ec-11ea-410f-b45e-83f30edb7590"
-        },
-        "datasource": "yardstick",
+        "current": {},
+        "datasource": "${DS_YARDSTICK}",
         "hide": 0,
         "includeAll": false,
         "label": "task_id",
@@ -770,7 +794,6 @@
       {
         "allValue": null,
         "current": {
-          "tags": [],
           "text": "64B + 128B + 512B",
           "value": [
             "64B",
@@ -881,5 +904,5 @@
   },
   "timezone": "",
   "title": "RFC2544 Multi framesize",
-  "version": 14
+  "version": 15
 }