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

Fixed templates paths.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-03-29 10:04:13 +03:00
parent 6f2db1c2fb
commit 99e6a9ba6c
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/datasource-zabbix/module.js
View File

@@ -2,13 +2,13 @@ import {ZabbixAPIDatasource} from './datasource';
import {ZabbixQueryController} from './query.controller'; import {ZabbixQueryController} from './query.controller';
class ZabbixConfigController {} class ZabbixConfigController {}
ZabbixConfigController.templateUrl = 'partials/config.html'; ZabbixConfigController.templateUrl = 'datasource-zabbix/partials/config.html';
class ZabbixQueryOptionsController {} class ZabbixQueryOptionsController {}
ZabbixQueryOptionsController.templateUrl = 'partials/query.options.html'; ZabbixQueryOptionsController.templateUrl = 'datasource-zabbix/partials/query.options.html';
class ZabbixAnnotationsQueryController {} class ZabbixAnnotationsQueryController {}
ZabbixAnnotationsQueryController.templateUrl = 'partials/annotations.editor.html'; ZabbixAnnotationsQueryController.templateUrl = 'datasource-zabbix/partials/annotations.editor.html';
export { export {
ZabbixAPIDatasource as Datasource, ZabbixAPIDatasource as Datasource,

4
src/datasource-zabbix/plugin.json
View File

@@ -1,7 +1,7 @@
{ {
"type": "datasource", "type": "datasource",
"name": "Zabbix Datasource", "name": "Zabbix",
"id": "zabbix", "id": "zabbix-datasource",
"metrics": true, "metrics": true,
"annotations": true, "annotations": true,

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

@@ -270,7 +270,7 @@ export class ZabbixQueryController extends QueryCtrl {
} }
// Set templateUrl as static property // 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 // Get list of metric names for bs-typeahead directive
function getMetricNames(scope, metricList) { function getMetricNames(scope, metricList) {

6
src/panel-triggers/editor.js
View File

@@ -150,7 +150,7 @@ class TriggerPanelEditorCtrl{
this.popoverSrv.show({ this.popoverSrv.show({
element: el, element: el,
placement: 'top', placement: 'top',
templateUrl: 'public/plugins/triggers/trigger.colorpicker.html', templateUrl: 'public/plugins/zabbix-triggers-panel/trigger.colorpicker.html',
scope: popoverScope scope: popoverScope
}); });
} }
@@ -167,7 +167,7 @@ class TriggerPanelEditorCtrl{
this.popoverSrv.show({ this.popoverSrv.show({
element: el, element: el,
placement: 'top', placement: 'top',
templateUrl: 'public/plugins/triggers/trigger.colorpicker.html', templateUrl: 'public/plugins/zabbix-triggers-panel/trigger.colorpicker.html',
scope: popoverScope scope: popoverScope
}); });
} }
@@ -192,7 +192,7 @@ export function triggerPanelEditor() {
return { return {
restrict: 'E', restrict: 'E',
scope: true, scope: true,
templateUrl: 'public/plugins/triggers/editor.html', templateUrl: 'public/plugins/zabbix-triggers-panel/editor.html',
controller: TriggerPanelEditorCtrl, controller: TriggerPanelEditorCtrl,
}; };
} }

2
src/panel-triggers/module.js
View File

@@ -202,7 +202,7 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
} }
} }
TriggerPanelCtrl.templateUrl = 'module.html'; TriggerPanelCtrl.templateUrl = 'panel-triggers/module.html';
function filterTriggers(triggers, triggerFilter) { function filterTriggers(triggers, triggerFilter) {
if (isRegex(triggerFilter)) { if (isRegex(triggerFilter)) {

2
src/panel-triggers/plugin.json
View File

@@ -1,7 +1,7 @@
{ {
"type": "panel", "type": "panel",
"name": "Zabbix Triggers", "name": "Zabbix Triggers",
"id": "triggers", "id": "zabbix-triggers-panel",
"info": { "info": {
"author": { "author": {