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

Add template variables to dropdown metric list, closes #310

Browse Source
This commit is contained in:
Alexander Zobnin
2017-02-11 21:31:08 +03:00
parent 48018744bd
commit 77108fa05a
4 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/datasource-zabbix/query.controller.js
View File

@@ -28,10 +28,10 @@ export class ZabbixQueryController extends QueryCtrl {
};
// Map functions for bs-typeahead
this.getGroupNames = _.partial(getMetricNames, this, 'groupList');
this.getHostNames = _.partial(getMetricNames, this, 'hostList');
this.getApplicationNames = _.partial(getMetricNames, this, 'appList');
this.getItemNames = _.partial(getMetricNames, this, 'itemList');
this.getGroupNames = _.bind(this.getMetricNames, this, 'groupList');
this.getHostNames = _.bind(this.getMetricNames, this, 'hostList');
this.getApplicationNames = _.bind(this.getMetricNames, this, 'appList');
this.getItemNames = _.bind(this.getMetricNames, this, 'itemList');
// Update metric suggestion when template variable was changed
$rootScope.$on('template-variable-value-updated', () => this.onVariableChange());
@@ -110,6 +110,18 @@ export class ZabbixQueryController extends QueryCtrl {
]);
}
// Get list of metric names for bs-typeahead directive
getMetricNames(metricList) {
let metrics = _.uniq(_.map(this.metric[metricList], 'name'));
// Add template variables
_.forEach(this.templateSrv.variables, variable => {
metrics.unshift('$' + variable.name);
});
return metrics;
}
suggestGroups() {
return this.zabbix.getAllGroups()
.then(groups => {
@@ -302,8 +314,3 @@ export class ZabbixQueryController extends QueryCtrl {
// Set templateUrl as static property
ZabbixQueryController.templateUrl = 'datasource-zabbix/partials/query.editor.html';
// Get list of metric names for bs-typeahead directive
function getMetricNames(scope, metricList) {
return _.uniq(_.map(scope.metric[metricList], 'name'));
}