Update k8s metrics and docs

6e2ce467 · Joshua Lambert · e099e7eb · 6e2ce467 · 6e2ce467
Commit 6e2ce467 authored Sep 08, 2017 by Joshua Lambert
Showing with 2 additions and 2 deletions

config/prometheus/additional_metrics.yml config/prometheus/additional_metrics.yml +1 -1

doc/user/project/integrations/prometheus_library/kubernetes.md ...ser/project/integrations/prometheus_library/kubernetes.md +1 -1

No files found.
--- a/config/prometheus/additional_metrics.yml
+++ b/config/prometheus/additional_metrics.yml
@@ -153,7 +153,7 @@
     - container_cpu_usage_seconds_total
    weight: 1
    queries:
-    - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m]) * 100) by (cpu)'
+    - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m])) by (cpu)  * 100'
      label: CPU
      unit: "%"
      series:

--- a/doc/user/project/integrations/prometheus_library/kubernetes.md
+++ b/doc/user/project/integrations/prometheus_library/kubernetes.md
@@ -8,7 +8,7 @@ GitLab has support for automatically detecting and monitoring Kubernetes metrics
 | Name | Query |
 | ---- | ----- |
 | Average Memory Usage (MB) | (sum(container_memory_usage_bytes{container_name!="POD",%{environment_filter}}) / count(container_memory_usage_bytes{container_name!="POD",%{environment_filter}})) /1024/1024 |
-| Average CPU Utilization (%) | sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m])) by (cpu) / count(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}) * 100 |
+| Average CPU Utilization (%) | sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m])) by (cpu)  * 100 |

 ## Configuring Prometheus to monitor for Kubernetes node metrics