Skip to content

Commit 6ec22c5

Browse files
HeleneHelene
authored
Merge pull request #296 from Helene/reorganize_health_dashboards
Reorganize cluster overview and health dashboards
2 parents 3f8f20e + 374a78c commit 6ec22c5

8 files changed

+88
-605
lines changed

‎examples/grafana_dashboards/gpfs_cluster_overview/OpenTSDB as Datasource/Component entities health details-1744210764312.json renamed to ‎examples/grafana_dashboards/gpfs_cluster_health_overview/OpenTSDB as Datasource/Component entities health details-1744210764312.json

File renamed without changes.

‎examples/grafana_dashboards/gpfs_cluster_overview/OpenTSDB as Datasource/Component health view by node selection-1744210897233.json renamed to ‎examples/grafana_dashboards/gpfs_cluster_health_overview/OpenTSDB as Datasource/Component health view by node selection-1744210897233.json

File renamed without changes.

‎examples/grafana_dashboards/gpfs_cluster_overview/OpenTSDB as Datasource/GPFS Cluster overview-1733823295064.json renamed to ‎examples/grafana_dashboards/gpfs_cluster_health_overview/OpenTSDB as Datasource/GPFS Cluster overview-1733823295064.json

File renamed without changes.

‎examples/grafana_dashboards/gpfs_health/Prometheus as Datasource/Component entities health details-1733829621654.json renamed to ‎examples/grafana_dashboards/gpfs_cluster_health_overview/Prometheus as Datasource/Component entities health details (Prometheus)-1744657067175.json

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"__inputs": [
33
{
4-
"name": "DS_PROMETHEUS-HWASSMANN1-VM",
5-
"label": "Prometheus-hwassmann1-vm",
4+
"name": "DS_OCP2-THANOS-QUERIER",
5+
"label": "ocp2-thanos-querier",
66
"description": "",
77
"type": "datasource",
88
"pluginId": "prometheus",
@@ -15,7 +15,7 @@
1515
"type": "grafana",
1616
"id": "grafana",
1717
"name": "Grafana",
18-
"version": "11.0.0"
18+
"version": "11.5.1"
1919
},
2020
{
2121
"type": "datasource",
@@ -55,7 +55,7 @@
5555
{
5656
"datasource": {
5757
"type": "prometheus",
58-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
58+
"uid": "${Datasource}"
5959
},
6060
"fieldConfig": {
6161
"defaults": {
@@ -132,20 +132,22 @@
132132
"rowHeight": 0.9,
133133
"showValue": "never",
134134
"tooltip": {
135+
"hideZeros": false,
135136
"maxHeight": 600,
136137
"mode": "single",
137138
"sort": "none"
138139
}
139140
},
141+
"pluginVersion": "11.5.1",
140142
"targets": [
141143
{
142144
"datasource": {
143145
"type": "prometheus",
144-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
146+
"uid": "${DS_OCP2-THANOS-QUERIER}"
145147
},
146148
"disableTextWrap": false,
147149
"editorMode": "code",
148-
"expr": "max_over_time(gpfs_health_status{node=\"$Node\", gpfs_health_component=\"$Component\"}[15m])",
150+
"expr": "max without (instance, pod) (max_over_time(gpfs_health_status{node=\"$Node\", gpfs_health_component=\"$Component\"}[15m]))",
149151
"fullMetaSearch": false,
150152
"includeNullMetadata": true,
151153
"instant": false,
@@ -170,7 +172,7 @@
170172
}
171173
],
172174
"refresh": "30s",
173-
"schemaVersion": 39,
175+
"schemaVersion": 40,
174176
"tags": [
175177
"health",
176178
"prometheus",
@@ -179,33 +181,23 @@
179181
"templating": {
180182
"list": [
181183
{
182-
"current": {
183-
"selected": false,
184-
"text": "Prometheus-hwassmann1-vm",
185-
"value": "fe4jlakedzm68a"
186-
},
187-
"hide": 0,
184+
"current": {},
188185
"includeAll": false,
189-
"multi": false,
190186
"name": "Datasource",
191187
"options": [],
192188
"query": "prometheus",
193-
"queryValue": "",
194189
"refresh": 1,
195190
"regex": "",
196-
"skipUrlSync": false,
197191
"type": "datasource"
198192
},
199193
{
200194
"current": {},
201195
"datasource": {
202196
"type": "prometheus",
203-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
197+
"uid": "${Datasource}"
204198
},
205199
"definition": "label_values(gpfs_health_status,node)",
206-
"hide": 0,
207200
"includeAll": false,
208-
"multi": false,
209201
"name": "Node",
210202
"options": [],
211203
"query": {
@@ -215,20 +207,16 @@
215207
},
216208
"refresh": 1,
217209
"regex": "",
218-
"skipUrlSync": false,
219-
"sort": 0,
220210
"type": "query"
221211
},
222212
{
223213
"current": {},
224214
"datasource": {
225215
"type": "prometheus",
226-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
216+
"uid": "${DS_OCP2-THANOS-QUERIER}"
227217
},
228218
"definition": "label_values(gpfs_health_status{node=\"$Node\"},gpfs_health_component)",
229-
"hide": 0,
230219
"includeAll": false,
231-
"multi": false,
232220
"name": "Component",
233221
"options": [],
234222
"query": {
@@ -238,21 +226,18 @@
238226
},
239227
"refresh": 1,
240228
"regex": "",
241-
"skipUrlSync": false,
242-
"sort": 0,
243229
"type": "query"
244230
}
245231
]
246232
},
247233
"time": {
248-
"from": "now-6h",
249-
"to": "now"
234+
"from": "2025-04-13T18:57:30.641Z",
235+
"to": "2025-04-14T18:57:30.641Z"
250236
},
251-
"timeRangeUpdatedDuringEditOrView": false,
252237
"timepicker": {},
253238
"timezone": "browser",
254-
"title": "Component entities health details",
239+
"title": "Component entities health details (Prometheus)",
255240
"uid": "ce6h32uqqu0hsf",
256-
"version": 1,
241+
"version": 5,
257242
"weekStart": ""
258243
}

‎examples/grafana_dashboards/gpfs_health/Prometheus as Datasource/Component health view by node selection-1733829602501.json renamed to ‎examples/grafana_dashboards/gpfs_cluster_health_overview/Prometheus as Datasource/Component health view by node selection (Prometheus)-1744657022047.json

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"__inputs": [
33
{
4-
"name": "DS_PROMETHEUS-HWASSMANN1-VM",
5-
"label": "Prometheus-hwassmann1-vm",
4+
"name": "DS_OCP2-THANOS-QUERIER",
5+
"label": "ocp2-thanos-querier",
66
"description": "",
77
"type": "datasource",
88
"pluginId": "prometheus",
@@ -15,7 +15,7 @@
1515
"type": "grafana",
1616
"id": "grafana",
1717
"name": "Grafana",
18-
"version": "11.0.0"
18+
"version": "11.5.1"
1919
},
2020
{
2121
"type": "datasource",
@@ -55,7 +55,7 @@
5555
{
5656
"datasource": {
5757
"type": "prometheus",
58-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
58+
"uid": "${Datasource}"
5959
},
6060
"fieldConfig": {
6161
"defaults": {
@@ -140,20 +140,22 @@
140140
"rowHeight": 0.9,
141141
"showValue": "never",
142142
"tooltip": {
143+
"hideZeros": false,
143144
"maxHeight": 600,
144145
"mode": "single",
145146
"sort": "none"
146147
}
147148
},
149+
"pluginVersion": "11.5.1",
148150
"targets": [
149151
{
150152
"datasource": {
151153
"type": "prometheus",
152-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
154+
"uid": "${DS_OCP2-THANOS-QUERIER}"
153155
},
154156
"disableTextWrap": false,
155157
"editorMode": "code",
156-
"expr": "max_over_time(gpfs_health_status{gpfs_health_entity=\"-\", node=\"$Node\"}[10m])",
158+
"expr": "max without (instance, pod) (max_over_time(gpfs_health_status{gpfs_health_entity=\"-\", node=\"$Node\"}[10m]))",
157159
"fullMetaSearch": false,
158160
"includeNullMetadata": true,
159161
"instant": false,
@@ -168,7 +170,7 @@
168170
}
169171
],
170172
"refresh": "30s",
171-
"schemaVersion": 39,
173+
"schemaVersion": 40,
172174
"tags": [
173175
"component",
174176
"prometheus",
@@ -177,33 +179,23 @@
177179
"templating": {
178180
"list": [
179181
{
180-
"current": {
181-
"selected": false,
182-
"text": "Prometheus-hwassmann1-vm",
183-
"value": "fe4jlakedzm68a"
184-
},
185-
"hide": 0,
182+
"current": {},
186183
"includeAll": false,
187-
"multi": false,
188184
"name": "Datasource",
189185
"options": [],
190186
"query": "prometheus",
191-
"queryValue": "",
192187
"refresh": 1,
193188
"regex": "",
194-
"skipUrlSync": false,
195189
"type": "datasource"
196190
},
197191
{
198192
"current": {},
199193
"datasource": {
200194
"type": "prometheus",
201-
"uid": "${DS_PROMETHEUS-HWASSMANN1-VM}"
195+
"uid": "${Datasource}"
202196
},
203197
"definition": "label_values(gpfs_health_status,node)",
204-
"hide": 0,
205198
"includeAll": false,
206-
"multi": false,
207199
"name": "Node",
208200
"options": [],
209201
"query": {
@@ -213,20 +205,17 @@
213205
},
214206
"refresh": 1,
215207
"regex": "",
216-
"skipUrlSync": false,
217-
"sort": 0,
218208
"type": "query"
219209
}
220210
]
221211
},
222212
"time": {
223-
"from": "now-6h",
213+
"from": "now-24h",
224214
"to": "now"
225215
},
226-
"timeRangeUpdatedDuringEditOrView": false,
227216
"timepicker": {},
228217
"timezone": "browser",
229-
"title": "Component health view by node selection",
218+
"title": "Component health view by node selection (Prometheus)",
230219
"uid": "be6h20r1cnpc0e",
231220
"version": 4,
232221
"weekStart": ""

0 commit comments

Comments
 (0)