diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-06 19:38:10 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-06 19:38:10 +0300 |
| commit | 55ceeda85c9725c643391185e29cde27712fed12 (patch) | |
| tree | f751009a4d676c5c0ad4ea6fcaca62e056223d7f /app/assets/javascripts/monitoring | |
| parent | 9274c3c1598f3ff32339e681d5812feeb0f62605 (diff) | |
| parent | 42d4b013eaf76735e3bb72b72b346dea364805ab (diff) | |
Merge branch '34655-label-field-for-setting-a-chart-s-legend-text-is-not-working' into 'master'
Resolve "`label` field for setting a chart's legend text is not working"
Closes #34655
See merge request !12628
Diffstat (limited to 'app/assets/javascripts/monitoring')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/monitoring_column.vue | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/monitoring/components/monitoring_column.vue b/app/assets/javascripts/monitoring/components/monitoring_column.vue index 0cd62053d14..c376baea79c 100644 --- a/app/assets/javascripts/monitoring/components/monitoring_column.vue +++ b/app/assets/javascripts/monitoring/components/monitoring_column.vue @@ -105,9 +105,9 @@ this.measurements = measurements.small; } this.data = query.result[0].values; - this.unitOfDisplay = query.unit || 'N/A'; + this.unitOfDisplay = query.unit || ''; this.yAxisLabel = this.columnData.y_label || 'Values'; - this.legendTitle = query.legend || 'Average'; + this.legendTitle = query.label || 'Average'; this.graphWidth = this.$refs.baseSvg.clientWidth - this.margin.left - this.margin.right; this.graphHeight = this.graphHeight - this.margin.top - this.margin.bottom; @@ -219,16 +219,16 @@ }; </script> <template> - <div + <div :class="classType"> - <h5 + <h5 class="text-center graph-title"> {{columnData.title}} </h5> <div class="prometheus-svg-container" :style="paddingBottomRootSvg"> - <svg + <svg :viewBox="outterViewBox" ref="baseSvg"> <g @@ -239,7 +239,7 @@ class="y-axis" transform="translate(70, 20)"> </g> - <monitoring-legends + <monitoring-legends :graph-width="graphWidth" :graph-height="graphHeight" :margin="margin" @@ -249,7 +249,7 @@ :y-axis-label="yAxisLabel" :metric-usage="metricUsage" /> - <svg + <svg class="graph-data" :viewBox="innerViewBox" ref="graphData"> @@ -267,7 +267,7 @@ stroke-width="2" transform="translate(-5, 20)"> </path> - <rect + <rect class="prometheus-graph-overlay" :width="(graphWidth - 70)" :height="(graphHeight - 100)" @@ -281,7 +281,7 @@ :graph-height="graphHeight" :graph-height-offset="graphHeightOffset" /> - <monitoring-flag + <monitoring-flag v-if="showFlag" :current-x-coordinate="currentXCoordinate" :current-y-coordinate="currentYCoordinate" |