More dashboard improvements

JIRA: VES-2

Change-Id: I1373255d253f8fadae5a0c74aeb789369c92460f
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

diff --git a/tools/grafana/Dashboard.json b/tools/grafana/Dashboard.json
index 2ea9eec..b88646c 100644 (file)
--- a/tools/grafana/Dashboard.json
+++ b/tools/grafana/Dashboard.json
@@ -573,7 +573,7 @@
           "dashes": false,
           "datasource": "VESEvents",
           "fill": 1,
-          "id": 5,
+          "id": 7,
           "legend": {
             "alignAsTable": true,
             "avg": true,
@@ -582,7 +582,7 @@
             "min": true,
             "show": true,
             "sort": "current",
-            "sortDesc": false,
+            "sortDesc": true,
             "total": false,
             "values": true
           },
@@ -609,9 +609,15 @@
                     "system"
                   ],
                   "type": "tag"
+                },
+                {
+                  "params": [
+                    "disk"
+                  ],
+                  "type": "tag"
                 }
               ],
-              "measurement": "memoryUsage",
+              "measurement": "diskUsage",
               "orderByTime": "ASC",
               "policy": "autogen",
               "refId": "A",
@@ -620,9 +626,15 @@
                 [
                   {
                     "params": [
-                      "memoryFree"
+                      "diskOpsWriteLast"
                     ],
                     "type": "field"
+                  },
+                  {
+                    "params": [
+                      "5"
+                    ],
+                    "type": "moving_average"
                   }
                 ]
               ],
@@ -631,6 +643,12 @@
                   "key": "system",
                   "operator": "=~",
                   "value": "/^$host$/"
+                },
+                {
+                  "condition": "AND",
+                  "key": "disk",
+                  "operator": "=",
+                  "value": "sda"
                 }
               ]
             }
@@ -638,7 +656,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Memory",
+          "title": "Disk Usage SDA",
           "tooltip": {
             "shared": true,
             "sort": 0,
@@ -678,7 +696,7 @@
           "dashes": false,
           "datasource": "VESEvents",
           "fill": 1,
-          "id": 7,
+          "id": 8,
           "legend": {
             "alignAsTable": true,
             "avg": true,
@@ -753,7 +771,7 @@
                   "condition": "AND",
                   "key": "disk",
                   "operator": "=",
-                  "value": "sda"
+                  "value": "sdb"
                 }
               ]
             }
@@ -761,7 +779,124 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Disk Usage",
+          "title": "Disk Usage SDB",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 10,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Dashboard Row",
+      "titleSize": "h6"
+    },
+    {
+      "collapse": false,
+      "height": 250,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "VESEvents",
+          "fill": 1,
+          "id": 5,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "max": true,
+            "min": true,
+            "show": true,
+            "sort": "current",
+            "sortDesc": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "alias": "",
+              "dsType": "influxdb",
+              "groupBy": [
+                {
+                  "params": [
+                    "system"
+                  ],
+                  "type": "tag"
+                }
+              ],
+              "measurement": "memoryUsage",
+              "orderByTime": "ASC",
+              "policy": "autogen",
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "memoryUsed"
+                    ],
+                    "type": "field"
+                  }
+                ]
+              ],
+              "tags": [
+                {
+                  "key": "system",
+                  "operator": "=~",
+                  "value": "/^$host$/"
+                }
+              ]
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Memory",
           "tooltip": {
             "shared": true,
             "sort": 0,
@@ -856,6 +991,6 @@
   },
   "timezone": "browser",
   "title": "VES Demo",
-  "version": 3
+  "version": 4
 }
 }