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

Add Show OK events option.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-06-11 18:21:56 +03:00
parent ad32942b8a
commit 33bf0c38e7
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zabbix/datasource.js
View File

@@ -633,6 +633,11 @@ function (angular, _, kbn) {
select_acknowledges: 'extend' select_acknowledges: 'extend'
}; };
// Show problem events only
if (!annotation.showOkEvents) {
params.value = 1;
}
return self.performZabbixAPIRequest('event.get', params) return self.performZabbixAPIRequest('event.get', params)
.then(function (result) { .then(function (result) {
var events = []; var events = [];
@@ -712,9 +717,15 @@ function getShortTime(date) {
} }
/**
* Format acknowledges.
*
* @param {array} acknowledges array of Zabbix acknowledge objects
* @return {string} HTML-formatted table
*/
function formatAcknowledges(acknowledges) { function formatAcknowledges(acknowledges) {
if (acknowledges.length) { if (acknowledges.length) {
var formatted_acknowledges = '<br><br>Acknowledges:<br><table border="1"><tr><td><b>Time</b></td><td><b>User</b></td><td><b>Comments</b></td></tr>'; var formatted_acknowledges = '<br><br>Acknowledges:<br><table><tr><td><b>Time</b></td><td><b>User</b></td><td><b>Comments</b></td></tr>';
_.each(_.map(acknowledges, function (ack) { _.each(_.map(acknowledges, function (ack) {
var time = new Date(ack.clock * 1000); var time = new Date(ack.clock * 1000);
return '<tr><td><i>' + getShortTime(time) + '</i></td><td>' + ack.alias + ' (' + ack.name+ ' ' + ack.surname + ')' + '</td><td>' + ack.message + '</td></tr>'; return '<tr><td><i>' + getShortTime(time) + '</i></td><td>' + ack.alias + ' (' + ack.name+ ' ' + ack.surname + ')' + '</td><td>' + ack.message + '</td></tr>';

10
zabbix/partials/annotations.editor.html
View File

@@ -2,7 +2,15 @@
<div class="section"> <div class="section">
<h5>Zabbix trigger <tip>Example: Lack of free swap space</tip></h5> <h5>Zabbix trigger <tip>Example: Lack of free swap space</tip></h5>
<div class="editor-option"> <div class="editor-option">
<input type="text" class="span10" ng-model='currentAnnotation.query' placeholder="Lack of free swap space"></input> <input type="text" class="span10" ng-model="currentAnnotation.query" placeholder="Lack of free swap space"></input>
</div> </div>
</div> </div>
</div> </div>
<div class="editor-row">
<div class="section">
<h5>Options</h5>
<input type="checkbox" class="cr1" id="currentAnnotation.okEvents" ng-model="currentAnnotation.okEvents" ng-checked="currentAnnotation.okEvents">
<label for="currentAnnotation.okEvents" class="cr1">Show OK events <tip>Show events, generated when trigger release to OK state</tip></label>
</div>
</div>