Merge branch 'pause_alert_rules'

closes #6135
This commit is contained in:
bergquist
2016-10-11 10:54:58 +02:00
8 changed files with 78 additions and 28 deletions

View File

@@ -23,7 +23,7 @@ export class AlertListCtrl {
};
/** @ngInject */
constructor(private backendSrv, private $location) {
constructor(private backendSrv, private $location, private $scope) {
var params = $location.search();
this.filters.state = params.state || null;
this.loadAlerts();
@@ -43,6 +43,19 @@ export class AlertListCtrl {
});
}
pauseAlertRule(alertId: any) {
var alert = _.find(this.alerts, {id: alertId});
var payload = {
paused: alert.state !== "paused"
};
this.backendSrv.post(`/api/alerts/${alert.id}/pause`, payload).then(result => {
alert.state = result.state;
alert.stateModel = alertDef.getStateDisplayModel(result.state);
});
}
openHowTo() {
appEvents.emit('show-modal', {
src: 'public/app/features/alerting/partials/alert_howto.html',

View File

@@ -29,7 +29,10 @@
<div class="card-item card-item--alert">
<div class="card-item-header">
<div class="card-item-type">
<a class="card-item-cog" href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert" bs-tooltip="'Edit alert rule'">
<a class="card-item-cog" bs-tooltip="'Pausing an alert rule prevents it from executing'" ng-click="ctrl.pauseAlertRule(alert.id)">
<i class="fa fa-pause"></i>
</a>
<a class="card-item-cog" href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert" bs-tooltip="'Edit alert rule'">
<i class="icon-gf icon-gf-settings"></i>
</a>
</div>