diff --git a/plugins/panel-triggers/editor.html b/plugins/panel-triggers/editor.html index cee0338..bed41eb 100644 --- a/plugins/panel-triggers/editor.html +++ b/plugins/panel-triggers/editor.html @@ -105,7 +105,7 @@ Limit triggers number to
  • - Show events
  • - +
  • + +
    + diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js index 43d2eab..50be62c 100644 --- a/plugins/panel-triggers/module.js +++ b/plugins/panel-triggers/module.js @@ -79,7 +79,8 @@ function (angular, app, _, $, config, PanelMeta) { showTriggers: 'all triggers', sortTriggersBy: { text: 'last change', value: 'lastchange' }, showEvents: { text: 'Problem events', value: '1' }, - triggerSeverity: grafanaDefaultSeverity + triggerSeverity: grafanaDefaultSeverity, + okEventColor: '#890F02' }; _.defaults($scope.panel, panelDefaults); @@ -145,7 +146,14 @@ function (angular, app, _, $, config, PanelMeta) { triggerObj.lastchangeUnix = lastchangeUnix; triggerObj.lastchange = lastchange.toLocaleString(); triggerObj.age = age.toLocaleString(); - triggerObj.color = $scope.panel.triggerSeverity[trigger.priority].color; + + // Set color + if (trigger.value === '1') { + triggerObj.color = $scope.panel.triggerSeverity[trigger.priority].color; + } else { + triggerObj.color = $scope.panel.okEventColor; + } + triggerObj.severity = $scope.panel.triggerSeverity[trigger.priority].severity; return triggerObj; }); @@ -327,6 +335,23 @@ function (angular, app, _, $, config, PanelMeta) { }); }; + $scope.openOkEventColorSelector = function(event) { + var el = $(event.currentTarget); + var popoverScope = $scope.$new(); + popoverScope.trigger = {color: $scope.panel.okEventColor}; + popoverScope.changeTriggerSeverityColor = function(trigger, color) { + $scope.panel.okEventColor = color; + $scope.refreshTriggerSeverity(); + }; + + popoverSrv.show({ + element: el, + placement: 'top', + templateUrl: 'public/plugins/triggers/trigger.colorpicker.html', + scope: popoverScope + }); + }; + /** * Convert event age from Unix format (milliseconds sins 1970) * to Zabbix format (like at Last 20 issues panel).