Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Honor configured job_names in the 'Memory (go heap inuse)' panel #247

Merged
merged 1 commit into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* [ENHANCEMENT] The name of the overrides configmap is now customisable via `$._config.overrides_configmap`. #244
* [BUGFIX] Honor configured `per_instance_label` in all panels. #239
* [BUGFIX] `CortexRequestLatency` alert now ignores long-running requests on query-scheduler. #242
* [BUGFIX] Honor configured `job_names` in the "Memory (go heap inuse)" panel. #247

## 1.6.0 / 2021-01-05

Expand Down
2 changes: 1 addition & 1 deletion cortex-mixin/dashboards/alertmanager-resources.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'cortex-gw'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
)
)
.addRow(
Expand Down
14 changes: 7 additions & 7 deletions cortex-mixin/dashboards/reads-resources.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'cortex-gw'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
)
)
.addRow(
Expand All @@ -25,7 +25,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'query-frontend'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'query-frontend'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.query_frontend),
)
)
.addRow(
Expand All @@ -37,7 +37,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'query-scheduler'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'query-scheduler'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.query_scheduler),
)
)
.addRow(
Expand All @@ -49,7 +49,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'querier'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'querier'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.querier),
)
)
.addRow(
Expand All @@ -61,7 +61,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'ingester'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'ingester'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.ingester),
)
)
.addRow(
Expand All @@ -83,7 +83,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'ruler'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'ruler'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.ruler),
)
)
.addRowIf(
Expand All @@ -96,7 +96,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'store-gateway'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'store-gateway'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.store_gateway),
)
)
.addRowIf(
Expand Down
2 changes: 1 addition & 1 deletion cortex-mixin/dashboards/reads.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
)
.addRowIf(
std.member($._config.storage_engine, 'blocks'),
$.row('Memcached – Blocks Storage – Index header (Store-gateway)')
$.row('Memcached – Blocks Storage – Block Index (Store-gateway)')
.addPanel(
$.panel('QPS') +
$.queryPanel('sum by(operation) (rate(thanos_memcached_operations_total{component="store-gateway",name="index-cache", %s}[$__rate_interval]))' % $.jobMatcher($._config.job_names.store_gateway), '{{operation}}') +
Expand Down
6 changes: 3 additions & 3 deletions cortex-mixin/dashboards/writes-resources.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'cortex-gw'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
)
)
.addRow(
Expand All @@ -25,7 +25,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'distributor'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'distributor'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.distributor),
)
)
.addRow(
Expand All @@ -47,7 +47,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'ingester'),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', 'ingester'),
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.ingester),
)
)
.addRow(
Expand Down