kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

Closes #34599

See merge request !12613
This commit is contained in:
Phil Hughes 2017-07-04 08:06:42 +00:00
commit f8973d76bd
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/monitoring/components/monitoring_column.vue
View file

@ -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;

4
changelogs/unreleased/monitoring-dashboard-fix-y-label.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fixed the y_label not setting correctly for each graph on the monitoring dashboard
merge_request:
author:

4
spec/javascripts/monitoring/mock_data.js
View file

@ -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',

11
spec/javascripts/monitoring/monitoring_column_spec.js
View file

@ -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);
});
});