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

Trigger panel: show acknowledged triggers in different color, fixes #126.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-07-31 17:40:11 +03:00
parent e75a714e22
commit 38aa982c01
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/panel-triggers/editor.html
View File

@@ -291,7 +291,7 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form last"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" <li class="tight-form-item"
ng-style="{background:editor.panel.okEventColor}" ng-style="{background:editor.panel.okEventColor}"
@@ -307,5 +307,31 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item"
ng-style="{background:editor.panel.ackEventColor}"
style="width: 160px; color: white">
<span style="padding-left: 25px"> Acknowledged color </span>
</li>
<li class="tight-form-item">
<spectrum-picker
ng-model="editor.panel.ackEventColor"
ng-change="editor.panelCtrl.refresh()">
</spectrum-picker>
</li>
<li class="tight-form-item last" style="width: 28px">
<label class="checkbox-label" for="ack-event-color"></label>
<input class="cr1"
id="ack-event-color"
type="checkbox"
ng-model="editor.panel.markAckEvents"
ng-checked="editor.panel.markAckEvents"
ng-change="editor.panelCtrl.refresh()">
<label for="ack-event-color" class="cr1"></label>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div> </div>
</div> </div>

6
src/panel-triggers/module.js
View File

@@ -48,6 +48,7 @@ var panelDefaults = {
showEvents: { text: 'Problems', value: '1' }, showEvents: { text: 'Problems', value: '1' },
triggerSeverity: defaultSeverity, triggerSeverity: defaultSeverity,
okEventColor: 'rgba(0, 245, 153, 0.45)', okEventColor: 'rgba(0, 245, 153, 0.45)',
ackEventColor: 'rgba(0, 0, 0, 0)'
}; };
var triggerStatusMap = { var triggerStatusMap = {
@@ -183,6 +184,11 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')'; ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';
return ack; return ack;
}); });
// Mark acknowledged triggers with different color
if (self.panel.markAckEvents && trigger.acknowledges.length) {
trigger.color = self.panel.ackEventColor;
}
} }
}); });