diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-14 20:48:46 +0300 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-11-17 13:23:35 +0300 |
| commit | bf8493d823c1b9f5560ac6aff5794d5ee014ad6d (patch) | |
| tree | 1f4cbcdf896eb25783761c7f8e3518dea5a6d19c /doc | |
| parent | e049dfb52004e68ba2272979b7178613a7862550 (diff) | |
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 96764f2649aed61be92129c02a5425f36c561394)
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/prometheus_library/kubernetes.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/integrations/prometheus_library/kubernetes.md b/doc/user/project/integrations/prometheus_library/kubernetes.md index 518683965e8..a6673fa2a00 100644 --- 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 |