Migrate dashboards from angular panels/plugins

Ceph dashboards were simply updated from main, since migration was already done upstream. Some updates also fixed the missing datasource in issue 1163, so the remaining dashboards were fixed here as well. Part of osism/issues#1162 Part of osism/issues#1163 [1] https://grafana.com/docs/grafana/latest/developers/angular_deprecation/ Signed-off-by: Jan Horstmann <[email protected]>
osism · Oct 14, 2024 · 9cb2380 · 9cb2380
1 parent 5597089
commit 9cb2380
Show file tree

Hide file tree

Showing 30 changed files with 36,721 additions and 36,116 deletions.
diff --git a/grafana/dashboards/ceph/ceph-cluster-advanced.json b/grafana/dashboards/ceph/ceph-cluster-advanced.json
diff --git a/grafana/dashboards/ceph/ceph-cluster.json b/grafana/dashboards/ceph/ceph-cluster.json
diff --git a/grafana/dashboards/ceph/ceph_overview.json b/grafana/dashboards/ceph/ceph_overview.json
diff --git a/grafana/dashboards/ceph/ceph_pools.json b/grafana/dashboards/ceph/ceph_pools.json
diff --git a/grafana/dashboards/ceph/cephfs-overview.json b/grafana/dashboards/ceph/cephfs-overview.json
@@ -63,6 +63,15 @@
          "dashes": false,
          "datasource": "$datasource",
          "description": "",
+         "fieldConfig": {
+            "defaults": {
+               "custom": {
+                  "fillOpacity": 8,
+                  "showPoints": "never"
+               },
+               "unit": "none"
+            }
+         },
          "fill": 1,
          "fillGradient": 0,
          "gridPos": {
@@ -104,14 +113,14 @@
          "steppedLine": false,
          "targets": [
             {
-               "expr": "sum(rate(ceph_objecter_op_r{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}[$__rate_interval]))",
+               "expr": "sum(rate(ceph_objecter_op_r{ceph_daemon=~\"($mds_servers).*\", cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "Read Ops",
                "refId": "A"
             },
             {
-               "expr": "sum(rate(ceph_objecter_op_w{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}[$__rate_interval]))",
+               "expr": "sum(rate(ceph_objecter_op_w{ceph_daemon=~\"($mds_servers).*\", cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "Write Ops",
@@ -127,7 +136,7 @@
             "sort": 0,
             "value_type": "individual"
          },
-         "type": "graph",
+         "type": "timeseries",
          "xaxis": {
             "buckets": null,
             "mode": "time",
@@ -161,6 +170,15 @@
          "dashes": false,
          "datasource": "$datasource",
          "description": "",
+         "fieldConfig": {
+            "defaults": {
+               "custom": {
+                  "fillOpacity": 8,
+                  "showPoints": "never"
+               },
+               "unit": "none"
+            }
+         },
          "fill": 1,
          "fillGradient": 0,
          "gridPos": {
@@ -197,7 +215,7 @@
          "steppedLine": false,
          "targets": [
             {
-               "expr": "ceph_mds_server_handle_client_request{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}",
+               "expr": "ceph_mds_server_handle_client_request{ceph_daemon=~\"($mds_servers).*\", cluster=~\"$cluster\", }",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "{{ceph_daemon}}",
@@ -213,7 +231,7 @@
             "sort": 0,
             "value_type": "individual"
          },
-         "type": "graph",
+         "type": "timeseries",
          "xaxis": {
             "buckets": null,
             "mode": "time",
@@ -265,36 +283,16 @@
             "type": "datasource"
          },
          {
-            "allValue": ".+",
+            "allValue": null,
             "current": { },
             "datasource": "$datasource",
-            "hide": 2,
-            "includeAll": true,
+            "hide": 0,
+            "includeAll": false,
             "label": "cluster",
-            "multi": true,
+            "multi": false,
             "name": "cluster",
             "options": [ ],
-            "query": "label_values(ceph_osd_metadata, cluster)",
-            "refresh": 1,
-            "regex": "(.*)",
-            "sort": 1,
-            "tagValuesQuery": "",
-            "tags": [ ],
-            "tagsQuery": "",
-            "type": "query",
-            "useTags": false
-         },
-         {
-            "allValue": ".+",
-            "current": { },
-            "datasource": "$datasource",
-            "hide": 0,
-            "includeAll": true,
-            "label": "job",
-            "multi": true,
-            "name": "job",
-            "options": [ ],
-            "query": "label_values(ceph_osd_metadata{}, job)",
+            "query": "label_values(ceph_health_status, cluster)",
             "refresh": 1,
             "regex": "(.*)",
             "sort": 1,
@@ -314,7 +312,7 @@
             "multi": false,
             "name": "mds_servers",
             "options": [ ],
-            "query": "label_values(ceph_mds_inodes{job=~\"$job\"}, ceph_daemon)",
+            "query": "label_values(ceph_mds_inodes{cluster=~\"$cluster\", }, ceph_daemon)",
             "refresh": 1,
             "regex": "",
             "sort": 1,