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

Fixed new query options.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-04-28 19:54:02 +03:00
parent a22aeb12f9
commit 744ffa0721
1 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/datasource-zabbix/partials/query.editor.html
View File

@@ -19,7 +19,7 @@
<!-- IT Service editor --> <!-- IT Service editor -->
<div class="gf-form-inline" ng-show="ctrl.target.mode == 1"> <div class="gf-form-inline" ng-show="ctrl.target.mode == 1">
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<label class="gf-form-label width-7">IT Service</label> <label class="gf-form-label query-keyword width-7">IT Service</label>
<div class="gf-form-select-wrapper max-width-20"> <div class="gf-form-select-wrapper max-width-20">
<select class="gf-form-input" <select class="gf-form-input"
ng-change="ctrl.selectITService()" ng-change="ctrl.selectITService()"
@@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label">IT service property</label> <label class="gf-form-label query-keyword">IT service property</label>
<div class="gf-form-select-wrapper"> <div class="gf-form-select-wrapper">
<select class="gf-form-input" <select class="gf-form-input"
ng-change="ctrl.selectITService()" ng-change="ctrl.selectITService()"
@@ -49,7 +49,7 @@
<div class="gf-form-inline" ng-hide="ctrl.target.mode == 1"> <div class="gf-form-inline" ng-hide="ctrl.target.mode == 1">
<!-- Select Group --> <!-- Select Group -->
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<label class="gf-form-label width-7">Group</label> <label class="gf-form-label query-keyword width-7">Group</label>
<input type="text" <input type="text"
ng-model="ctrl.target.group.filter" ng-model="ctrl.target.group.filter"
bs-typeahead="ctrl.getGroupNames" bs-typeahead="ctrl.getGroupNames"
@@ -64,7 +64,7 @@
</div> </div>
<!-- Select Host --> <!-- Select Host -->
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-7">Host</label> <label class="gf-form-label query-keyword width-7">Host</label>
<input type="text" <input type="text"
ng-model="ctrl.target.host.filter" ng-model="ctrl.target.host.filter"
bs-typeahead="ctrl.getHostNames" bs-typeahead="ctrl.getHostNames"
@@ -78,10 +78,6 @@
}"> }">
</div> </div>
<gf-form-switch class="gf-form" ng-hide="ctrl.target.mode == 2"
label="Show disabled items" checked="ctrl.target.showDisabledItems" on-change="ctrl.onTargetBlur()">
</gf-form-switch>
<div class="gf-form gf-form--grow"> <div class="gf-form gf-form--grow">
<div class="gf-form-label gf-form-label--grow"></div> <div class="gf-form-label gf-form-label--grow"></div>
</div> </div>
@@ -90,7 +86,7 @@
<div class="gf-form-inline" ng-hide="ctrl.target.mode == 1"> <div class="gf-form-inline" ng-hide="ctrl.target.mode == 1">
<!-- Select Application --> <!-- Select Application -->
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<label class="gf-form-label width-7">Application</label> <label class="gf-form-label query-keyword width-7">Application</label>
<input type="text" <input type="text"
ng-model="ctrl.target.application.filter" ng-model="ctrl.target.application.filter"
bs-typeahead="ctrl.getApplicationNames" bs-typeahead="ctrl.getApplicationNames"
@@ -106,7 +102,7 @@
<!-- Select Item --> <!-- Select Item -->
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-7">Item</label> <label class="gf-form-label query-keyword width-7">Item</label>
<input type="text" <input type="text"
ng-model="ctrl.target.item.filter" ng-model="ctrl.target.item.filter"
bs-typeahead="ctrl.getItemNames" bs-typeahead="ctrl.getItemNames"
@@ -119,8 +115,21 @@
'zbx-regex': ctrl.isRegex(ctrl.target.item.filter) 'zbx-regex': ctrl.isRegex(ctrl.target.item.filter)
}"> }">
</div> </div>
<div class="gf-form gf-form--grow">
<label class="gf-form-label gf-form-label--grow">
<a ng-click="ctrl.toggleQueryOptions()">
<i class="fa fa-caret-down" ng-show="ctrl.showQueryOptions"></i>
<i class="fa fa-caret-right" ng-hide="ctrl.showQueryOptions"></i>
{{ctrl.queryOptionsText}}
</a>
</label>
</div>
</div>
<!-- Metric processing functions -->
<div class="gf-form-inline" ng-hide="ctrl.target.mode">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label">Options</label> <label class="gf-form-label query-keyword width-7">Functions</label>
<div ng-repeat="func in ctrl.target.functions" class="gf-form-label query-part" metric-function-editor></div> <div ng-repeat="func in ctrl.target.functions" class="gf-form-label query-part" metric-function-editor></div>
</div> </div>
<div class="gf-form dropdown" add-metric-function> <div class="gf-form dropdown" add-metric-function>
@@ -130,10 +139,11 @@
</div> </div>
</div> </div>
<!-- Text mode options -->
<div class="gf-form-inline" ng-show="ctrl.target.mode == 2"> <div class="gf-form-inline" ng-show="ctrl.target.mode == 2">
<!-- Text metric regex --> <!-- Text metric regex -->
<div class="gf-form max-width-20"> <div class="gf-form max-width-20">
<label class="gf-form-label width-7">Text filter</label> <label class="gf-form-label query-keyword width-7">Text filter</label>
<input type="text" <input type="text"
class="gf-form-input" class="gf-form-input"
ng-model="ctrl.target.textFilter" ng-model="ctrl.target.textFilter"
@@ -146,4 +156,15 @@
</gf-form-switch> </gf-form-switch>
</div> </div>
<!-- Query options -->
<div class="gf-form-group" ng-if="ctrl.showQueryOptions">
<div class="gf-form offset-width-7">
<gf-form-switch class="gf-form" ng-hide="ctrl.target.mode == 2"
label="Show disabled items"
checked="ctrl.target.options.showDisabledItems"
on-change="ctrl.onQueryOptionChange()">
</gf-form-switch>
</div>
</div>
</query-editor-row> </query-editor-row>