Add option for alerting to data source config.

This commit is contained in:
Alexander Zobnin
2017-03-05 14:09:02 +03:00
parent f805213b02
commit ca63fbe5a3
6 changed files with 38 additions and 10 deletions

View File

@@ -209,6 +209,8 @@ System.register(['lodash', 'jquery', 'app/core/utils/datemath', './utils', './mi
var ttl = instanceSettings.jsonData.cacheTTL || '1h';
this.cacheTTL = utils.parseInterval(ttl);
this.alertingEnabled = instanceSettings.jsonData.alerting;
this.zabbix = new Zabbix(this.url, this.username, this.password, this.basicAuth, this.withCredentials, this.cacheTTL);
// Use custom format for template variables
@@ -238,9 +240,11 @@ System.register(['lodash', 'jquery', 'app/core/utils/datemath', './utils', './mi
var useTrends = timeFrom <= useTrendsFrom && this.trends;
// Get alerts for current panel
this.alertQuery(options).then(function (alert) {
_this.setPanelAlertState(options.panelId, alert.state);
});
if (this.alertingEnabled) {
this.alertQuery(options).then(function (alert) {
_this.setPanelAlertState(options.panelId, alert.state);
});
}
// Create request for each target
var promises = _.map(options.targets, function (target) {

File diff suppressed because one or more lines are too long

View File

@@ -58,3 +58,11 @@
</input>
</div>
</div>
<div class="gf-form-group">
<h3 class="page-heading">Alerting</h3>
<gf-form-switch class="gf-form width-8"
label="Enable alerting"
checked="ctrl.current.jsonData.alerting">
</gf-form-switch>
</div>