Merge branch 'master' into grafana-annotations

2025-02-25 18:55:37 -06:00 · 2016-09-08 11:26:55 +02:00
parent d60bd77658 3c9432b7e9
commit b8081b29fd
19 changed files with 457 additions and 473 deletions
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -76,6 +76,14 @@ export class AlertTabCtrl {
          this.alertNotifications.push(model);
        }
      });
+
+      _.each(this.notifications, item => {
+        if (item.isDefault) {
+          item.iconClass = this.getNotificationIcon(item.type);
+          item.bgColor = "#00678b";
+          this.alertNotifications.push(item);
+        }
+      });
    });
  }