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

support both uid and id for showing/removing notifiers

Browse Source
This commit is contained in:
bergquist 2019-01-28 13:20:29 +01:00
parent 43c3d5b8ba
commit 48aa173f67
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/features/alerting/AlertTabCtrl.ts
View File

@ -142,7 +142,9 @@ export class AlertTabCtrl {
isDefault: false, isDefault: false,
uid: model.uid uid: model.uid
}); });
if (!_.find(this.alert.notifications, { id: model.id})) {
// avoid duplicates using both id and uid to be backwards compatible.
if (!_.find(this.alert.notifications, n => n.id === model.id || n.uid === model.uid)) {
this.alert.notifications.push({ uid: model.uid }); this.alert.notifications.push({ uid: model.uid });
} }
@ -152,9 +154,11 @@ export class AlertTabCtrl {
this.addNotificationSegment.fake = true; this.addNotificationSegment.fake = true;
} }
removeNotification(deleteUid) { removeNotification(an) {
_.remove(this.alert.notifications, { uid: deleteUid}); // remove notifiers refeered to by id and uid to support notifiers added
_.remove(this.alertNotifications, { uid: deleteUid}); // before and after we added support for uid
_.remove(this.alert.notifications, n => n.uid === an.uid || n.id === an.id);
_.remove(this.alertNotifications, n => n.uid === an.uid || n.id === an.id);
} }
initModel() { initModel() {
@ -190,7 +194,14 @@ export class AlertTabCtrl {
ThresholdMapper.alertToGraphThresholds(this.panel); ThresholdMapper.alertToGraphThresholds(this.panel);
for (const addedNotification of alert.notifications) { for (const addedNotification of alert.notifications) {
const model = _.find(this.notifications, { id: addedNotification.id }); // lookup notifier type by uid
let model = _.find(this.notifications, { uid: addedNotification.uid });
// fallback to using id if uid is missing
if (!model) {
model = _.find(this.notifications, { id: addedNotification.id });
}
if (model && model.isDefault === false) { if (model && model.isDefault === false) {
model.iconClass = this.getNotificationIcon(model.type); model.iconClass = this.getNotificationIcon(model.type);
this.alertNotifications.push(model); this.alertNotifications.push(model);

2
public/app/features/alerting/partials/alert_tab.html
View File

@ -135,7 +135,7 @@
<div class="gf-form" ng-repeat="nc in ctrl.alertNotifications"> <div class="gf-form" ng-repeat="nc in ctrl.alertNotifications">
<span class="gf-form-label" ng-style="{'background-color': nc.bgColor }"> <span class="gf-form-label" ng-style="{'background-color': nc.bgColor }">
<i class="{{nc.iconClass}}"></i>&nbsp;{{nc.name}}&nbsp; <i class="{{nc.iconClass}}"></i>&nbsp;{{nc.name}}&nbsp;
<i class="fa fa-remove pointer muted" ng-click="ctrl.removeNotification(nc.uid)" ng-if="nc.isDefault === false"></i> <i class="fa fa-remove pointer muted" ng-click="ctrl.removeNotification(nc)" ng-if="nc.isDefault === false"></i>
</span> </span>
</div> </div>
<div class="gf-form"> <div class="gf-form">