show trigger tags, #487

dist/css/grafana-zabbix.dark.css

@@ -9,6 +9,11 @@
     font-weight: bold; }
   .triggers-panel-container .alert-list-info.zbx-description {
     color: #b3b3b3; }
+  .triggers-panel-container .zbx-trigger-tags {
+    margin-left: 0.6rem; }
+    .triggers-panel-container .zbx-trigger-tags .zbx-tag {
+      color: #ECECEC;
+      padding: 0px 6px; }
   .triggers-panel-container .alert-list-footer {
     justify-content: flex-start; }
   .triggers-panel-container .trigger-info-block {

dist/css/grafana-zabbix.dark.css.map

@@ -9,6 +9,6 @@
 		"../../src/sass/_panel-triggers.scss",
 		"../../src/sass/_query_editor.scss"
 	],
-	"mappings": "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",
+	"mappings": "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",
 	"names": []
 }

dist/css/grafana-zabbix.light.css

@@ -9,6 +9,11 @@
     font-weight: bold; }
   .triggers-panel-container .alert-list-info.zbx-description {
     color: #acb6bf; }
+  .triggers-panel-container .zbx-trigger-tags {
+    margin-left: 0.6rem; }
+    .triggers-panel-container .zbx-trigger-tags .zbx-tag {
+      color: #e9edf2;
+      padding: 0px 6px; }
   .triggers-panel-container .alert-list-footer {
     justify-content: flex-start; }
   .triggers-panel-container .trigger-info-block {

dist/css/grafana-zabbix.light.css.map

@@ -9,6 +9,6 @@
 		"../../src/sass/_panel-triggers.scss",
 		"../../src/sass/_query_editor.scss"
 	],
-	"mappings": "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",
+	"mappings": "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",
 	"names": []
 }

dist/datasource-zabbix/zabbixAPI.service.js

@@ -337,7 +337,8 @@ System.register(['angular', 'lodash', './utils', './zabbixAPICore.service'], fun
             selectGroups: ['name'],
             selectHosts: ['name', 'host', 'maintenance_status'],
             selectItems: ['name', 'key_', 'lastvalue'],
-            selectLastEvent: 'extend'
+            selectLastEvent: 'extend',
+            selectTags: 'extend'
           };
 
           if (showTriggers) {

dist/panel-triggers/partials/module.html

@@ -16,6 +16,12 @@
                     <i ng-if="trigger.maintenance" class="fa fa-wrench zbx-maintenance-icon"></i>
                     {{ ctrl.formatHostName(trigger) }}
                   </span>
+
+                  <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
+                    <span ng-repeat="tag in trigger.tags" tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
+                      {{tag.tag}}: {{tag.value}}
+                    </span>
+                  </span>
                 </p>
 
                 <p class="alert-list-text">

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="Tags"
+      checked="ctrl.panel.showTags"
+      on-change="ctrl.render()">
+    </gf-form-switch>
     <gf-form-switch class="gf-form"
       label-class="width-9"
       label="Status"

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

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

dist/panel-triggers/triggers_panel_ctrl.js

@@ -132,6 +132,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
         // Fields
         hostField: true,
         hostTechNameField: false,
+        showTags: true,
         statusField: true,
         severityField: true,
         descriptionField: true,
@@ -467,6 +468,11 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
               triggerObj.hostTechName = trigger.hosts[0].host;
             }
 
+            // Set tags if present
+            if (trigger.tags && trigger.tags.length === 0) {
+              trigger.tags = null;
+            }
+
             // Handle multi-line description
             if (trigger.comments) {
               trigger.comments = trigger.comments.replace('\n', '<br>');
@@ -682,11 +688,15 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
                 triggerCardElem.find('.alert-list-icon').css({ 'font-size': fontSize + '%' });
                 triggerCardElem.find('.alert-list-title').css({ 'font-size': fontSize + '%' });
                 triggerCardElem.find('.alert-list-text').css({ 'font-size': fontSize * 0.8 + '%' });
+                triggerCardElem.find('.zbx-tag').css({ 'font-size': fontSize * 0.6 + '%' });
+                triggerCardElem.find('.zbx-tag').css({ 'line-height': fontSize / 100 * 16 + 'px' });
               } else {
                 // remove css
                 triggerCardElem.find('.alert-list-icon').css({ 'font-size': '' });
                 triggerCardElem.find('.alert-list-title').css({ 'font-size': '' });
                 triggerCardElem.find('.alert-list-text').css({ 'font-size': '' });
+                triggerCardElem.find('.zbx-tag').css({ 'font-size': '' });
+                triggerCardElem.find('.zbx-tag').css({ 'line-height': '' });
               }
             }
 

