From: Paul Cuzner <pcuzner@redhat.com>
Date: Thu, 24 May 2018 22:57:28 +0000 (+1200)
Subject: Fixes to template variables, and health panel
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06dc51794c3bca4db58c06397eafa5d818d0d5ff;p=cephmetrics.git

Fixes to template variables, and health panel

Template vars now declare the datasource name and 
the health panel has been updated to reflect the 
error codes from mgr correctly
---

diff --git a/dashboards/mgr-prometheus/ceph-at-a-glance.json b/dashboards/mgr-prometheus/ceph-at-a-glance.json
index a605126..5693a3c 100644
--- a/dashboards/mgr-prometheus/ceph-at-a-glance.json
+++ b/dashboards/mgr-prometheus/ceph-at-a-glance.json
@@ -1,4 +1,14 @@
 {
+  "__inputs": [
+    {
+      "name": "DS_LOCAL",
+      "label": "Local",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    }
+  ],
   "__requires": [
     {
       "type": "panel",
@@ -10,13 +20,13 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.4"
+      "version": "5.1.3"
     },
     {
       "type": "panel",
       "id": "grafana-piechart-panel",
       "name": "Pie Chart",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     {
       "type": "panel",
@@ -62,7 +72,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1526962541471,
+  "iteration": 1527129313400,
   "links": [
     {
       "asDropdown": true,
@@ -751,17 +761,12 @@
         {
           "from": "1",
           "text": "WARN",
-          "to": "4"
+          "to": "1"
         },
         {
-          "from": "5",
+          "from": "2",
           "text": "ERROR",
-          "to": "99"
-        },
-        {
-          "from": "-10",
-          "text": "NODATA",
-          "to": "0"
+          "to": "2"
         }
       ],
       "sparkline": {
@@ -775,13 +780,14 @@
         {
           "expr": "ceph_health_status",
           "format": "time_series",
-          "intervalFactor": 2,
+          "instant": true,
+          "intervalFactor": 1,
           "refId": "A",
           "target": "consolidateBy(maxSeries(collectd.*.$domain.cephmetrics.gauge.$cluster_name.mon.health),\"max\")",
           "textEditor": true
         }
       ],
-      "thresholds": "1,5",
+      "thresholds": "0.5,1.5",
       "timeFrom": "1m",
       "timeShift": null,
       "title": "Health",
@@ -2376,7 +2382,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "cacheTimeout": null,
@@ -3142,7 +3152,11 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "15s",
@@ -3311,5 +3325,5 @@
   },
   "timezone": "browser",
   "title": "Ceph - At A Glance",
-  "version": 43
-}
+  "version": 58
+}
\ No newline at end of file