diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-28 17:03:03 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-04-03 13:12:08 +0300 |
| commit | 4c82269fa98d8ef6a1d50b6552d9769392115e4c (patch) | |
| tree | f38c38b807c357dd637efc122ec1a96027f83953 /doc | |
| parent | 1d9e14a564ccb7b9cdb68ad483700a5c9c6d605a (diff) | |
Merge branch '29874-support-wider-range-of-monitored-environments-with-prometheus' into 'master'
Support wider range of monitored environments with Prometheus
Closes #29874
See merge request !10159
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 676a21e85c4..12d7700176c 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -153,8 +153,8 @@ The queries utilized by GitLab are shown in the following table. | Metric | Query | | ------ | ----- | -| Average Memory (MB) | `(sum(container_memory_usage_bytes{container_name="app",environment="$CI_ENVIRONMENT_SLUG"}) / count(container_memory_usage_bytes{container_name="app",environment="$CI_ENVIRONMENT_SLUG"})) /1024/1024` | -| Average CPU Utilization (%) | `sum(rate(container_cpu_usage_seconds_total{container_name="app",environment="$CI_ENVIRONMENT_SLUG"}[2m])) / count(container_cpu_usage_seconds_total{container_name="app",environment="$CI_ENVIRONMENT_SLUG"}) * 100` | +| Average Memory (MB) | `(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` | +| Average CPU Utilization (%) | `sum(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="$CI_ENVIRONMENT_SLUG"}[2m])) / count(container_cpu_usage_seconds_total{container_name!="POD",environment="$CI_ENVIRONMENT_SLUG"}) * 100` | ## Monitoring CI/CD Environments |