diff --git a/changelogs/unreleased/additional-time-series-charts.yml b/changelogs/unreleased/additional-time-series-charts.yml index d5fd24cf2e7..80c1af54881 100644 --- a/changelogs/unreleased/additional-time-series-charts.yml +++ b/changelogs/unreleased/additional-time-series-charts.yml @@ -1,5 +1,5 @@ --- -title: Added support for multiple time series +title: Added support the multiple time series for prometheus monitoring merge_request: !36893 author: type: changed diff --git a/config/prometheus/additional_metrics.yml b/config/prometheus/additional_metrics.yml index 0642a0b2fe9..202bd9f0ab1 100644 --- a/config/prometheus/additional_metrics.yml +++ b/config/prometheus/additional_metrics.yml @@ -131,3 +131,20 @@ - 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 diff --git a/spec/javascripts/monitoring/graph_path_spec.js b/spec/javascripts/monitoring/graph_path_spec.js index 41b3014baac..e7348b03ba1 100644 --- a/spec/javascripts/monitoring/graph_path_spec.js +++ b/spec/javascripts/monitoring/graph_path_spec.js @@ -21,15 +21,15 @@ describe('Monitoring Paths', () => { const component = createComponent({ generatedLinePath: firstTimeSeries.linePath, generatedAreaPath: firstTimeSeries.areaPath, - lineColor: '#ccc', - areaColor: '#fff', + lineColor: firstTimeSeries.lineColor, + areaColor: firstTimeSeries.areaColor, }); const metricArea = component.$el.querySelector('.metric-area'); const metricLine = component.$el.querySelector('.metric-line'); - expect(metricArea.getAttribute('fill')).toBe('#fff'); + expect(metricArea.getAttribute('fill')).toBe('#8dd5aa'); expect(metricArea.getAttribute('d')).toBe(firstTimeSeries.areaPath); - expect(metricLine.getAttribute('stroke')).toBe('#ccc'); + expect(metricLine.getAttribute('stroke')).toBe('#1aaa55'); expect(metricLine.getAttribute('d')).toBe(firstTimeSeries.linePath); }); });