feat(alerting): Save As removes alerts from panels, closes #5965

This commit is contained in:
Torkel Ödegaard
2016-09-06 09:14:11 +02:00
parent 2ca7284a56
commit 6b17cdbca6
3 changed files with 31 additions and 16 deletions

View File

@@ -74,18 +74,20 @@ export class AlertTabCtrl {
this.alertNotifications.push(model);
}
});
}).then(() => {
this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => {
this.alertHistory = _.map(res, ah => {
ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss');
ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
});
}
ah.metrics = _.map(ah.data, ev=> {
return ev.Metric + "=" + ev.Value;
}).join(', ');
getAlertHistory() {
this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => {
this.alertHistory = _.map(res, ah => {
ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss');
ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
return ah;
});
ah.metrics = _.map(ah.data, ev=> {
return ev.Metric + "=" + ev.Value;
}).join(', ');
return ah;
});
});
}
@@ -125,7 +127,11 @@ export class AlertTabCtrl {
}
initModel() {
var alert = this.alert = this.panel.alert = this.panel.alert || {};
var alert = this.alert = this.panel.alert = this.panel.alert || {enabled: false};
if (!this.alert.enabled) {
return;
}
alert.conditions = alert.conditions || [];
if (alert.conditions.length === 0) {
@@ -145,11 +151,9 @@ export class AlertTabCtrl {
return memo;
}, []);
if (this.alert.enabled) {
this.panelCtrl.editingThresholds = true;
}
ThresholdMapper.alertToGraphThresholds(this.panel);
this.panelCtrl.editingThresholds = true;
this.panelCtrl.render();
}
@@ -173,6 +177,10 @@ export class AlertTabCtrl {
}
validateModel() {
if (!this.alert.enabled) {
return;
}
let firstTarget;
var fixed = false;
let foundTarget = null;