|
|
@@ -3,7 +3,7 @@
|
|
|
import _ from 'lodash';
|
|
|
import moment from 'moment';
|
|
|
import alertDef from '../../../features/alerting/alert_def';
|
|
|
-import {PanelCtrl} from 'app/plugins/sdk';
|
|
|
+import { PanelCtrl } from 'app/plugins/sdk';
|
|
|
|
|
|
import * as dateMath from 'app/core/utils/datemath';
|
|
|
|
|
|
@@ -11,20 +11,20 @@ class AlertListPanel extends PanelCtrl {
|
|
|
static templateUrl = 'module.html';
|
|
|
|
|
|
showOptions = [
|
|
|
- {text: 'Current state', value: 'current'},
|
|
|
- {text: 'Recent state changes', value: 'changes'}
|
|
|
+ { text: 'Current state', value: 'current' },
|
|
|
+ { text: 'Recent state changes', value: 'changes' }
|
|
|
];
|
|
|
|
|
|
sortOrderOptions = [
|
|
|
- {text: 'Alphabetical (asc)', value: 1},
|
|
|
- {text: 'Alphabetical (desc)', value: 2},
|
|
|
- {text: 'Importance', value: 3},
|
|
|
+ { text: 'Alphabetical (asc)', value: 1 },
|
|
|
+ { text: 'Alphabetical (desc)', value: 2 },
|
|
|
+ { text: 'Importance', value: 3 },
|
|
|
];
|
|
|
|
|
|
- contentHeight: string;
|
|
|
stateFilter: any = {};
|
|
|
currentAlerts: any = [];
|
|
|
alertHistory: any = [];
|
|
|
+ noAlertsMessage: string;
|
|
|
// Set and populate defaults
|
|
|
panelDefaults = {
|
|
|
show: 'current',
|
|
|
@@ -40,8 +40,7 @@ class AlertListPanel extends PanelCtrl {
|
|
|
_.defaults(this.panel, this.panelDefaults);
|
|
|
|
|
|
this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
|
|
|
- this.events.on('render', this.onRender.bind(this));
|
|
|
- this.events.on('refresh', this.onRender.bind(this));
|
|
|
+ this.events.on('refresh', this.onRefresh.bind(this));
|
|
|
|
|
|
for (let key in this.panel.stateFilter) {
|
|
|
this.stateFilter[this.panel.stateFilter[key]] = true;
|
|
|
@@ -53,7 +52,7 @@ class AlertListPanel extends PanelCtrl {
|
|
|
return _.sortBy(alerts, a => { return alertDef.alertStateSortScore[a.state]; });
|
|
|
}
|
|
|
|
|
|
- var result = _.sortBy(alerts, a => { return a.name.toLowerCase();});
|
|
|
+ var result = _.sortBy(alerts, a => { return a.name.toLowerCase(); });
|
|
|
if (this.panel.sortOrder === 2) {
|
|
|
result.reverse();
|
|
|
}
|
|
|
@@ -71,11 +70,10 @@ class AlertListPanel extends PanelCtrl {
|
|
|
}
|
|
|
|
|
|
this.panel.stateFilter = result;
|
|
|
- this.onRender();
|
|
|
+ this.onRefresh();
|
|
|
}
|
|
|
|
|
|
- onRender() {
|
|
|
- this.contentHeight = "max-height: " + this.height + "px;";
|
|
|
+ onRefresh() {
|
|
|
if (this.panel.show === 'current') {
|
|
|
this.getCurrentAlertState();
|
|
|
}
|
|
|
@@ -107,6 +105,7 @@ class AlertListPanel extends PanelCtrl {
|
|
|
al.info = alertDef.getAlertAnnotationInfo(al);
|
|
|
return al;
|
|
|
});
|
|
|
+ this.noAlertsMessage = this.alertHistory.length === 0 ? 'No alerts in current time range' : '';
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -126,6 +125,7 @@ class AlertListPanel extends PanelCtrl {
|
|
|
al.newStateDateAgo = moment(al.newStateDate).locale('en').fromNow(true);
|
|
|
return al;
|
|
|
}));
|
|
|
+ this.noAlertsMessage = this.currentAlerts.length === 0 ? 'No alerts' : '';
|
|
|
});
|
|
|
}
|
|
|
|
Torkel Ödegaard