Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit 129a378

Browse files
pracuccipracucci
authored
Merge pull request #280 from grafana/fix-node-disk-panels
Fixed "Disk Writes" and "Disk Reads" panels
2 parents 9b04c90 + 9ab69cb commit 129a378

File tree

7 files changed

+15
-12
lines changed

7 files changed

+15
-12
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* [ENHANCEMENT] Sort legend descending in the CPU/memory panels. #271
1414
* [ENHANCEMENT] Add config option to enable streaming of chunks in block-based ingesters. #276
1515
* [BUGFIX] Fixed `CortexQuerierHighRefetchRate` alert. #268
16+
* [BUGFIX] Fixed "Disk Writes" and "Disk Reads" panels. #280
1617

1718
## 1.7.0 / 2021-02-24
1819

‎cortex-mixin/config.libsonnet

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
// Whether resources dashboards are enabled (based on cAdvisor metrics).
4646
resources_dashboards_enabled: false,
4747

48-
// Used on panels that show metrics per instance. i.e. 'pod' in a kubernetes install
48+
// The label used to differentiate between different application instances (i.e. 'pod' in a kubernetes install).
4949
per_instance_label: 'pod',
50+
51+
// The label used to differentiate between different nodes (i.e. servers).
52+
per_node_label: 'instance',
5053
},
5154
}

‎cortex-mixin/dashboards/alertmanager-resources.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6060
.addPanel(
6161
$.panel('Writes') +
6262
$.queryPanel(
63-
'sum by(%s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('alertmanager')],
63+
'sum by(%s, %s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('alertmanager')],
6464
'{{%s}} - {{device}}' % $._config.per_instance_label
6565
) +
6666
$.stack +
@@ -69,7 +69,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6969
.addPanel(
7070
$.panel('Reads') +
7171
$.queryPanel(
72-
'sum by(%s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('alertmanager')],
72+
'sum by(%s, %s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('alertmanager')],
7373
'{{%s}} - {{device}}' % $._config.per_instance_label
7474
) +
7575
$.stack +

‎cortex-mixin/dashboards/compactor-resources.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
3636
.addPanel(
3737
$.panel('Disk Writes') +
3838
$.queryPanel(
39-
'sum by(%s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('compactor')],
39+
'sum by(%s, %s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('compactor')],
4040
'{{%s}} - {{device}}' % $._config.per_instance_label
4141
) +
4242
$.stack +
@@ -45,7 +45,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
4545
.addPanel(
4646
$.panel('Disk Reads') +
4747
$.queryPanel(
48-
'sum by(%s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('compactor')],
48+
'sum by(%s, %s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('compactor')],
4949
'{{%s}} - {{device}}' % $._config.per_instance_label
5050
) +
5151
$.stack +

‎cortex-mixin/dashboards/dashboard-utils.libsonnet

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
257257
{ yaxes: $.yaxes('percentunit') },
258258
),
259259

260-
261260
filterNodeDiskContainer(containerName)::
262261
|||
263-
ignoring(%s) group_right() (label_replace(count by(%s, device) (container_fs_writes_bytes_total{%s,container="%s",device!~".*sda.*"}), "device", "$1", "device", "/dev/(.*)") * 0)
264-
||| % [$._config.per_instance_label, $._config.per_instance_label, $.namespaceMatcher(), containerName],
262+
ignoring(%s) group_right() (label_replace(count by(%s, %s, device) (container_fs_writes_bytes_total{%s,container="%s",device!~".*sda.*"}), "device", "$1", "device", "/dev/(.*)") * 0)
263+
||| % [$._config.per_instance_label, $._config.per_node_label, $._config.per_instance_label, $.namespaceMatcher(), containerName],
265264
}

‎cortex-mixin/dashboards/reads-resources.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
105105
.addPanel(
106106
$.panel('Disk Writes') +
107107
$.queryPanel(
108-
'sum by(%s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('store-gateway')],
108+
'sum by(%s, %s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('store-gateway')],
109109
'{{%s}} - {{device}}' % $._config.per_instance_label
110110
) +
111111
$.stack +
@@ -114,7 +114,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
114114
.addPanel(
115115
$.panel('Disk Reads') +
116116
$.queryPanel(
117-
'sum by(%s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('store-gateway')],
117+
'sum by(%s, %s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('store-gateway')],
118118
'{{%s}} - {{device}}' % $._config.per_instance_label
119119
) +
120120
$.stack +

‎cortex-mixin/dashboards/writes-resources.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
5858
.addPanel(
5959
$.panel('Disk Writes') +
6060
$.queryPanel(
61-
'sum by(%s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('ingester')],
61+
'sum by(%s, %s, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('ingester')],
6262
'{{%s}} - {{device}}' % $._config.per_instance_label
6363
) +
6464
$.stack +
@@ -67,7 +67,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6767
.addPanel(
6868
$.panel('Disk Reads') +
6969
$.queryPanel(
70-
'sum by(%s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_instance_label, $.filterNodeDiskContainer('ingester')],
70+
'sum by(%s, %s, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + %s' % [$._config.per_node_label, $._config.per_instance_label, $.filterNodeDiskContainer('ingester')],
7171
'{{%s}} - {{device}}' % $._config.per_instance_label
7272
) +
7373
$.stack +

0 commit comments

Comments
 (0)