Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

triggers panel: fix icon for OK events

Browse Source
This commit is contained in:
Alexander Zobnin
2018-03-23 15:44:32 +03:00
parent 88a44f84ab
commit e09bbe125b
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/panel-triggers/partials/options_tab.html vendored
View File

@@ -163,7 +163,7 @@
<label class="gf-form-label width-3">{{ trigger.priority }}</label> <label class="gf-form-label width-3">{{ trigger.priority }}</label>
<label class="gf-form-label triggers-severity-config" <label class="gf-form-label triggers-severity-config"
ng-style="{color: trigger.color}"> ng-style="{color: trigger.color}">
<i class="icon-gf" ng-class="ctrl.getAlertIconClass(trigger)"></i> <i class="icon-gf" ng-class="ctrl.getAlertIconClassBySeverity(trigger)"></i>
</label> </label>
<input type="text" <input type="text"
class="gf-form-input width-12" class="gf-form-input width-12"

12
dist/panel-triggers/triggers_panel_ctrl.js vendored
View File

@@ -641,9 +641,8 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
}, { }, {
key: 'getAlertIconClass', key: 'getAlertIconClass',
value: function getAlertIconClass(trigger) { value: function getAlertIconClass(trigger) {
var triggerValue = Number(trigger.value);
var iconClass = ''; var iconClass = '';
if (triggerValue || trigger.color) { if (trigger.value === '1') {
if (trigger.priority >= 3) { if (trigger.priority >= 3) {
iconClass = 'icon-gf-critical'; iconClass = 'icon-gf-critical';
} else { } else {
@@ -658,6 +657,15 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
} }
return iconClass; return iconClass;
} }
}, {
key: 'getAlertIconClassBySeverity',
value: function getAlertIconClassBySeverity(triggerSeverity) {
var iconClass = 'icon-gf-warning';
if (triggerSeverity.priority >= 3) {
iconClass = 'icon-gf-critical';
}
return iconClass;
}
}, { }, {
key: 'getAlertStateClass', key: 'getAlertStateClass',
value: function getAlertStateClass(trigger) { value: function getAlertStateClass(trigger) {

2
dist/panel-triggers/triggers_panel_ctrl.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/panel-triggers/partials/options_tab.html
View File

@@ -163,7 +163,7 @@
<label class="gf-form-label width-3">{{ trigger.priority }}</label> <label class="gf-form-label width-3">{{ trigger.priority }}</label>
<label class="gf-form-label triggers-severity-config" <label class="gf-form-label triggers-severity-config"
ng-style="{color: trigger.color}"> ng-style="{color: trigger.color}">
<i class="icon-gf" ng-class="ctrl.getAlertIconClass(trigger)"></i> <i class="icon-gf" ng-class="ctrl.getAlertIconClassBySeverity(trigger)"></i>
</label> </label>
<input type="text" <input type="text"
class="gf-form-input width-12" class="gf-form-input width-12"

11
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -490,9 +490,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
} }
getAlertIconClass(trigger) { getAlertIconClass(trigger) {
const triggerValue = Number(trigger.value);
let iconClass = ''; let iconClass = '';
if (triggerValue || trigger.color) { if (trigger.value === '1') {
if (trigger.priority >= 3) { if (trigger.priority >= 3) {
iconClass = 'icon-gf-critical'; iconClass = 'icon-gf-critical';
} else { } else {
@@ -508,6 +507,14 @@ export class TriggerPanelCtrl extends PanelCtrl {
return iconClass; return iconClass;
} }
getAlertIconClassBySeverity(triggerSeverity) {
let iconClass = 'icon-gf-warning';
if (triggerSeverity.priority >= 3) {
iconClass = 'icon-gf-critical';
}
return iconClass;
}
getAlertStateClass(trigger) { getAlertStateClass(trigger) {
let statusClass = ''; let statusClass = '';