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

Merge branch 'feature-improve_annotations' into develop

Browse Source
This commit is contained in:
Alexander Zobnin
2015-08-16 15:10:12 +03:00
parent d6300a47b0 a27f3fa165
commit 5961978828
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zabbix/datasource.js
View File

@@ -309,11 +309,17 @@ function (angular, _, kbn) {
var params = {
output: ['triggerid', 'description'],
search: {
'description': annotation.query
'description': annotation.trigger
},
searchWildcardsEnabled: true,
expandDescription: true
};
if (annotation.host) {
params.host = templateSrv.replace(annotation.host);
}
else if (annotation.group) {
params.group = templateSrv.replace(annotation.group);
}
return this.zabbixAPI.performZabbixAPIRequest('trigger.get', params)
.then(function (result) {

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

@@ -1,14 +1,26 @@
<div class="editor-row">
<div class="section">
<h5>Zabbix trigger
<tip>Example: Lack of free swap space</tip>
</h5>
<div class="editor-option">
<input type="text" class="span10"
ng-model="currentAnnotation.query"
placeholder="Lack of free swap space">
</div>
</div>
<div class="editor-row">
<div class="editor-option">
<label class="small">Group</label>
<input type="text" class="input-medium" ng-model='currentAnnotation.group'></input>
</div>
<div class="editor-option">
<label class="small">Host</label>
<input type="text" class="input-medium" ng-model='currentAnnotation.host'></input>
</div>
<div class="editor-option">
<label class="small">Trigger
<tip>Trigger name for search. Wildcards are supports. Examples: Lack of free swap space, Lack of*.
</tip>
</label>
<input type="text" style="width: 25em" ng-model='currentAnnotation.trigger' placeholder="Trigger name"></input>
</div>
</div>
<div class="editor-row">