Merge branch 'update-metrics-for-k8s-1.7' into 'master'

Update queries to remove duplicate entries (CE version) See merge request gitlab-org/gitlab-ce!15254 (cherry picked from commit 96764f26) bc58f625 Adjust metrics to ignore Job tag to support k8s 1.7+ ab9acf1a Fix to use variable 41d1843f Fix CPU metric 712d5d89 Change label to be more consistent, not a series. 33fa4ef6 Uodate docs

Merge branch 'update-metrics-for-k8s-1.7' into 'master'
bf8493d8 · Tim Zallmann · Tiago · e049dfb5 · bf8493d8 · bf8493d8
Commit bf8493d8 authored Nov 14, 2017 by Tim Zallmann Committed by Tiago Nov 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

additional_metrics.yml config/prometheus/additional_metrics.yml +5 -6

kubernetes.md ...ser/project/integrations/prometheus_library/kubernetes.md +2 -2

No files found.
--- a/config/prometheus/additional_metrics.yml
+++ b/config/prometheus/additional_metrics.yml
@@ -145,7 +145,7 @@
      - container_memory_usage_bytes
    weight: 1
    queries:
-    - query_range: '(sum(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) / count(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"})) /1024/1024'
+    - query_range: '(sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) without (job)) /1024/1024'
      label: Average
      unit: MB
  - title: "CPU Utilization"
@@ -154,8 +154,6 @@
     - container_cpu_usage_seconds_total
    weight: 1
    queries:
-    - query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) * 100'
-      label: CPU
-      unit: "%"
-      series:
-        - label: cpu
+    - query_range: 'sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) without (job)) * 100'
+      label: Average
+      unit: "%"
\ No newline at end of file
--- a/doc/user/project/integrations/prometheus_library/kubernetes.md
+++ b/doc/user/project/integrations/prometheus_library/kubernetes.md
@@ -13,8 +13,8 @@ integration services must be enabled.

 | 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)  * 100 |
+| Average Memory Usage (MB) | (sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}"}) without (job)) /1024/1024 |
+| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}"}[2m])) without (job)) * 100 |

 ## Configuring Prometheus to monitor for Kubernetes node metrics