Skip to content

fix: correct quotas on prometheus federation HA #856

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

Merged
merged 4 commits into from
Oct 11, 2024
Merged

fix: correct quotas on prometheus federation HA #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a796aaf
fix: correct quotas on prometheus federation HA
aslafy-z Jul 10, 2023
04702d8
Merge branch 'master' into fix/scalar-quotas
aslafy-z Jul 10, 2023
d4c778d
Merge branch 'master' into fix/scalar-quotas
aslafy-z Sep 9, 2024
b41eb2a
Merge branch 'master' into fix/scalar-quotas
aslafy-z Oct 10, 2024
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
8 changes: 4 additions & 4 deletions dashboards/resources/namespace.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ local var = g.dashboard.variable;

prometheus.new(
'${datasource}',
'scalar(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="requests.cpu"})' % $._config
'scalar(max(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="requests.cpu"}))' % $._config
)
+ prometheus.withLegendFormat('quota - requests'),

prometheus.new(
'${datasource}',
'scalar(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="limits.cpu"})' % $._config
'scalar(max(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="limits.cpu"}))' % $._config
)
+ prometheus.withLegendFormat('quota - limits'),
])
Expand Down Expand Up @@ -293,13 +293,13 @@ local var = g.dashboard.variable;

prometheus.new(
'${datasource}',
'scalar(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="requests.memory"})' % $._config
'scalar(max(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="requests.memory"}))' % $._config
)
+ prometheus.withLegendFormat('quota - requests'),

prometheus.new(
'${datasource}',
'scalar(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="limits.memory"})' % $._config
'scalar(max(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource="limits.memory"}))' % $._config
)
+ prometheus.withLegendFormat('quota - limits'),
])
Expand Down
2 changes: 1 addition & 1 deletion dashboards/resources/workload-namespace.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ local var = g.dashboard.variable;
local memRequestsQuery = std.strReplace(cpuRequestsQuery, 'cpu', 'memory');
local memLimitsQuery = std.strReplace(cpuLimitsQuery, 'cpu', 'memory');

local cpuQuotaRequestsQuery = 'scalar(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource=~"requests.cpu|cpu"})' % $._config;
local cpuQuotaRequestsQuery = 'scalar(max(kube_resourcequota{%(clusterLabel)s="$cluster", namespace="$namespace", type="hard",resource=~"requests.cpu|cpu"}))' % $._config;
local cpuQuotaLimitsQuery = std.strReplace(cpuQuotaRequestsQuery, 'requests.cpu|cpu', 'limits.cpu');
local memoryQuotaRequestsQuery = std.strReplace(cpuQuotaRequestsQuery, 'requests.cpu|cpu', 'requests.memory|memory');
local memoryQuotaLimitsQuery = std.strReplace(cpuQuotaRequestsQuery, 'requests.cpu|cpu', 'limits.memory');
Expand Down