Skip to content

Commit fce7c52

Browse files
aaSharma14aaSharma14
authored
Merge pull request ceph#56575 from cloudbehl/ceph-cluster-json-update
monitoring/ceph-mixin: Add cluster variable to ceph-cluster.json Reviewed-by: Aashish Sharma <[email protected]>
2 parents a8d01ff + 2df3ce1 commit fce7c52

File tree

1 file changed

+51
-29
lines changed

1 file changed

+51
-29
lines changed

‎monitoring/ceph-mixin/dashboards_out/ceph-cluster.json‎

Lines changed: 51 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"tableColumn": "",
102102
"targets": [
103103
{
104-
"expr": "ceph_health_status",
104+
"expr": "ceph_health_status{cluster=~'$cluster'}",
105105
"format": "time_series",
106106
"instant": true,
107107
"interval": "$interval",
@@ -182,7 +182,7 @@
182182
"displayAliasType": "Always",
183183
"displayType": "Regular",
184184
"displayValueWithAlias": "When Alias Displayed",
185-
"expr": "count(ceph_osd_metadata)",
185+
"expr": "count(ceph_osd_metadata{cluster=~'$cluster'})",
186186
"format": "time_series",
187187
"intervalFactor": 1,
188188
"legendFormat": "All",
@@ -197,7 +197,7 @@
197197
"displayAliasType": "Always",
198198
"displayType": "Regular",
199199
"displayValueWithAlias": "When Alias Displayed",
200-
"expr": "sum(ceph_osd_in)",
200+
"expr": "sum(ceph_osd_in{cluster=~'$cluster'})",
201201
"format": "time_series",
202202
"intervalFactor": 1,
203203
"legendFormat": "In",
@@ -212,7 +212,7 @@
212212
"displayAliasType": "Warning / Critical",
213213
"displayType": "Regular",
214214
"displayValueWithAlias": "When Alias Displayed",
215-
"expr": "sum(ceph_osd_in == bool 0)",
215+
"expr": "sum(ceph_osd_in{cluster=~'$cluster'} == bool 0)",
216216
"format": "time_series",
217217
"interval": "",
218218
"intervalFactor": 1,
@@ -229,7 +229,7 @@
229229
"displayAliasType": "Always",
230230
"displayType": "Regular",
231231
"displayValueWithAlias": "When Alias Displayed",
232-
"expr": "sum(ceph_osd_up)",
232+
"expr": "sum(ceph_osd_up{cluster=~'$cluster'})",
233233
"format": "time_series",
234234
"intervalFactor": 1,
235235
"legendFormat": "Up",
@@ -245,7 +245,7 @@
245245
"displayAliasType": "Warning / Critical",
246246
"displayType": "Regular",
247247
"displayValueWithAlias": "When Alias Displayed",
248-
"expr": "sum(ceph_osd_up == bool 0)",
248+
"expr": "sum(ceph_osd_up{cluster=~'$cluster'} == bool 0)",
249249
"format": "time_series",
250250
"intervalFactor": 1,
251251
"legendFormat": "Down",
@@ -392,7 +392,7 @@
392392
"displayAliasType": "Always",
393393
"displayType": "Regular",
394394
"displayValueWithAlias": "When Alias Displayed",
395-
"expr": "sum(ceph_mon_quorum_status)",
395+
"expr": "sum(ceph_mon_quorum_status{cluster=~'$cluster'})",
396396
"format": "time_series",
397397
"interval": "",
398398
"intervalFactor": 1,
@@ -409,7 +409,7 @@
409409
"displayAliasType": "Always",
410410
"displayType": "Regular",
411411
"displayValueWithAlias": "When Alias Displayed",
412-
"expr": "count(ceph_mon_quorum_status)",
412+
"expr": "count(ceph_mon_quorum_status{cluster=~'$cluster'})",
413413
"format": "time_series",
414414
"intervalFactor": 1,
415415
"legendFormat": "Total",
@@ -426,7 +426,7 @@
426426
"displayAliasType": "Warning / Critical",
427427
"displayType": "Annotation",
428428
"displayValueWithAlias": "Never",
429-
"expr": "count(ceph_mon_quorum_status) - sum(ceph_mon_quorum_status)",
429+
"expr": "count(ceph_mon_quorum_status{cluster=~'$cluster'}) - sum(ceph_mon_quorum_status{cluster=~'$cluster'})",
430430
"format": "time_series",
431431
"intervalFactor": 1,
432432
"legendFormat": "MONs out of Quorum",
@@ -486,7 +486,7 @@
486486
"displayAliasType": "Always",
487487
"displayType": "Regular",
488488
"displayValueWithAlias": "When Alias Displayed",
489-
"expr": "count(ceph_mgr_status == 1) or vector(0)",
489+
"expr": "count(ceph_mgr_status{cluster=~'$cluster'} == 1) or vector(0)",
490490
"format": "time_series",
491491
"intervalFactor": 1,
492492
"instant": true,
@@ -502,7 +502,7 @@
502502
"displayAliasType": "Always",
503503
"displayType": "Regular",
504504
"displayValueWithAlias": "When Alias Displayed",
505-
"expr": "count(ceph_mgr_status == 0) or vector(0)",
505+
"expr": "count(ceph_mgr_status{cluster=~'$cluster'} == 0) or vector(0)",
506506
"format": "time_series",
507507
"instant": true,
508508
"intervalFactor": 1,
@@ -577,7 +577,7 @@
577577
"tableColumn": "",
578578
"targets": [
579579
{
580-
"expr": "sum(ceph_osd_stat_bytes_used)/sum(ceph_osd_stat_bytes)",
580+
"expr": "sum(ceph_osd_stat_bytes_used{cluster=~'$cluster'})/sum(ceph_osd_stat_bytes{cluster=~'$cluster'})",
581581
"format": "time_series",
582582
"intervalFactor": 1,
583583
"legendFormat": "Used",
@@ -677,49 +677,49 @@
677677
"steppedLine": false,
678678
"targets": [
679679
{
680-
"expr": "sum(ceph_pg_total)",
680+
"expr": "sum(ceph_pg_total{cluster=~'$cluster'})",
681681
"format": "time_series",
682682
"intervalFactor": 1,
683683
"legendFormat": "Total",
684684
"refId": "A"
685685
},
686686
{
687-
"expr": "sum(ceph_pg_active)",
687+
"expr": "sum(ceph_pg_active{cluster=~'$cluster'})",
688688
"format": "time_series",
689689
"intervalFactor": 1,
690690
"legendFormat": "Active",
691691
"refId": "B"
692692
},
693693
{
694-
"expr": "sum(ceph_pg_total - ceph_pg_active)",
694+
"expr": "sum(ceph_pg_total{cluster=~'$cluster'} - ceph_pg_active{cluster=~'$cluster'})",
695695
"format": "time_series",
696696
"intervalFactor": 1,
697697
"legendFormat": "Inactive",
698698
"refId": "G"
699699
},
700700
{
701-
"expr": "sum(ceph_pg_undersized)",
701+
"expr": "sum(ceph_pg_undersized{cluster=~'$cluster'})",
702702
"format": "time_series",
703703
"intervalFactor": 1,
704704
"legendFormat": "Undersized",
705705
"refId": "F"
706706
},
707707
{
708-
"expr": "sum(ceph_pg_degraded)",
708+
"expr": "sum(ceph_pg_degraded{cluster=~'$cluster'})",
709709
"format": "time_series",
710710
"intervalFactor": 1,
711711
"legendFormat": "Degraded",
712712
"refId": "C"
713713
},
714714
{
715-
"expr": "sum(ceph_pg_inconsistent)",
715+
"expr": "sum(ceph_pg_inconsistent{cluster=~'$cluster'})",
716716
"format": "time_series",
717717
"intervalFactor": 1,
718718
"legendFormat": "Inconsistent",
719719
"refId": "D"
720720
},
721721
{
722-
"expr": "sum(ceph_pg_down)",
722+
"expr": "sum(ceph_pg_down{cluster=~'$cluster'})",
723723
"format": "time_series",
724724
"intervalFactor": 1,
725725
"legendFormat": "Down",
@@ -813,28 +813,28 @@
813813
"steppedLine": false,
814814
"targets": [
815815
{
816-
"expr": "quantile(0.95, ceph_osd_apply_latency_ms)",
816+
"expr": "quantile(0.95, ceph_osd_apply_latency_ms{cluster=~'$cluster'})",
817817
"format": "time_series",
818818
"intervalFactor": 1,
819819
"legendFormat": "Apply Latency P_95",
820820
"refId": "A"
821821
},
822822
{
823-
"expr": "quantile(0.95, ceph_osd_commit_latency_ms)",
823+
"expr": "quantile(0.95, ceph_osd_commit_latency_ms{cluster=~'$cluster'})",
824824
"format": "time_series",
825825
"intervalFactor": 1,
826826
"legendFormat": "Commit Latency P_95",
827827
"refId": "B"
828828
},
829829
{
830-
"expr": "avg(ceph_osd_apply_latency_ms)",
830+
"expr": "avg(ceph_osd_apply_latency_ms{cluster=~'$cluster'})",
831831
"format": "time_series",
832832
"intervalFactor": 1,
833833
"legendFormat": "Avg Apply Latency",
834834
"refId": "C"
835835
},
836836
{
837-
"expr": "avg(ceph_osd_commit_latency_ms)",
837+
"expr": "avg(ceph_osd_commit_latency_ms{cluster=~'$cluster'})",
838838
"format": "time_series",
839839
"intervalFactor": 1,
840840
"legendFormat": "Avg Commit Latency",
@@ -928,14 +928,14 @@
928928
"steppedLine": false,
929929
"targets": [
930930
{
931-
"expr": "sum(irate(ceph_osd_op_w_in_bytes[1m]))",
931+
"expr": "sum(irate(ceph_osd_op_w_in_bytes{cluster=~'$cluster'}[1m]))",
932932
"format": "time_series",
933933
"intervalFactor": 1,
934934
"legendFormat": "Writes",
935935
"refId": "A"
936936
},
937937
{
938-
"expr": "sum(irate(ceph_osd_op_r_out_bytes[1m]))",
938+
"expr": "sum(irate(ceph_osd_op_r_out_bytes{cluster=~'$cluster'}[1m]))",
939939
"format": "time_series",
940940
"intervalFactor": 1,
941941
"legendFormat": "Reads",
@@ -1024,7 +1024,7 @@
10241024
"steppedLine": false,
10251025
"targets": [
10261026
{
1027-
"expr": "sum(deriv(ceph_pool_stored[1m]))",
1027+
"expr": "sum(deriv(ceph_pool_stored{cluster=~'$cluster'}[1m]))",
10281028
"format": "time_series",
10291029
"intervalFactor": 1,
10301030
"refId": "A"
@@ -1097,7 +1097,7 @@
10971097
"span": 12,
10981098
"targets": [
10991099
{
1100-
"expr": "ceph_osd_stat_bytes_used / ceph_osd_stat_bytes",
1100+
"expr": "ceph_osd_stat_bytes_used{cluster=~'$cluster'} / ceph_osd_stat_bytes{cluster=~'$cluster'}",
11011101
"format": "time_series",
11021102
"interval": "1m",
11031103
"intervalFactor": 1,
@@ -1159,7 +1159,7 @@
11591159
"links": [],
11601160
"targets": [
11611161
{
1162-
"expr": "ceph_osd_numpg",
1162+
"expr": "ceph_osd_numpg{cluster=~'$cluster'}",
11631163
"format": "time_series",
11641164
"intervalFactor": 1,
11651165
"legendFormat": "#PGs",
@@ -1235,7 +1235,7 @@
12351235
"steppedLine": false,
12361236
"targets": [
12371237
{
1238-
"expr": "sum(irate(ceph_osd_recovery_ops[1m]))",
1238+
"expr": "sum(irate(ceph_osd_recovery_ops{cluster=~'$cluster'}[1m]))",
12391239
"format": "time_series",
12401240
"intervalFactor": 1,
12411241
"legendFormat": "Op/s",
@@ -1298,6 +1298,28 @@
12981298
"regex": "",
12991299
"type": "datasource"
13001300
},
1301+
{
1302+
"datasource": {
1303+
"type": "prometheus",
1304+
"uid": "${datasource}"
1305+
},
1306+
"definition": "label_values(ceph_health_status, cluster)",
1307+
"hide": 0,
1308+
"includeAll": false,
1309+
"label": "Cluster",
1310+
"multi": false,
1311+
"name": "cluster",
1312+
"options": [],
1313+
"query": {
1314+
"query": "label_values(ceph_health_status, cluster)",
1315+
"refId": "StandardVariableQuery"
1316+
},
1317+
"refresh": 1,
1318+
"regex": "",
1319+
"skipUrlSync": false,
1320+
"sort": 0,
1321+
"type": "query"
1322+
},
13011323
{
13021324
"auto": true,
13031325
"auto_count": 10,

0 commit comments

Comments
 (0)