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
This commit is contained in:
commit
96764f2649
|
@ -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: "%"
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue