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

Merge branch 'feature-text_metrics' into grafana-3.0

Browse Source 
Conflicts:
	zabbix/partials/query.editor.html
This commit is contained in:
Alexander Zobnin
2016-01-10 22:07:34 +03:00
parent 259b188814 530a833844
commit c7d30e03e4
3 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/datasource-zabbix/datasource.js
View File

@@ -225,7 +225,22 @@ function (angular, _, dateMath) {
return {
target: target.item.name,
datapoints: _.map(history, function (p) {
return [p.value, p.clock * 1000];
var value = p.value;
if (target.textFilter) {
var text_extract_pattern = new RegExp(templateSrv.replace(target.textFilter, options.scopedVars));
//var text_extract_pattern = new RegExp(target.textFilter);
var result = text_extract_pattern.exec(value);
if (result) {
if (target.useCaptureGroups) {
value = result[1];
} else {
value = result[0];
}
} else {
value = null;
}
}
return [value, p.clock * 1000];
})
};
});

35
plugins/datasource-zabbix/partials/query.editor.html
View File

@@ -76,7 +76,7 @@
<ul class="tight-form-list" role="menu" ng-hide="target.mode == 1">
<!-- Alias -->
<li>
<li ng-hide="target.mode == 2">
<input type="text"
class="tight-form-input input-medium"
ng-model="target.alias"
@@ -154,11 +154,7 @@
<div class="tight-form" ng-hide="target.mode == 1">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li>
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
</li>
<li class="tight-form-item" style="width: 135px">&nbsp</li>
<li class="tight-form-item" style="width: 44px">&nbsp</li>
<!-- Select Application -->
<li class="tight-form-item input-small" style="width: 5em">Application</li>
@@ -224,4 +220,31 @@
<div class="clearfix"></div>
</div>
<div class="tight-form" ng-hide="target.mode == 1">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item" style="width: 44px">&nbsp</li>
<!-- Text metric regex -->
<li class="tight-form-item" ng-show="target.mode == 2">
Text filter
</li>
<li ng-show="target.mode == 2">
<input type="text"
class="tight-form-input input-large" style="width: 20em"
ng-model="target.textFilter"
spellcheck='false'
placeholder="Text filter (regex)"
ng-blur="targetBlur()">
</li>
<li class="tight-form-item" ng-show="target.mode == 2">
Use capture groups&nbsp;
<input class="cr1" id="target.useCaptureGroups" type="checkbox"
ng-model="target.useCaptureGroups"
ng-checked="target.useCaptureGroups"
ng-change="targetBlur()">
<label for="target.useCaptureGroups" class="cr1"></label>
</li>
</ul>
<div class="clearfix"></div>
</div>

12
plugins/datasource-zabbix/partials/query.options.html
View File

@@ -41,6 +41,11 @@
IT service property
</a>
</li>
<li class="tight-form-item">
<a ng-click="toggleEditorHelp(4)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
Text filter
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
@@ -80,5 +85,12 @@
<li>Down time - time the service was in scheduled downtime, in seconds</li>
</ul>
</div>
<div class="grafana-info-box span8" ng-if="editorHelpIndex === 4">
<h5>Text filter</h5>
<ul>
<li>Use regex to extract a part of the returned value.</li>
</ul>
</div>
</div>
</div>