summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 09:47:09 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-07 09:52:02 -0500
commitce27b99f800716cd5296c4324b855a14dd84c799 (patch)
treeae507df88094190e1e1f0ed8d98eac6e57c10b1c
parentb71eb1da5bd20c8c2ae53efe79af516da0aeeb03 (diff)
downloadgitlab-ce-ce27b99f800716cd5296c4324b855a14dd84c799.tar.gz
Added CHANGELOG
-rw-r--r--changelogs/unreleased/support-additional-colors.yml5
-rw-r--r--config/prometheus/additional_metrics.yml17
2 files changed, 5 insertions, 17 deletions
diff --git a/changelogs/unreleased/support-additional-colors.yml b/changelogs/unreleased/support-additional-colors.yml
new file mode 100644
index 00000000000..5178e159dcf
--- /dev/null
+++ b/changelogs/unreleased/support-additional-colors.yml
@@ -0,0 +1,5 @@
+---
+title: Added support for specific labels and colors
+merge_request:
+author:
+type: changed
diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml
index 202bd9f0ab1..0642a0b2fe9 100644
--- a/config/prometheus/additional_metrics.yml
+++ b/config/prometheus/additional_metrics.yml
@@ -131,20 +131,3 @@
- query_range: 'sum(rate(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}[2m])) / count(container_cpu_usage_seconds_total{container_name!="POD",%{environment_filter}}) * 100'
label: Average
unit: "%"
- - title: "CPU usage by CPU"
- required_metrics:
- - container_cpu_usage_seconds_total
- weight: 1
- queries:
- - query_range: 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) by (cpu) * 100'
- unit: Average (%)
- label: cpu
- series:
- - value: cpu00
- color: red
- - value: cpu01
- color: blue
- - value: cpu02
- color: purple
- - value: cpu03
- color: orange