Commit f8973d76 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'monitoring-dashboard-fix-y-label' into 'master'

Fixed the y_label not setting correctly for each graph on the monitoring dashboard

Closes #34599

See merge request !12613
parents b5b4054d 2a829d0f
......@@ -104,7 +104,7 @@
}
this.data = query.result[0].values;
this.unitOfDisplay = query.unit || 'N/A';
this.yAxisLabel = this.columnData.y_axis || 'Values';
this.yAxisLabel = this.columnData.y_label || 'Values';
this.legendTitle = query.legend || 'Average';
this.graphWidth = this.$refs.baseSvg.clientWidth -
this.margin.left - this.margin.right;
......
---
title: Fixed the y_label not setting correctly for each graph on the monitoring dashboard
merge_request:
author:
......@@ -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',
......
......@@ -94,4 +94,15 @@ describe('MonitoringColumn', () => {
done();
});
});
it('has a title for the y-axis that comes from the backend', () => {
const component = createComponent({
columnData: singleRowMetrics[0],
classType: 'col-md-6',
updateAspectRatio: false,
deploymentData,
});
expect(component.yAxisLabel).toEqual(component.columnData.y_label);
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment