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.

Sign up for GitHub

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

Jump to bottom

Use $._config.job_names.gateway in resources dashboards. #403

Merged
merged 1 commit into from
Oct 12, 2021
Merged

Use $._config.job_names.gateway in resources dashboards. #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
* [BUGFIX] Fixed `-distributor.extend-writes` setting on ruler when `unregister_ingesters_on_shutdown` is disabled. #369
* [BUGFIX] Upstream recording rule `node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate` renamed. #379
* [BUGFIX] Treat `compactor_blocks_retention_period` type as string rather than int.#395
* [BUGFIX] Fixed writes/reads/alertmanager resources dashboards to use `$._config.job_names.gateway`. #403

## 1.9.0 / 2021-05-18

Expand Down
4 changes: 2 additions & 2 deletions cortex-mixin/dashboards/alertmanager-resources.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ local utils = import 'mixin-utils/utils.libsonnet';
.addRow(
$.row('Gateway')
.addPanel(
$.containerCPUUsagePanel('CPU', 'cortex-gw'),
$.containerCPUUsagePanel('CPU', $._config.job_names.gateway),
)
.addPanel(
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.job_names.gateway),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
Expand Down
8 changes: 4 additions & 4 deletions cortex-mixin/dashboards/dashboard-utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
containerCPUUsagePanel(title, containerName)::
$.panel(title) +
$.queryPanel([
'sum by(%s) (rate(container_cpu_usage_seconds_total{%s,container="%s"}[$__rate_interval]))' % [$._config.per_instance_label, $.namespaceMatcher(), containerName],
'min(container_spec_cpu_quota{%s,container="%s"} / container_spec_cpu_period{%s,container="%s"})' % [$.namespaceMatcher(), containerName, $.namespaceMatcher(), containerName],
'sum by(%s) (rate(container_cpu_usage_seconds_total{%s,container=~"%s"}[$__rate_interval]))' % [$._config.per_instance_label, $.namespaceMatcher(), containerName],
'min(container_spec_cpu_quota{%s,container=~"%s"} / container_spec_cpu_period{%s,container=~"%s"})' % [$.namespaceMatcher(), containerName, $.namespaceMatcher(), containerName],
], ['{{%s}}' % $._config.per_instance_label, 'limit']) +
{
seriesOverrides: [
Expand All @@ -164,8 +164,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
$.queryPanel([
// We use "max" instead of "sum" otherwise during a rolling update of a statefulset we will end up
// summing the memory of the old instance/pod (whose metric will be stale for 5m) to the new instance/pod.
'max by(%s) (container_memory_working_set_bytes{%s,container="%s"})' % [$._config.per_instance_label, $.namespaceMatcher(), containerName],
'min(container_spec_memory_limit_bytes{%s,container="%s"} > 0)' % [$.namespaceMatcher(), containerName],
'max by(%s) (container_memory_working_set_bytes{%s,container=~"%s"})' % [$._config.per_instance_label, $.namespaceMatcher(), containerName],
'min(container_spec_memory_limit_bytes{%s,container=~"%s"} > 0)' % [$.namespaceMatcher(), containerName],
], ['{{%s}}' % $._config.per_instance_label, 'limit']) +
{
seriesOverrides: [
Expand Down
4 changes: 2 additions & 2 deletions cortex-mixin/dashboards/reads-resources.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ local utils = import 'mixin-utils/utils.libsonnet';
.addRow(
$.row('Gateway')
.addPanel(
$.containerCPUUsagePanel('CPU', 'cortex-gw'),
$.containerCPUUsagePanel('CPU', $._config.job_names.gateway),
)
.addPanel(
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.job_names.gateway),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
Expand Down
4 changes: 2 additions & 2 deletions cortex-mixin/dashboards/writes-resources.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ local utils = import 'mixin-utils/utils.libsonnet';
.addRow(
$.row('Gateway')
.addPanel(
$.containerCPUUsagePanel('CPU', 'cortex-gw'),
$.containerCPUUsagePanel('CPU', $._config.job_names.gateway),
)
.addPanel(
$.containerMemoryWorkingSetPanel('Memory (workingset)', 'cortex-gw'),
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.job_names.gateway),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', $._config.job_names.gateway),
Expand Down