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

Merge branch 'app-zabbix' into develop

Browse Source 
Conflicts:
	src/datasource-zabbix/plugin.json
	src/panel-triggers/plugin.json
This commit is contained in:
Alexander Zobnin
2016-03-31 19:24:18 +03:00
parent c5a421c933 99e6a9ba6c
commit f0f47a77ab
8 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@ export class ZabbixQueryController extends QueryCtrl {
}
// Set templateUrl as static property
ZabbixQueryController.templateUrl = 'partials/query.editor.html';
ZabbixQueryController.templateUrl = 'datasource-zabbix/partials/query.editor.html';
// Get list of metric names for bs-typeahead directive
function getMetricNames(scope, metricList) {