Add option for alerting to data source config.

opstrip · Mar 5, 2017 · ca63fbe · ca63fbe
1 parent f805213
commit ca63fbe
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 10 deletions.
diff --git a/dist/datasource-zabbix/datasource.js b/dist/datasource-zabbix/datasource.js
diff --git a/dist/datasource-zabbix/datasource.js.map b/dist/datasource-zabbix/datasource.js.map
diff --git a/dist/datasource-zabbix/partials/config.html b/dist/datasource-zabbix/partials/config.html
@@ -58,3 +58,11 @@ <h3 class="page-heading">Zabbix API details</h3>
     </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>
diff --git a/dist/test/datasource-zabbix/datasource.js b/dist/test/datasource-zabbix/datasource.js
@@ -79,6 +79,8 @@ var ZabbixAPIDatasource = function () {
     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
@@ -108,9 +110,11 @@ var ZabbixAPIDatasource = function () {
       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 = _lodash2.default.map(options.targets, function (target) {

diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
@@ -35,6 +35,8 @@ class ZabbixAPIDatasource {
     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
@@ -58,9 +60,11 @@ class ZabbixAPIDatasource {
     let useTrends = (timeFrom <= useTrendsFrom) && this.trends;
 
     // Get alerts for current panel
-    this.alertQuery(options).then(alert => {
-      this.setPanelAlertState(options.panelId, alert.state);
-    });
+    if (this.alertingEnabled) {
+      this.alertQuery(options).then(alert => {
+        this.setPanelAlertState(options.panelId, alert.state);
+      });
+    }
 
     // Create request for each target
     let promises = _.map(options.targets, target => {

diff --git a/src/datasource-zabbix/partials/config.html b/src/datasource-zabbix/partials/config.html
@@ -58,3 +58,11 @@ <h3 class="page-heading">Zabbix API details</h3>
     </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>