diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-04 08:06:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-04 08:06:42 +0000 |
| commit | f8973d76bd399a7c3638133bb75b2158faad7bf4 (patch) | |
| tree | 570d110a485dd6474b23ae9e60503ae02e267317 /spec/javascripts/monitoring/mock_data.js | |
| parent | b5b4054d5882782892d0a860c7e95db9a22bfdec (diff) | |
| parent | 2a829d0f530c1721271400c46cfc7f0387dc789a (diff) | |
| download | gitlab-ce-bjk/pipeline_metric.tar.gz | |
Merge branch 'monitoring-dashboard-fix-y-label' into 'master'bjk/pipeline_metric
Fixed the y_label not setting correctly for each graph on the monitoring dashboard
Closes #34599
See merge request !12613
Diffstat (limited to 'spec/javascripts/monitoring/mock_data.js')
| -rw-r--r-- | spec/javascripts/monitoring/mock_data.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js index 6f4cb989847..56d938e1fbe 100644 --- a/spec/javascripts/monitoring/mock_data.js +++ b/spec/javascripts/monitoring/mock_data.js @@ -13,7 +13,7 @@ const metricsGroupsAPIResponse = { 'queries': [ { 'query_range': 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20', - 'label': 'Container memory', + 'y_label': 'Memory', 'unit': 'MiB', 'result': [ { @@ -2477,7 +2477,7 @@ export const singleRowMetrics = [ { 'title': 'CPU usage', 'weight': 1, - 'y_label': 'Values', + 'y_label': 'Memory', 'queries': [ { 'query_range': 'avg(rate(container_cpu_usage_seconds_total{%{environment_filter}}[2m])) * 100', |