Merge pull request #856 from aslafy-z/fix/scalar-quotas

fix: correct quotas on prometheus federation HA

Author: povilasv

Diff for: dashboards/resources/namespace.libsonnet

@@ -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'),
         ])
@@ -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'),
         ])

Diff for: dashboards/resources/workload-namespace.libsonnet

@@ -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');