Skip to content

Commit 2d0108a

Browse files
afreen23afreen23
authored
Merge pull request ceph#64755 from cloudbehl/grafana-rate-irate-fix
ceph-mixin: Update monitoring mixin Reviewed-by: Aashish Sharma <[email protected]> Reviewed-by: SuperQ <[email protected]>
2 parents def26db + ebca859 commit 2d0108a

21 files changed

+185
-77
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ local g = import 'grafonnet/grafana.libsonnet';
175175
{ color: 'green' },
176176
])
177177
.addTarget($.addTargetSchema(
178-
expr='sum(irate(ceph_osd_op_w_in_bytes{%(matchers)s}[5m]))' % $.matchers(),
178+
expr='sum(rate(ceph_osd_op_w_in_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
179179
instant=true,
180180
interval='$interval',
181181
datasource='$datasource',
@@ -198,7 +198,7 @@ local g = import 'grafonnet/grafana.libsonnet';
198198
{ color: '#9ac48a', value: 0 },
199199
])
200200
.addTarget($.addTargetSchema(
201-
expr='sum(irate(ceph_osd_op_r_out_bytes{%(matchers)s}[5m]))' % $.matchers(),
201+
expr='sum(rate(ceph_osd_op_r_out_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
202202
instant=true,
203203
interval='$interval',
204204
datasource='$datasource',
@@ -517,7 +517,7 @@ local g = import 'grafonnet/grafana.libsonnet';
517517
])
518518
.addTargets([
519519
$.addTargetSchema(
520-
expr='sum(irate(ceph_osd_op_w{%(matchers)s}[1m]))' % $.matchers(),
520+
expr='sum(rate(ceph_osd_op_w{%(matchers)s}[$__rate_interval]))' % $.matchers(),
521521
legendFormat='',
522522
datasource='$datasource',
523523
instant=true,
@@ -548,7 +548,7 @@ local g = import 'grafonnet/grafana.libsonnet';
548548
])
549549
.addTargets([
550550
$.addTargetSchema(
551-
expr='sum(irate(ceph_osd_op_r{%(matchers)s}[1m]))' % $.matchers(),
551+
expr='sum(rate(ceph_osd_op_r{%(matchers)s}[$__rate_interval]))' % $.matchers(),
552552
legendFormat='',
553553
datasource='$datasource',
554554
instant=true,
@@ -751,15 +751,15 @@ local g = import 'grafonnet/grafana.libsonnet';
751751
.addTargets(
752752
[
753753
$.addTargetSchema(
754-
expr='sum(irate(ceph_osd_op_w_in_bytes{%(matchers)s}[5m]))' % $.matchers(),
754+
expr='sum(rate(ceph_osd_op_w_in_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
755755
datasource='$datasource',
756756
interval='$interval',
757757
legendFormat='Write',
758758
step=300,
759759
range=true,
760760
),
761761
$.addTargetSchema(
762-
expr='sum(irate(ceph_osd_op_r_out_bytes{%(matchers)s}[5m]))' % $.matchers(),
762+
expr='sum(rate(ceph_osd_op_r_out_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
763763
datasource='$datasource',
764764
interval='$interval',
765765
legendFormat='Read',
@@ -794,15 +794,15 @@ local g = import 'grafonnet/grafana.libsonnet';
794794
.addTargets(
795795
[
796796
$.addTargetSchema(
797-
expr='sum(irate(ceph_osd_op_w{%(matchers)s}[1m]))' % $.matchers(),
797+
expr='sum(rate(ceph_osd_op_w{%(matchers)s}[$__rate_interval]))' % $.matchers(),
798798
datasource='$datasource',
799799
interval='$interval',
800800
legendFormat='Write',
801801
step=300,
802802
range=true,
803803
),
804804
$.addTargetSchema(
805-
expr='sum(irate(ceph_osd_op_r{%(matchers)s}[1m]))' % $.matchers(),
805+
expr='sum(rate(ceph_osd_op_r{%(matchers)s}[$__rate_interval]))' % $.matchers(),
806806
datasource='$datasource',
807807
interval='$interval',
808808
legendFormat='Read',
@@ -1320,7 +1320,7 @@ local g = import 'grafonnet/grafana.libsonnet';
13201320
])
13211321
.addTargets([
13221322
$.addTargetSchema(
1323-
expr='sum(irate(ceph_osd_recovery_ops{%(matchers)s}[$interval]))' % $.matchers(),
1323+
expr='sum(rate(ceph_osd_recovery_ops{%(matchers)s}[$__rate_interval]))' % $.matchers(),
13241324
datasource='$datasource',
13251325
interval='$interval',
13261326
legendFormat='OPS',
@@ -1465,7 +1465,7 @@ local g = import 'grafonnet/grafana.libsonnet';
14651465
yBucketSize=null,
14661466
pluginVersion='9.4.7',
14671467
).addTarget($.addTargetSchema(
1468-
expr='rate(ceph_osd_op_r_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[5m]) >= 0' % $.matchers(),
1468+
expr='rate(ceph_osd_op_r_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[$__rate_interval]) >= 0' % $.matchers(),
14691469
datasource='$datasource',
14701470
interval='$interval',
14711471
instant=false,
@@ -1516,7 +1516,7 @@ local g = import 'grafonnet/grafana.libsonnet';
15161516
yBucketSize=null,
15171517
pluginVersion='9.4.7',
15181518
).addTarget($.addTargetSchema(
1519-
expr='rate(ceph_osd_op_w_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[5m]) >= 0' % $.matchers(),
1519+
expr='rate(ceph_osd_op_w_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[$__rate_interval]) >= 0' % $.matchers(),
15201520
datasource='$datasource',
15211521
interval='$interval',
15221522
legendFormat='',
@@ -1547,12 +1547,12 @@ local g = import 'grafonnet/grafana.libsonnet';
15471547
])
15481548
.addTargets([
15491549
$.addTargetSchema(
1550-
expr='avg(rate(ceph_osd_op_r_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[5m]) >= 0)' % $.matchers(),
1550+
expr='avg(rate(ceph_osd_op_r_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[$__rate_interval]) >= 0)' % $.matchers(),
15511551
datasource='$datasource',
15521552
legendFormat='Read',
15531553
),
15541554
$.addTargetSchema(
1555-
expr='avg(rate(ceph_osd_op_w_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[5m]) >= 0)' % $.matchers(),
1555+
expr='avg(rate(ceph_osd_op_w_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[$__rate_interval]) >= 0)' % $.matchers(),
15561556
datasource='$datasource',
15571557
legendFormat='Write',
15581558
),

‎monitoring/ceph-mixin/dashboards/ceph-nvmeof-performance.libsonnet‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ local g = import 'grafonnet/grafana.libsonnet';
119119
])
120120
.addTarget(
121121
$.addTargetSchema(
122-
expr="avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[1m]))",
122+
expr="avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[$__rate_interval]))",
123123
format='',
124124
instant=false,
125125
legendFormat='{{name}}',
@@ -155,7 +155,7 @@ local g = import 'grafonnet/grafana.libsonnet';
155155
])
156156
.addTarget(
157157
$.addTargetSchema(
158-
expr="avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[1m]))\n",
158+
expr="avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[$__rate_interval]))",
159159
format='',
160160
instant=false,
161161
legendFormat='{{name}}',
@@ -191,7 +191,7 @@ local g = import 'grafonnet/grafana.libsonnet';
191191
])
192192
.addTarget(
193193
$.addTargetSchema(
194-
expr="avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[30s])) > 0)\n",
194+
expr="avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
195195
format='time_series',
196196
instant=false,
197197
legendFormat='Reads',
@@ -201,7 +201,7 @@ local g = import 'grafonnet/grafana.libsonnet';
201201
)
202202
.addTarget(
203203
$.addTargetSchema(
204-
expr="avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[30s])) > 0)",
204+
expr="avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
205205
format='time_series',
206206
instant=false,
207207
legendFormat='Writes',
@@ -237,7 +237,7 @@ local g = import 'grafonnet/grafana.libsonnet';
237237
])
238238
.addTarget(
239239
$.addTargetSchema(
240-
expr="sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m]))",
240+
expr="sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
241241
format='time_series',
242242
instant=false,
243243
legendFormat='__auto',
@@ -272,7 +272,7 @@ local g = import 'grafonnet/grafana.libsonnet';
272272
])
273273
.addTarget(
274274
$.addTargetSchema(
275-
expr="\nsum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
275+
expr="sum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
276276
format='time_series',
277277
instant=false,
278278
legendFormat='__auto',
@@ -308,7 +308,7 @@ local g = import 'grafonnet/grafana.libsonnet';
308308
])
309309
.addTarget(
310310
$.addTargetSchema(
311-
expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
311+
expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
312312
format='time_series',
313313
instant=false,
314314
legendFormat='{{pool_name}}/{{rbd_name}}',
@@ -344,7 +344,7 @@ local g = import 'grafonnet/grafana.libsonnet';
344344
])
345345
.addTarget(
346346
$.addTargetSchema(
347-
expr="sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m]))",
347+
expr="sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
348348
format='time_series',
349349
instant=false,
350350
legendFormat='{{name}}',
@@ -379,7 +379,7 @@ local g = import 'grafonnet/grafana.libsonnet';
379379
])
380380
.addTarget(
381381
$.addTargetSchema(
382-
expr="\nsum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
382+
expr="sum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
383383
format='time_series',
384384
instant=false,
385385
legendFormat='__auto',
@@ -415,7 +415,7 @@ local g = import 'grafonnet/grafana.libsonnet';
415415
])
416416
.addTarget(
417417
$.addTargetSchema(
418-
expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
418+
expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
419419
format='time_series',
420420
instant=false,
421421
legendFormat='{{name}}',

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ local g = import 'grafonnet/grafana.libsonnet';
696696
])
697697
.addTarget(
698698
$.addTargetSchema(
699-
expr="sum(irate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
699+
expr="sum(rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
700700
format='time_series',
701701
instant=null,
702702
legendFormat='Read',
@@ -706,7 +706,7 @@ local g = import 'grafonnet/grafana.libsonnet';
706706
)
707707
.addTarget(
708708
$.addTargetSchema(
709-
expr="sum(irate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
709+
expr="sum(rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
710710
format='time_series',
711711
instant=false,
712712
legendFormat='Write',
@@ -735,7 +735,7 @@ local g = import 'grafonnet/grafana.libsonnet';
735735
])
736736
.addTarget(
737737
$.addTargetSchema(
738-
expr="sum (irate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
738+
expr="sum (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
739739
format='time_series',
740740
instant=false,
741741
legendFormat='Read',
@@ -745,7 +745,7 @@ local g = import 'grafonnet/grafana.libsonnet';
745745
)
746746
.addTarget(
747747
$.addTargetSchema(
748-
expr="sum (irate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
748+
expr="sum (rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
749749
format='time_series',
750750
instant=false,
751751
legendFormat='Write',

‎monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ local g = import 'grafonnet/grafana.libsonnet';
440440
])
441441
.addTargets([
442442
$.addTargetSchema(
443-
expr='sum(irate(ceph_pool_wr{cluster=~"$cluster"}[$__interval]))',
443+
expr='sum(rate(ceph_pool_wr{cluster=~"$cluster"}[$__rate_interval]))',
444444
datasource={ type: 'prometheus', uid: '$datasource' },
445445
hide=false,
446446
exemplar=false,
@@ -449,7 +449,7 @@ local g = import 'grafonnet/grafana.libsonnet';
449449
range=true,
450450
),
451451
$.addTargetSchema(
452-
expr='sum(irate(ceph_pool_rd{cluster=~"$cluster"}[$__interval]))',
452+
expr='sum(rate(ceph_pool_rd{cluster=~"$cluster"}[$__rate_interval]))',
453453
datasource={ type: 'prometheus', uid: '$datasource' },
454454
hide=false,
455455
exemplar=false,
@@ -617,7 +617,7 @@ local g = import 'grafonnet/grafana.libsonnet';
617617
])
618618
.addTargets([
619619
$.addTargetSchema(
620-
expr='sum(irate(ceph_pool_rd_bytes{cluster=~"$cluster"}[$__interval]))',
620+
expr='sum(rate(ceph_pool_rd_bytes{cluster=~"$cluster"}[$__rate_interval]))',
621621
datasource={ type: 'prometheus', uid: '$datasource' },
622622
hide=false,
623623
exemplar=false,
@@ -626,7 +626,7 @@ local g = import 'grafonnet/grafana.libsonnet';
626626
range=true,
627627
),
628628
$.addTargetSchema(
629-
expr='sum(irate(ceph_pool_wr_bytes{cluster=~"$cluster"}[$__interval]))',
629+
expr='sum(rate(ceph_pool_wr_bytes{cluster=~"$cluster"}[$__rate_interval]))',
630630
datasource={ type: 'prometheus', uid: '$datasource' },
631631
hide=false,
632632
exemplar=false,
@@ -651,7 +651,7 @@ local g = import 'grafonnet/grafana.libsonnet';
651651
])
652652
.addTargets([
653653
$.addTargetSchema(
654-
expr='sum(irate(ceph_osd_recovery_ops{cluster=~"$cluster"}[$__interval]))',
654+
expr='sum(rate(ceph_osd_recovery_ops{cluster=~"$cluster"}[$__rate_interval]))',
655655
datasource={ type: 'prometheus', uid: '$datasource' },
656656
hide=false,
657657
exemplar=false,
@@ -891,7 +891,7 @@ local g = import 'grafonnet/grafana.libsonnet';
891891
.addTargets(
892892
[
893893
$.addTargetSchema(
894-
expr='topk(10, sum by (cluster) (irate(ceph_osd_op_w[$__interval])) \n+ sum by (cluster) (irate(ceph_osd_op_r[$__interval])) )',
894+
expr='topk(10, sum by (cluster) (rate(ceph_osd_op_w[$__rate_interval])) \n+ sum by (cluster) (rate(ceph_osd_op_r[$__rate_interval])) )',
895895
datasource='$datasource',
896896
instant=false,
897897
legendFormat='{{cluster}}',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ local timeSeries = import 'timeseries_panel.libsonnet';
486486
refresh=0,
487487
label='Interval',
488488
auto_count=10,
489-
auto_min='2m',
489+
auto_min='1m',
490490
options=[],
491491
auto=null)::
492492
g.template.interval(name=name,

0 commit comments

Comments
 (0)