summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/prometheus/cluster_metrics.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/prometheus/cluster_metrics.yml b/config/prometheus/cluster_metrics.yml
index 3a6836a29dd..cb4735f8856 100644
--- a/config/prometheus/cluster_metrics.yml
+++ b/config/prometheus/cluster_metrics.yml
@@ -6,10 +6,10 @@
required_metrics: ['container_cpu_usage_seconds_total']
weight: 1
queries:
- - query_range: 'sum(rate(container_cpu_usage_seconds_total{id="/"}[15m]))'
+ - query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{id="/"}[15m])) by (job)) without (job)'
label: Usage
unit: "cores"
- - query_range: 'sum(kube_node_status_capacity_cpu_cores)'
+ - query_range: 'sum(kube_node_status_capacity_cpu_cores{kubernetes_namespace="gitlab-managed-apps"})'
label: Capacity
unit: "cores"
- title: "Memory usage"
@@ -17,9 +17,9 @@
required_metrics: ['container_memory_usage_bytes']
weight: 1
queries:
- - query_range: 'sum(container_memory_usage_bytes{id="/"})/2^30'
+ - query_range: 'avg(sum(container_memory_usage_bytes{id="/"}) by (job)) without (job) / 2^30'
label: Usage
unit: "GiB"
- - query_range: 'sum(kube_node_status_capacity_memory_bytes)/2^30'
+ - query_range: 'sum(kube_node_status_capacity_memory_bytes{kubernetes_namespace="gitlab-managed-apps"})/2^30'
label: Capacity
- unit: "GiB"
+ unit: "GiB" \ No newline at end of file