+
{{part.def.type}}
()
+
`;
/** @ngInject */
export function queryPartEditorDirective($compile, templateSrv) {
- var paramTemplate = '
';
+ var paramTemplate = '
';
+
return {
restrict: 'E',
template: template,
scope: {
part: "=",
- removeAction: "&",
- partUpdated: "&",
- getOptions: "&",
+ handleEvent: "&",
},
link: function postLink($scope, elem) {
var part = $scope.part;
var partDef = part.def;
var $paramsContainer = elem.find('.query-part-parameters');
- var $controlsContainer = elem.find('.tight-form-func-controls');
+
+ $scope.partActions = [];
function clickFuncParam(paramIndex) {
/*jshint validthis:true */
@@ -63,7 +64,9 @@ export function queryPartEditorDirective($compile, templateSrv) {
$link.html(templateSrv.highlightVariablesAsHtml(newValue));
part.updateParam($input.val(), paramIndex);
- $scope.$apply($scope.partUpdated);
+ $scope.$apply(() => {
+ $scope.handleEvent({$event: {name: 'part-param-changed'}});
+ });
}
$input.hide();
@@ -91,7 +94,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
if (param.options) { return param.options; }
$scope.$apply(function() {
- $scope.getOptions().then(function(result) {
+ $scope.handleEvent({$event: {name: 'get-param-options'}}).then(function(result) {
var dynamicOptions = _.map(result, function(op) { return op.value; });
callback(dynamicOptions);
});
@@ -124,24 +127,16 @@ export function queryPartEditorDirective($compile, templateSrv) {
};
}
- $scope.toggleControls = function() {
- var targetDiv = elem.closest('.tight-form');
-
- if (elem.hasClass('show-function-controls')) {
- elem.removeClass('show-function-controls');
- targetDiv.removeClass('has-open-function');
- $controlsContainer.hide();
- return;
+ $scope.showActionsMenu = function() {
+ if ($scope.partActions.length === 0) {
+ $scope.handleEvent({$event: {name: 'get-part-actions'}}).then(res => {
+ $scope.partActions = res;
+ });
}
-
- elem.addClass('show-function-controls');
- targetDiv.addClass('has-open-function');
- $controlsContainer.show();
};
- $scope.removeActionInternal = function() {
- $scope.toggleControls();
- $scope.removeAction();
+ $scope.triggerPartAction = function(action) {
+ $scope.handleEvent({$event: {name: 'action', action: action}});
};
function addElementsAndCompile() {
diff --git a/public/app/features/alerting/alert_def.ts b/public/app/features/alerting/alert_def.ts
index 84c1bc7cb05..69f639d04c4 100644
--- a/public/app/features/alerting/alert_def.ts
+++ b/public/app/features/alerting/alert_def.ts
@@ -25,12 +25,6 @@ var alertQueryDef = new QueryPartDef({
defaultParams: ['#A', '5m', 'now', 'avg']
});
-var reducerAvgDef = new QueryPartDef({
- type: 'avg',
- params: [],
- defaultParams: []
-});
-
var conditionTypes = [
{text: 'Query', value: 'query'},
];
@@ -43,6 +37,19 @@ var evalFunctions = [
{text: 'HAS NO VALUE' , value: 'no_value'}
];
+var reducerTypes = [
+ {text: 'avg()', value: 'avg'},
+ {text: 'min()', value: 'min'},
+ {text: 'max()', value: 'max'},
+ {text: 'sum()' , value: 'sum'},
+ {text: 'count()', value: 'count'},
+];
+
+function createReducerPart(model) {
+ var def = new QueryPartDef({type: model.type, defaultParams: []});
+ return new QueryPart(model, def);
+}
+
var severityLevels = [
{text: 'Critical', value: 'critical'},
{text: 'Warning', value: 'warning'},
@@ -50,9 +57,10 @@ var severityLevels = [
export default {
alertQueryDef: alertQueryDef,
- reducerAvgDef: reducerAvgDef,
getSeverityIconClass: getSeverityIconClass,
conditionTypes: conditionTypes,
evalFunctions: evalFunctions,
severityLevels: severityLevels,
+ reducerTypes: reducerTypes,
+ createReducerPart: createReducerPart,
};
diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts
index 217f67124ef..0dd228e7040 100644
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -21,7 +21,7 @@ export class AlertTabCtrl {
alertNotifications;
/** @ngInject */
- constructor(private $scope, private $timeout, private backendSrv, private dashboardSrv, private uiSegmentSrv) {
+ constructor(private $scope, private $timeout, private backendSrv, private dashboardSrv, private uiSegmentSrv, private $q) {
this.panelCtrl = $scope.ctrl;
this.panel = this.panelCtrl.panel;
this.$scope.ctrl = this;
@@ -148,19 +148,46 @@ export class AlertTabCtrl {
var cm: any = {source: source, type: source.type};
cm.queryPart = new QueryPart(source.query, alertDef.alertQueryDef);
- cm.reducerPart = new QueryPart({params: []}, alertDef.reducerAvgDef);
+ cm.reducerPart = alertDef.createReducerPart(source.reducer);
cm.evaluator = source.evaluator;
return cm;
}
- queryPartUpdated(conditionModel) {
+ handleQueryPartEvent(conditionModel, evt) {
+ switch (evt.name) {
+ case "action-remove-part": {
+ break;
+ }
+ case "get-part-actions": {
+ return this.$q.when([]);
+ }
+ }
+ }
+
+ handleReducerPartEvent(conditionModel, evt) {
+ switch (evt.name) {
+ case "action": {
+ conditionModel.source.reducer.type = evt.action.value;
+ conditionModel.reducerPart = alertDef.createReducerPart(conditionModel.source.reducer);
+ break;
+ }
+ case "get-part-actions": {
+ var result = [];
+ for (var type of alertDef.reducerTypes) {
+ if (type.value !== conditionModel.source.reducer.type) {
+ result.push(type);
+ }
+ }
+ return this.$q.when(result);
+ }
+ }
}
addCondition(type) {
var condition = this.buildDefaultCondition();
// add to persited model
- this.alert.conditions.push(condition);
+ this.panelCtrl.conditions.push(condition);
// add to view model
this.conditionModels.push(this.buildConditionModel(condition));
}
diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html
index e9f7e2aa556..43ac9abaad4 100644
--- a/public/app/features/alerting/partials/alert_tab.html
+++ b/public/app/features/alerting/partials/alert_tab.html
@@ -49,12 +49,12 @@
WHEN
diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 68b8ee60d98..df5c326b962 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -35,12 +35,7 @@