Triggers query mode, allow to get active triggers count, #141

grafana · Oct 22, 2017 · 6c64f21 · 6c64f21
1 parent dacc3f3
commit 6c64f21
Show file tree

Hide file tree

Showing 26 changed files with 458 additions and 88 deletions.
diff --git a/dist/datasource-zabbix/constants.js b/dist/datasource-zabbix/constants.js
diff --git a/dist/datasource-zabbix/constants.js.map b/dist/datasource-zabbix/constants.js.map
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/query.editor.html b/dist/datasource-zabbix/partials/query.editor.html
@@ -48,7 +48,7 @@
     </div>
   </div>
 
-  <div class="gf-form-inline" ng-show="ctrl.target.mode == editorMode.METRICS || ctrl.target.mode == editorMode.TEXT">
+  <div class="gf-form-inline" ng-show="ctrl.target.mode == editorMode.METRICS || ctrl.target.mode == editorMode.TEXT || ctrl.target.mode == editorMode.TRIGGERS">
     <!-- Select Group -->
     <div class="gf-form max-width-20">
       <label class="gf-form-label query-keyword width-7">Group</label>
@@ -66,7 +66,7 @@
     </div>
     <!-- Select Host -->
     <div class="gf-form">
-      <label class="gf-form-label query-keyword width-7">Host</label>
+      <label class="gf-form-label query-keyword width-8">Host</label>
       <input type="text"
         ng-model="ctrl.target.host.filter"
         bs-typeahead="ctrl.getHostNames"
@@ -85,7 +85,7 @@
     </div>
   </div>
 
-  <div class="gf-form-inline" ng-show="ctrl.target.mode == editorMode.METRICS || ctrl.target.mode == editorMode.TEXT">
+  <div class="gf-form-inline" ng-show="ctrl.target.mode == editorMode.METRICS || ctrl.target.mode == editorMode.TEXT || ctrl.target.mode == editorMode.TRIGGERS">
     <!-- Select Application -->
     <div class="gf-form max-width-20">
       <label class="gf-form-label query-keyword width-7">Application</label>
@@ -103,8 +103,8 @@
     </div>
 
     <!-- Select Item -->
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword width-7">Item</label>
+    <div class="gf-form" ng-show="ctrl.target.mode == editorMode.METRICS || ctrl.target.mode == editorMode.TEXT">
+      <label class="gf-form-label query-keyword width-8">Item</label>
       <input type="text"
         ng-model="ctrl.target.item.filter"
         bs-typeahead="ctrl.getItemNames"
@@ -117,6 +117,18 @@
           'zbx-regex': ctrl.isRegex(ctrl.target.item.filter)
         }">
     </div>
+
+    <div class="gf-form max-width-20" ng-show="ctrl.target.mode == editorMode.TRIGGERS">
+      <label class="gf-form-label query-keyword width-8">Min Severity</label>
+      <div class="gf-form-select-wrapper width-20">
+        <select class="gf-form-input"
+              ng-change="ctrl.onTargetBlur()"
+              ng-model="ctrl.target.minSeverity"
+              ng-options="s.val as s.text for s in ctrl.triggerSeverity">
+        </select>
+      </div>
+    </div>
+
     <div class="gf-form gf-form--grow">
       <label class="gf-form-label gf-form-label--grow">
         <a ng-click="ctrl.toggleQueryOptions()">
@@ -130,13 +142,20 @@
 
   <!-- Query options -->
   <div class="gf-form-group" ng-if="ctrl.showQueryOptions">
-    <div class="gf-form offset-width-7">
+    <div class="gf-form offset-width-7" ng-hide="ctrl.target.mode == editorMode.TRIGGERS">
       <gf-form-switch class="gf-form"
         label="Show disabled items"
         checked="ctrl.target.options.showDisabledItems"
         on-change="ctrl.onQueryOptionChange()">
       </gf-form-switch>
     </div>
+    <div class="gf-form offset-width-7" ng-show="ctrl.target.mode == editorMode.TRIGGERS">
+      <gf-form-switch class="gf-form"
+        label="Count triggers"
+        checked="ctrl.target.options.countTriggers"
+        on-change="ctrl.onQueryOptionChange()">
+      </gf-form-switch>
+    </div>
   </div>
 
   <!-- Item IDs editor mode -->

diff --git a/dist/datasource-zabbix/query.controller.js b/dist/datasource-zabbix/query.controller.js
diff --git a/dist/datasource-zabbix/query.controller.js.map b/dist/datasource-zabbix/query.controller.js.map
diff --git a/dist/datasource-zabbix/responseHandler.js b/dist/datasource-zabbix/responseHandler.js