show trigger tags, #487

grafana · Dec 14, 2017 · 3f140c8 · 3f140c8
1 parent e6794b1
commit 3f140c8
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 6 deletions.
diff --git a/dist/css/grafana-zabbix.dark.css b/dist/css/grafana-zabbix.dark.css
diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map
diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css
diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map
diff --git a/dist/datasource-zabbix/zabbixAPI.service.js b/dist/datasource-zabbix/zabbixAPI.service.js
diff --git a/dist/datasource-zabbix/zabbixAPI.service.js.map b/dist/datasource-zabbix/zabbixAPI.service.js.map
diff --git a/dist/panel-triggers/partials/module.html b/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">

diff --git a/dist/panel-triggers/partials/options_tab.html b/dist/panel-triggers/partials/options_tab.html
@@ -13,6 +13,12 @@ <h5 class="section-heading">Show fields</h5>
       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"

diff --git a/dist/panel-triggers/specs/migrations.spec.js b/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,

diff --git a/dist/panel-triggers/triggers_panel_ctrl.js b/dist/panel-triggers/triggers_panel_ctrl.js
diff --git a/dist/panel-triggers/triggers_panel_ctrl.js.map b/dist/panel-triggers/triggers_panel_ctrl.js.map
diff --git a/src/datasource-zabbix/zabbixAPI.service.js b/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) {

diff --git a/src/panel-triggers/partials/module.html b/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">

diff --git a/src/panel-triggers/partials/options_tab.html b/src/panel-triggers/partials/options_tab.html
@@ -13,6 +13,12 @@ <h5 class="section-heading">Show fields</h5>
       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"

diff --git a/src/panel-triggers/specs/migrations.spec.js b/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,

diff --git a/src/panel-triggers/triggers_panel_ctrl.js b/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': ''});
       }
     }
 

diff --git a/src/sass/_panel-triggers.scss b/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;
   }

diff --git a/src/sass/_variables.dark.scss b/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;
diff --git a/src/sass/_variables.light.scss b/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;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ $text-color: $gray-4;
		$tight-form-func-bg: #333;
		$grafanaListAccent: lighten($dark-2, 2%);

		$zbx-tag-color: $gray-5;