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

Merge branch 'develop' into feature-aggregation

Browse Source
This commit is contained in:
Alexander Zobnin
2015-08-14 20:20:53 +03:00
parent 221d42c172 877cadecae
commit 53f20fe417
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zabbix/datasource.js
View File

@@ -102,10 +102,10 @@ function (angular, _, kbn) {
} }
// Replace templated variables // Replace templated variables
var groupname = templateSrv.replace(target.group.name); var groupname = templateSrv.replace(target.group.name, options.scopedVars);
var hostname = templateSrv.replace(target.host.name); var hostname = templateSrv.replace(target.host.name, options.scopedVars);
var appname = templateSrv.replace(target.application.name); var appname = templateSrv.replace(target.application.name, options.scopedVars);
var itemname = templateSrv.replace(target.item.name); var itemname = templateSrv.replace(target.item.name, options.scopedVars);
// Extract zabbix groups, hosts and apps from string: // Extract zabbix groups, hosts and apps from string:
// "{host1,host2,...,hostN}" --> [host1, host2, ..., hostN] // "{host1,host2,...,hostN}" --> [host1, host2, ..., hostN]
@@ -129,7 +129,7 @@ function (angular, _, kbn) {
if (target.hostFilter && _.every(items, _.identity.hosts)) { if (target.hostFilter && _.every(items, _.identity.hosts)) {
// Use templated variables in filter // Use templated variables in filter
var host_pattern = new RegExp(templateSrv.replace(target.hostFilter)); var host_pattern = new RegExp(templateSrv.replace(target.hostFilter, options.scopedVars));
items = _.filter(items, function (item) { items = _.filter(items, function (item) {
return _.some(item.hosts, function (host) { return _.some(item.hosts, function (host) {
return host_pattern.test(host.name); return host_pattern.test(host.name);
@@ -144,7 +144,7 @@ function (angular, _, kbn) {
if (target.itemFilter) { if (target.itemFilter) {
// Use templated variables in filter // Use templated variables in filter
var item_pattern = new RegExp(templateSrv.replace(target.itemFilter)); var item_pattern = new RegExp(templateSrv.replace(target.itemFilter, options.scopedVars));
return _.filter(items, function (item) { return _.filter(items, function (item) {
return item_pattern.test(zabbixHelperSrv.expandItemName(item)); return item_pattern.test(zabbixHelperSrv.expandItemName(item));
}); });
@@ -171,7 +171,7 @@ function (angular, _, kbn) {
items = _.flatten(items); items = _.flatten(items);
// Use alias only for single metric, otherwise use item names // Use alias only for single metric, otherwise use item names
var alias = target.item.name === 'All' || itemnames.length > 1 ? undefined : templateSrv.replace(target.alias); var alias = target.item.name === 'All' || itemnames.length > 1 ? undefined : templateSrv.replace(target.alias, options.scopedVars);
var history; var history;
var handleFunction; var handleFunction;

2
zabbix/partials/config.html
View File

@@ -42,7 +42,7 @@
</li> </li>
<li ng-if="current.jsonData.trends"> <li ng-if="current.jsonData.trends">
<input type="text" class="tight-form-input input-small" <input type="text" class="tight-form-input input-small"
ng-model='current.basicAuthUser' ng-model='current.jsonData.trendsFrom'
placeholder="7d"> placeholder="7d">
</li> </li>
</ul> </ul>