src/datasource-zabbix/zabbixAPI.service.js

@@ -361,7 +361,8 @@ function ZabbixAPIServiceFactory(alertSrv, zabbixAPICoreService) {
         selectGroups: ['name'],
         selectHosts: ['name', 'host', 'maintenance_status'],
         selectItems: ['name', 'key_', 'lastvalue'],
-        selectLastEvent: 'extend'
+        selectLastEvent: 'extend',
+        selectTags: 'extend'
       };
 
       if (showTriggers) {

src/panel-triggers/partials/module.html

@@ -16,6 +16,12 @@
                     <i ng-if="trigger.maintenance" class="fa fa-wrench zbx-maintenance-icon"></i>
                     {{ ctrl.formatHostName(trigger) }}
                   </span>
+
+                  <span class="zbx-trigger-tags" ng-if="ctrl.panel.showTags && trigger.tags">
+                    <span ng-repeat="tag in trigger.tags" tag-color-from-name="tag.tag+tag.value" class="label label-tag zbx-tag">
+                      {{tag.tag}}: {{tag.value}}
+                    </span>
+                  </span>
                 </p>
 
                 <p class="alert-list-text">

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="Tags"
+      checked="ctrl.panel.showTags"
+      on-change="ctrl.render()">
+    </gf-form-switch>
     <gf-form-switch class="gf-form"
       label-class="width-9"
       label="Status"

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

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

src/panel-triggers/triggers_panel_ctrl.js

@@ -34,6 +34,7 @@ export const PANEL_DEFAULTS = {
   // Fields
   hostField: true,
   hostTechNameField: false,
+  showTags: true,
   statusField: true,
   severityField: true,
   descriptionField: true,
@@ -332,6 +333,11 @@ export class TriggerPanelCtrl extends PanelCtrl {
       triggerObj.hostTechName = trigger.hosts[0].host;
     }
 
+    // Set tags if present
+    if (trigger.tags && trigger.tags.length === 0) {
+      trigger.tags = null;
+    }
+
     // Handle multi-line description
     if (trigger.comments) {
       trigger.comments = trigger.comments.replace('\n', '<br>');
@@ -537,11 +543,15 @@ export class TriggerPanelCtrl extends PanelCtrl {
         triggerCardElem.find('.alert-list-icon').css({'font-size': fontSize + '%'});
         triggerCardElem.find('.alert-list-title').css({'font-size': fontSize + '%'});
         triggerCardElem.find('.alert-list-text').css({'font-size': fontSize * 0.8 + '%'});
+        triggerCardElem.find('.zbx-tag').css({'font-size': fontSize * 0.6 + '%'});
+        triggerCardElem.find('.zbx-tag').css({'line-height': fontSize / 100 * 16 + 'px'});
       } else {
         // remove css
         triggerCardElem.find('.alert-list-icon').css({'font-size': ''});
         triggerCardElem.find('.alert-list-title').css({'font-size': ''});
         triggerCardElem.find('.alert-list-text').css({'font-size': ''});
+        triggerCardElem.find('.zbx-tag').css({'font-size': ''});
+        triggerCardElem.find('.zbx-tag').css({'line-height': ''});
       }
     }
 

src/sass/_panel-triggers.scss

@@ -15,6 +15,16 @@
     color: $gray-3;
   }
 
+  .zbx-trigger-tags {
+    margin-left: 0.6rem;
+
+    .zbx-tag {
+      color: $zbx-tag-color;
+      // opacity: 0.9;
+      padding: 0px 6px;
+    }
+  }
+
   .alert-list-footer {
     justify-content: flex-start;
   }

src/sass/_variables.dark.scss

@@ -36,3 +36,4 @@ $text-color:            $gray-4;
 $tight-form-func-bg:    #333;
 $grafanaListAccent:     lighten($dark-2, 2%);
 
+$zbx-tag-color: $gray-5;

src/sass/_variables.light.scss

@@ -34,3 +34,5 @@ $body-color:            $gray-1;
 $text-color:            $gray-1;
 $tight-form-func-bg:    $gray-5;
 $grafanaListAccent:     $gray-5;
+
+$zbx-tag-color: $gray-6;