Skip to content

Commit 6f3f58c

Browse files
author
Aashish Sharma
committed
mgr/dashboard: Consider null values as zero in grafana panels
After upgrading from RHCS4 to RHCS5..some of the grafana charts broke. This is because in RHCS5 we do not generate the metrics if its value is zero as a result the null value from that metric breaks the grafana charts or graphs. This PR is to fix the above mentioned issue. Fixes: https://tracker.ceph.com/issues/63088 Signed-off-by: Aashish Sharma <[email protected]>
1 parent b02c45b commit 6f3f58c

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

‎monitoring/ceph-mixin/dashboards/osd.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ local g = import 'grafonnet/grafana.libsonnet';
342342
$.graphPanelSchema({},
343343
title,
344344
description,
345-
'null',
345+
'null as zero',
346346
false,
347347
formatY1,
348348
'short',

‎monitoring/ceph-mixin/dashboards/rbd.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ local u = import 'utils.libsonnet';
133133
$.graphPanelSchema({},
134134
title,
135135
'',
136-
'null',
136+
'null as zero',
137137
false,
138138
formatY1,
139139
'short',

‎monitoring/ceph-mixin/dashboards/rgw.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ local u = import 'utils.libsonnet';
140140
{},
141141
title,
142142
description,
143-
'null',
143+
'null as zero',
144144
false,
145145
formatY1,
146146
formatY2,
@@ -658,7 +658,7 @@ local u = import 'utils.libsonnet';
658658
$.graphPanelSchema(aliasColors,
659659
title,
660660
description,
661-
'null',
661+
'null as zero',
662662
false,
663663
formatY1,
664664
formatY2,

‎monitoring/ceph-mixin/dashboards_out/osd-device-details.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"lines": true,
8888
"linewidth": 1,
8989
"links": [ ],
90-
"nullPointMode": "null",
90+
"nullPointMode": "null as zero",
9191
"percentage": false,
9292
"pointradius": 5,
9393
"points": false,
@@ -185,7 +185,7 @@
185185
"lines": true,
186186
"linewidth": 1,
187187
"links": [ ],
188-
"nullPointMode": "null",
188+
"nullPointMode": "null as zero",
189189
"percentage": false,
190190
"pointradius": 5,
191191
"points": false,
@@ -283,7 +283,7 @@
283283
"lines": true,
284284
"linewidth": 1,
285285
"links": [ ],
286-
"nullPointMode": "null",
286+
"nullPointMode": "null as zero",
287287
"percentage": false,
288288
"pointradius": 5,
289289
"points": false,
@@ -400,7 +400,7 @@
400400
"lines": true,
401401
"linewidth": 1,
402402
"links": [ ],
403-
"nullPointMode": "null",
403+
"nullPointMode": "null as zero",
404404
"percentage": false,
405405
"pointradius": 5,
406406
"points": false,
@@ -498,7 +498,7 @@
498498
"lines": true,
499499
"linewidth": 1,
500500
"links": [ ],
501-
"nullPointMode": "null",
501+
"nullPointMode": "null as zero",
502502
"percentage": false,
503503
"pointradius": 5,
504504
"points": false,
@@ -596,7 +596,7 @@
596596
"lines": true,
597597
"linewidth": 1,
598598
"links": [ ],
599-
"nullPointMode": "null",
599+
"nullPointMode": "null as zero",
600600
"percentage": false,
601601
"pointradius": 5,
602602
"points": false,

‎monitoring/ceph-mixin/dashboards_out/radosgw-detail.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"lines": true,
9494
"linewidth": 1,
9595
"links": [ ],
96-
"nullPointMode": "null",
96+
"nullPointMode": "null as zero",
9797
"percentage": false,
9898
"pointradius": 5,
9999
"points": false,
@@ -186,7 +186,7 @@
186186
"lines": true,
187187
"linewidth": 1,
188188
"links": [ ],
189-
"nullPointMode": "null",
189+
"nullPointMode": "null as zero",
190190
"percentage": false,
191191
"pointradius": 5,
192192
"points": false,
@@ -285,7 +285,7 @@
285285
"lines": true,
286286
"linewidth": 1,
287287
"links": [ ],
288-
"nullPointMode": "null",
288+
"nullPointMode": "null as zero",
289289
"percentage": false,
290290
"pointradius": 5,
291291
"points": false,

‎monitoring/ceph-mixin/dashboards_out/radosgw-overview.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"lines": true,
8888
"linewidth": 1,
8989
"links": [ ],
90-
"nullPointMode": "null",
90+
"nullPointMode": "null as zero",
9191
"percentage": false,
9292
"pointradius": 5,
9393
"points": false,
@@ -180,7 +180,7 @@
180180
"lines": true,
181181
"linewidth": 1,
182182
"links": [ ],
183-
"nullPointMode": "null",
183+
"nullPointMode": "null as zero",
184184
"percentage": false,
185185
"pointradius": 5,
186186
"points": false,
@@ -266,7 +266,7 @@
266266
"lines": true,
267267
"linewidth": 1,
268268
"links": [ ],
269-
"nullPointMode": "null",
269+
"nullPointMode": "null as zero",
270270
"percentage": false,
271271
"pointradius": 5,
272272
"points": false,
@@ -352,7 +352,7 @@
352352
"lines": true,
353353
"linewidth": 1,
354354
"links": [ ],
355-
"nullPointMode": "null",
355+
"nullPointMode": "null as zero",
356356
"percentage": false,
357357
"pointradius": 5,
358358
"points": false,
@@ -445,7 +445,7 @@
445445
"lines": true,
446446
"linewidth": 1,
447447
"links": [ ],
448-
"nullPointMode": "null",
448+
"nullPointMode": "null as zero",
449449
"percentage": false,
450450
"pointradius": 5,
451451
"points": false,
@@ -531,7 +531,7 @@
531531
"lines": true,
532532
"linewidth": 1,
533533
"links": [ ],
534-
"nullPointMode": "null",
534+
"nullPointMode": "null as zero",
535535
"percentage": false,
536536
"pointradius": 5,
537537
"points": false,
@@ -636,7 +636,7 @@
636636
"lines": true,
637637
"linewidth": 1,
638638
"links": [ ],
639-
"nullPointMode": "null",
639+
"nullPointMode": "null as zero",
640640
"percentage": false,
641641
"pointradius": 5,
642642
"points": false,
@@ -754,7 +754,7 @@
754754
"lines": true,
755755
"linewidth": 1,
756756
"links": [ ],
757-
"nullPointMode": "null",
757+
"nullPointMode": "null as zero",
758758
"percentage": false,
759759
"pointradius": 5,
760760
"points": false,
@@ -893,7 +893,7 @@
893893
"lines": true,
894894
"linewidth": 1,
895895
"links": [ ],
896-
"nullPointMode": "null",
896+
"nullPointMode": "null as zero",
897897
"percentage": false,
898898
"pointradius": 5,
899899
"points": false,
@@ -1000,7 +1000,7 @@
10001000
"lines": true,
10011001
"linewidth": 1,
10021002
"links": [ ],
1003-
"nullPointMode": "null",
1003+
"nullPointMode": "null as zero",
10041004
"percentage": false,
10051005
"pointradius": 5,
10061006
"points": false,

‎monitoring/ceph-mixin/dashboards_out/rbd-overview.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"lines": true,
8181
"linewidth": 1,
8282
"links": [ ],
83-
"nullPointMode": "null",
83+
"nullPointMode": "null as zero",
8484
"percentage": false,
8585
"pointradius": 5,
8686
"points": false,
@@ -173,7 +173,7 @@
173173
"lines": true,
174174
"linewidth": 1,
175175
"links": [ ],
176-
"nullPointMode": "null",
176+
"nullPointMode": "null as zero",
177177
"percentage": false,
178178
"pointradius": 5,
179179
"points": false,
@@ -266,7 +266,7 @@
266266
"lines": true,
267267
"linewidth": 1,
268268
"links": [ ],
269-
"nullPointMode": "null",
269+
"nullPointMode": "null as zero",
270270
"percentage": false,
271271
"pointradius": 5,
272272
"points": false,

0 commit comments

Comments
 (0)