diff options
author | Tristan Read <tread@gitlab.com> | 2019-03-29 08:33:10 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-29 08:33:10 +0000 |
commit | f4b8ec7ea1ecc517bd4a15e56cce6f7cd9eeb70c (patch) | |
tree | 4943e501a950c8ac4a0e5805c3411a3bd9d6e0a9 /app/assets | |
parent | 3a477fec8f1fe6cf1da70a8ae0a8473ab26235bc (diff) | |
download | gitlab-ce-f4b8ec7ea1ecc517bd4a15e56cce6f7cd9eeb70c.tar.gz |
Add requested resources to cluster health - ce port
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/monitoring/components/charts/area.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/constants.js | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue index 41783d311ef..d453dc1fdb7 100644 --- a/app/assets/javascripts/monitoring/components/charts/area.vue +++ b/app/assets/javascripts/monitoring/components/charts/area.vue @@ -69,17 +69,17 @@ export default { appearance && appearance.line && appearance.line.type ? appearance.line.type : lineTypes.default; - const lineColor = lineType === lineTypes.threshold ? this.primaryColor : undefined; + const lineWidth = + appearance && appearance.line && appearance.line.width + ? appearance.line.width + : undefined; return { name: this.formatLegendLabel(query), data: this.concatenateResults(query.result), lineStyle: { type: lineType, - color: lineColor, - }, - itemStyle: { - color: lineColor, + width: lineWidth, }, areaStyle: { opacity: diff --git a/app/assets/javascripts/monitoring/constants.js b/app/assets/javascripts/monitoring/constants.js index 869173b6572..55ecf3b5334 100644 --- a/app/assets/javascripts/monitoring/constants.js +++ b/app/assets/javascripts/monitoring/constants.js @@ -6,5 +6,4 @@ export const graphTypes = { export const lineTypes = { default: 'solid', - threshold: 'dashed', }; |