IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: make it impossible to select no aggregation when a group by is selected

Browse Source
This commit is contained in:
Erik Sundell 2018-09-28 16:55:39 +02:00
parent cdcb14f3e6
commit 3572692fd5
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
View File

@ -65,6 +65,12 @@ export class StackdriverAggregationCtrl {
const newValue = this.aggOptions.find(o => o.value !== 'REDUCE_NONE');
this.target.aggregation.crossSeriesReducer = newValue ? newValue.value : '';
}
if (this.target.aggregation.groupBys.length > 0) {
this.aggOptions = this.aggOptions.filter(o => o.value !== 'REDUCE_NONE');
const newValue = this.aggOptions.find(o => o.value !== 'REDUCE_NONE');
this.target.aggregation.crossSeriesReducer = newValue ? newValue.value : '';
}
}
formatAlignmentText() {

1
public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
View File

@ -241,6 +241,7 @@ export class StackdriverFilterCtrl {
this.target.aggregation.groupBys = this.groupBySegments.reduce(reducer, []);
this.ensurePlusButton(this.groupBySegments);
this.$rootScope.$broadcast('metricTypeChanged');
this.$scope.refresh();
}