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: update aggregation and alignment before refreshing when changing metric

Browse Source
This commit is contained in:
Erik Sundell
2018-09-26 13:22:20 +02:00
parent 508601c28c
commit 1a91e0baf6
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
View File

@@ -2,7 +2,7 @@
<div class="gf-form">
<label class="gf-form-label query-keyword width-9">Aggregation</label>
<div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
<select class="gf-form-input width-12" ng-model="target.aggregation.crossSeriesReducer" ng-options="f.value as f.text for f in getAggOptions()"
<select class="gf-form-input width-12" ng-model="target.aggregation.crossSeriesReducer" ng-options="f.value as f.text for f in aggOptions"
ng-change="onAggregationChange(target.aggregation.crossSeriesReducer)"></select>
</div>
</div>
@@ -20,7 +20,7 @@
<div class="gf-form offset-width-9">
<label class="gf-form-label query-keyword width-12">Aligner</label>
<div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
<select class="gf-form-input width-14" ng-model="target.aggregation.perSeriesAligner" ng-options="f.value as f.text for f in getAlignOptions()"
<select class="gf-form-input width-14" ng-model="target.aggregation.perSeriesAligner" ng-options="f.value as f.text for f in alignOptions"
ng-change="onAlignmentChange(target.aggregation.perSeriesAligner)"></select>
</div>

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

@@ -20,57 +20,65 @@ export class StackdriverAggregationCtrl {
target: any;
alignOptions: any[];
aggOptions: any[];
refresh: () => void;
constructor($scope) {
this.aggOptions = options.aggOptions;
this.alignOptions = options.alignOptions;
$scope.alignmentPeriods = options.alignmentPeriods;
$scope.getAlignOptions = this.getAlignOptions;
$scope.getAggOptions = this.getAggOptions;
$scope.onAlignmentChange = this.onAlignmentChange;
$scope.onAggregationChange = this.onAggregationChange;
this.refresh = $scope.refresh;
constructor(private $scope) {
$scope.aggOptions = options.aggOptions;
this.setAggOptions();
this.setAlignOptions();
$scope.onAlignmentChange = this.onAlignmentChange.bind(this);
$scope.onAggregationChange = this.onAggregationChange.bind(this);
$scope.$on('metricTypeChange', this.setAlignOptions.bind(this));
}
onAlignmentChange(newVal: string) {
if (newVal === 'ALIGN_NONE') {
this.target.aggregation.crossSeriesReducer = 'REDUCE_NONE';
this.$scope.target.aggregation.crossSeriesReducer = 'REDUCE_NONE';
}
this.refresh();
this.$scope.refresh();
}
onAggregationChange(newVal: string) {
if (newVal !== 'REDUCE_NONE' && this.target.aggregation.perSeriesAligner === 'ALIGN_NONE') {
if (newVal !== 'REDUCE_NONE' && this.$scope.target.aggregation.perSeriesAligner === 'ALIGN_NONE') {
const newAlignmentOption = options.alignOptions.find(
o =>
o.value !== 'ALIGN_NONE' &&
o.valueTypes.indexOf(this.target.valueType) !== -1 &&
o.metricKinds.indexOf(this.target.metricKind) !== -1
o.valueTypes.indexOf(this.$scope.target.valueType) !== -1 &&
o.metricKinds.indexOf(this.$scope.target.metricKind) !== -1
);
this.target.aggregation.perSeriesAligner = newAlignmentOption ? newAlignmentOption.value : '';
this.$scope.target.aggregation.perSeriesAligner = newAlignmentOption ? newAlignmentOption.value : '';
}
this.refresh();
this.$scope.refresh();
}
getAlignOptions() {
return !this.target.valueType
setAlignOptions() {
this.$scope.alignOptions = !this.$scope.target.valueType
? []
: options.alignOptions.filter(i => {
return (
i.valueTypes.indexOf(this.target.valueType) !== -1 && i.metricKinds.indexOf(this.target.metricKind) !== -1
i.valueTypes.indexOf(this.$scope.target.valueType) !== -1 &&
i.metricKinds.indexOf(this.$scope.target.metricKind) !== -1
);
});
if (!this.$scope.alignOptions.find(o => o.value === this.$scope.target.aggregation.perSeriesAligner)) {
const newValue = this.$scope.alignOptions.find(o => o.value !== 'ALIGN_NONE');
this.$scope.target.aggregation.perSeriesAligner = newValue ? newValue.value : '';
}
}
getAggOptions() {
return !this.target.metricKind
setAggOptions() {
this.$scope.aggOptions = !this.$scope.target.metricKind
? []
: options.aggOptions.filter(i => {
return (
i.valueTypes.indexOf(this.target.valueType) !== -1 && i.metricKinds.indexOf(this.target.metricKind) !== -1
i.valueTypes.indexOf(this.$scope.target.valueType) !== -1 &&
i.metricKinds.indexOf(this.$scope.target.metricKind) !== -1
);
});
if (!this.$scope.aggOptions.find(o => o.value === this.$scope.target.aggregation.crossSeriesReducer)) {
const newValue = this.$scope.aggOptions.find(o => o.value !== 'REDUCE_NONE');
this.$scope.target.aggregation.crossSeriesReducer = newValue ? newValue.value : '';
}
}
}

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

@@ -194,6 +194,7 @@ export class StackdriverQueryCtrl extends QueryCtrl {
const { valueType, metricKind } = this.metricDescriptors.find(m => m.type === this.target.metricType);
this.target.valueType = valueType;
this.target.metricKind = metricKind;
this.$scope.$broadcast('metricTypeChange');
this.refresh();
this.getLabels();
}