monitoring: update Grafana dashboards

Fix various panels that used outdated metric names, cluncky or unnecessary label_replace calls. Also unify the style of many panels. Fixes: http://tracker.ceph.com/issues/39652 Signed-off-by: Jan Fajerski <[email protected]>
bbc · May 14, 2019 · e7a4437 · e7a4437
1 parent 615b11b
commit e7a4437
Show file tree

Hide file tree

Showing 11 changed files with 1,119 additions and 648 deletions.
diff --git a/monitoring/grafana/dashboards/ceph-cluster.json b/monitoring/grafana/dashboards/ceph-cluster.json
@@ -35,7 +35,7 @@
     "list": []
   },
   "description": "Ceph cluster overview",
-  "editable": true,
+  "editable": false,
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
@@ -52,7 +52,7 @@
         "rgb(255, 0, 0)"
       ],
       "datasource": "$datasource",
-      "editable": true,
+      "editable": false,
       "error": false,
       "format": "none",
       "gauge": {
@@ -850,7 +850,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(deriv(ceph_pool_bytes_used{instance=~\"$instance\"}[1m]))",
+          "expr": "sum(deriv(ceph_pool_stored{instance=~\"$instance\"}[1m]))",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"

diff --git a/monitoring/grafana/dashboards/cephfs-overview.json b/monitoring/grafana/dashboards/cephfs-overview.json
@@ -1,10 +1,11 @@
 {
+  "__inputs": [],
   "__requires": [
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "5.0.0"
+      "version": "5.3.2"
     },
     {
       "type": "panel",
@@ -30,7 +31,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1534386614546,
+  "iteration": 1557392920097,
   "links": [],
   "panels": [
     {
@@ -52,7 +53,7 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "fill": 1,
+      "fill": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
@@ -77,7 +78,12 @@
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "/.*Reads/",
+          "transform": "negative-Y"
+        }
+      ],
       "spaceLength": 10,
       "stack": true,
       "steppedLine": false,
@@ -86,14 +92,14 @@
           "expr": "sum(ceph_objecter_op_r{ceph_daemon=~\"($mds_servers).*\"})",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "MDS Reads",
+          "legendFormat": "Read Ops",
           "refId": "A"
         },
         {
           "expr": "sum(ceph_objecter_op_w{ceph_daemon=~\"($mds_servers).*\"})",
           "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "MDS Writes",
+          "legendFormat": "Write Ops",
           "refId": "B"
         }
       ],
@@ -117,7 +123,7 @@
       "yaxes": [
         {
           "format": "none",
-          "label": null,
+          "label": "Reads(-) / Writes (+)",
           "logBase": 1,
           "max": null,
           "min": "0",
@@ -131,15 +137,19 @@
           "min": null,
           "show": true
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "$datasource",
-      "fill": 1,
+      "fill": 0,
       "gridPos": {
         "h": 9,
         "w": 12,
@@ -197,7 +207,7 @@
       "yaxes": [
         {
           "format": "none",
-          "label": null,
+          "label": "Client Requests",
           "logBase": 1,
           "max": null,
           "min": "0",
@@ -211,7 +221,11 @@
           "min": null,
           "show": false
         }
-      ]
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     }
   ],
   "refresh": "15s",
@@ -222,7 +236,6 @@
     "list": [
       {
         "current": {
-          "tags": [],
           "text": "default",
           "value": "default"
         },
@@ -233,6 +246,7 @@
         "query": "prometheus",
         "refresh": 1,
         "regex": "",
+        "skipUrlSync": false,
         "type": "datasource"
       },
       {
@@ -248,6 +262,7 @@
         "query": "label_values(ceph_mds_inodes, ceph_daemon)",
         "refresh": 1,
         "regex": "",
+        "skipUrlSync": false,
         "sort": 0,
         "tagValuesQuery": "",
         "tags": [],
@@ -289,6 +304,6 @@
   },
   "timezone": "",
   "title": "MDS Performance",
-  "uid": "rRfFzWtik",
+  "uid": "tbO9LAiZz",
   "version": 2
 }