trigers: show host groups option, #248 #418

dist/panel-triggers/partials/module.html

@@ -16,6 +16,9 @@
                     <i ng-if="trigger.maintenance" class="fa fa-wrench zbx-maintenance-icon"></i>
                     {{ ctrl.formatHostName(trigger) }}
                   </span>
+                  <span class="zabbix-hostname" ng-if="ctrl.panel.hostGroups">
+                    {{ ctrl.formatHostGroups(trigger) }}
+                  </span>
 
                   <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
                     <span ng-repeat="tag in trigger.tags" ng-click="ctrl.addTagFilter(tag, trigger.datasource)"

dist/panel-triggers/partials/options_tab.html

@@ -13,6 +13,12 @@
       checked="ctrl.panel.hostTechNameField"
       on-change="ctrl.render()">
     </gf-form-switch>
+    <gf-form-switch class="gf-form"
+      label-class="width-9"
+      label="Host groups"
+      checked="ctrl.panel.hostGroups"
+      on-change="ctrl.render()">
+    </gf-form-switch>
     <gf-form-switch class="gf-form"
       label-class="width-9"
       label="Tags"

dist/panel-triggers/specs/migrations.spec.js

@@ -51,6 +51,7 @@ describe('Triggers Panel schema migration', () => {
       },
       hostField: true,
       hostTechNameField: false,
+      hostGroups: false,
       showTags: true,
       statusField: false,
       severityField: false,
@@ -87,6 +88,7 @@ describe('Triggers Panel schema migration', () => {
       },
       hostField: true,
       hostTechNameField: false,
+      hostGroups: false,
       showTags: true,
       statusField: true,
       severityField: true,

dist/panel-triggers/triggers_panel_ctrl.js

@@ -134,6 +134,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
         // Fields
         hostField: true,
         hostTechNameField: false,
+        hostGroups: false,
         showTags: true,
         statusField: true,
         severityField: true,
@@ -617,13 +618,25 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
         }, {
           key: 'formatHostName',
           value: function formatHostName(trigger) {
+            var host = "";
             if (this.panel.hostField && this.panel.hostTechNameField) {
-              return trigger.host + ' (' + trigger.hostTechName + ')';
+              host = trigger.host + ' (' + trigger.hostTechName + ')';
             } else if (this.panel.hostField || this.panel.hostTechNameField) {
-              return this.panel.hostField ? trigger.host : trigger.hostTechName;
+              host = this.panel.hostField ? trigger.host : trigger.hostTechName;
-            } else {
-              return "";
             }
+
+            return host;
+          }
+        }, {
+          key: 'formatHostGroups',
+          value: function formatHostGroups(trigger) {
+            var groupNames = "";
+            if (this.panel.hostGroups) {
+              var groups = _.map(trigger.groups, 'name').join(', ');
+              groupNames += '[ ' + groups + ' ]';
+            }
+
+            return groupNames;
           }
         }, {
           key: 'getAlertIconClass',

src/panel-triggers/partials/module.html

@@ -16,6 +16,9 @@
                     <i ng-if="trigger.maintenance" class="fa fa-wrench zbx-maintenance-icon"></i>
                     {{ ctrl.formatHostName(trigger) }}
                   </span>
+                  <span class="zabbix-hostname" ng-if="ctrl.panel.hostGroups">
+                    {{ ctrl.formatHostGroups(trigger) }}
+                  </span>
 
                   <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
                     <span ng-repeat="tag in trigger.tags" ng-click="ctrl.addTagFilter(tag, trigger.datasource)"

src/panel-triggers/partials/options_tab.html

@@ -13,6 +13,12 @@
       checked="ctrl.panel.hostTechNameField"
       on-change="ctrl.render()">
     </gf-form-switch>
+    <gf-form-switch class="gf-form"
+      label-class="width-9"
+      label="Host groups"
+      checked="ctrl.panel.hostGroups"
+      on-change="ctrl.render()">
+    </gf-form-switch>
     <gf-form-switch class="gf-form"
       label-class="width-9"
       label="Tags"

src/panel-triggers/specs/migrations.spec.js

@@ -51,6 +51,7 @@ describe('Triggers Panel schema migration', () => {
       },
       hostField: true,
       hostTechNameField: false,
+      hostGroups: false,
       showTags: true,
       statusField: false,
       severityField: false,
@@ -87,6 +88,7 @@ describe('Triggers Panel schema migration', () => {
       },
       hostField: true,
       hostTechNameField: false,
+      hostGroups: false,
       showTags: true,
       statusField: true,
       severityField: true,

src/panel-triggers/triggers_panel_ctrl.js

@@ -35,6 +35,7 @@ export const PANEL_DEFAULTS = {
   // Fields
   hostField: true,
   hostTechNameField: false,
+  hostGroups: false,
   showTags: true,
   statusField: true,
   severityField: true,
@@ -468,13 +469,24 @@ export class TriggerPanelCtrl extends PanelCtrl {
   }
 
   formatHostName(trigger) {
+    let host = "";
     if (this.panel.hostField && this.panel.hostTechNameField) {
-      return `${trigger.host} (${trigger.hostTechName})`;
+      host = `${trigger.host} (${trigger.hostTechName})`;
     } else if (this.panel.hostField || this.panel.hostTechNameField) {
-      return this.panel.hostField ? trigger.host : trigger.hostTechName;
+      host = this.panel.hostField ? trigger.host : trigger.hostTechName;
-    } else {
-      return "";
     }
+
+    return host;
+  }
+
+  formatHostGroups(trigger) {
+    let groupNames = "";
+    if (this.panel.hostGroups) {
+      let groups = _.map(trigger.groups, 'name').join(', ');
+      groupNames += `[ ${groups} ]`;
+    }
+
+    return groupNames;
   }
 
   getAlertIconClass(trigger) {