{{ ds }}
@@ -53,35 +53,35 @@
diff --git a/dist/panel-triggers/triggers_tab.js b/dist/panel-triggers/triggers_tab.js
index 0221548..b1f8846 100644
--- a/dist/panel-triggers/triggers_tab.js
+++ b/dist/panel-triggers/triggers_tab.js
@@ -125,7 +125,7 @@ System.register(['lodash', '../datasource-zabbix/utils', './triggers_panel_ctrl'
_.each(this.panel.datasources, function (ds) {
if (!_this2.panel.targets[ds]) {
- _this2.panel.targets[ds] = DEFAULT_TARGET;
+ _this2.panel.targets[ds] = _.cloneDeep(DEFAULT_TARGET);
}
});
this.parseTarget();
diff --git a/dist/panel-triggers/triggers_tab.js.map b/dist/panel-triggers/triggers_tab.js.map
index cbe6e1d..5392f92 100644
--- a/dist/panel-triggers/triggers_tab.js.map
+++ b/dist/panel-triggers/triggers_tab.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../src/panel-triggers/triggers_tab.js"],"names":["triggerPanelTriggersTab","restrict","scope","templateUrl","controller","TriggersTabCtrl","_","utils","DEFAULT_TARGET","$scope","$rootScope","uiSegmentSrv","templateSrv","editor","panelCtrl","ctrl","panel","datasources","scopeDefaults","getGroupNames","getHostNames","getApplicationNames","oldTarget","cloneDeep","targets","defaultsDeep","initDatasources","refresh","then","each","datasource","bindSuggestionFunctions","ds","name","bind","suggestGroups","suggestHosts","suggestApps","query","callback","zabbix","getAllGroups","map","groups","groupFilter","replaceTemplateVars","group","filter","getAllHosts","hosts","hostFilter","host","getAllApps","apps","parseTarget","newTarget","isEqual","str","isRegex","isTemplateVariable","variables"],"mappings":"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","file":"triggers_tab.js","sourcesContent":["import _ from 'lodash';\nimport * as utils from '../datasource-zabbix/utils';\nimport {DEFAULT_TARGET} from './triggers_panel_ctrl';\n\nclass TriggersTabCtrl {\n\n /** @ngInject */\n constructor($scope, $rootScope, uiSegmentSrv, templateSrv) {\n $scope.editor = this;\n this.panelCtrl = $scope.ctrl;\n this.panel = this.panelCtrl.panel;\n this.templateSrv = templateSrv;\n this.datasources = this.panelCtrl.datasources;\n\n // Load scope defaults\n var scopeDefaults = {\n getGroupNames: {},\n getHostNames: {},\n getApplicationNames: {},\n oldTarget: _.cloneDeep(this.panel.targets)\n };\n _.defaultsDeep(this, scopeDefaults);\n\n this.initDatasources();\n this.panelCtrl.refresh();\n }\n\n initDatasources() {\n return this.panelCtrl.initDatasources()\n .then((datasources) => {\n _.each(datasources, (datasource) => {\n this.bindSuggestionFunctions(datasource);\n });\n });\n }\n\n bindSuggestionFunctions(datasource) {\n // Map functions for bs-typeahead\n let ds = datasource.name;\n this.getGroupNames[ds] = _.bind(this.suggestGroups, this, datasource);\n this.getHostNames[ds] = _.bind(this.suggestHosts, this, datasource);\n this.getApplicationNames[ds] = _.bind(this.suggestApps, this, datasource);\n }\n\n suggestGroups(datasource, query, callback) {\n return datasource.zabbix.getAllGroups()\n .then(groups => {\n return _.map(groups, 'name');\n })\n .then(callback);\n }\n\n suggestHosts(datasource, query, callback) {\n let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);\n return datasource.zabbix.getAllHosts(groupFilter)\n .then(hosts => {\n return _.map(hosts, 'name');\n })\n .then(callback);\n }\n\n suggestApps(datasource, query, callback) {\n let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);\n let hostFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].host.filter);\n return datasource.zabbix.getAllApps(groupFilter, hostFilter)\n .then(apps => {\n return _.map(apps, 'name');\n })\n .then(callback);\n }\n\n datasourcesChanged() {\n _.each(this.panel.datasources, (ds) => {\n if (!this.panel.targets[ds]) {\n this.panel.targets[ds] = DEFAULT_TARGET;\n }\n });\n this.parseTarget();\n }\n\n parseTarget() {\n this.initDatasources()\n .then(() => {\n var newTarget = _.cloneDeep(this.panel.targets);\n if (!_.isEqual(this.oldTarget, newTarget)) {\n this.oldTarget = newTarget;\n }\n this.panelCtrl.refresh();\n });\n }\n\n isRegex(str) {\n return utils.isRegex(str);\n }\n\n isVariable(str) {\n return utils.isTemplateVariable(str, this.templateSrv.variables);\n }\n}\n\nexport function triggerPanelTriggersTab() {\n return {\n restrict: 'E',\n scope: true,\n templateUrl: 'public/plugins/alexanderzobnin-zabbix-app/panel-triggers/partials/triggers_tab.html',\n controller: TriggersTabCtrl,\n };\n}\n"]}
\ No newline at end of file
+{"version":3,"sources":["../../src/panel-triggers/triggers_tab.js"],"names":["triggerPanelTriggersTab","restrict","scope","templateUrl","controller","TriggersTabCtrl","_","utils","DEFAULT_TARGET","$scope","$rootScope","uiSegmentSrv","templateSrv","editor","panelCtrl","ctrl","panel","datasources","scopeDefaults","getGroupNames","getHostNames","getApplicationNames","oldTarget","cloneDeep","targets","defaultsDeep","initDatasources","refresh","then","each","datasource","bindSuggestionFunctions","ds","name","bind","suggestGroups","suggestHosts","suggestApps","query","callback","zabbix","getAllGroups","map","groups","groupFilter","replaceTemplateVars","group","filter","getAllHosts","hosts","hostFilter","host","getAllApps","apps","parseTarget","newTarget","isEqual","str","isRegex","isTemplateVariable","variables"],"mappings":"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","file":"triggers_tab.js","sourcesContent":["import _ from 'lodash';\nimport * as utils from '../datasource-zabbix/utils';\nimport {DEFAULT_TARGET} from './triggers_panel_ctrl';\n\nclass TriggersTabCtrl {\n\n /** @ngInject */\n constructor($scope, $rootScope, uiSegmentSrv, templateSrv) {\n $scope.editor = this;\n this.panelCtrl = $scope.ctrl;\n this.panel = this.panelCtrl.panel;\n this.templateSrv = templateSrv;\n this.datasources = this.panelCtrl.datasources;\n\n // Load scope defaults\n var scopeDefaults = {\n getGroupNames: {},\n getHostNames: {},\n getApplicationNames: {},\n oldTarget: _.cloneDeep(this.panel.targets)\n };\n _.defaultsDeep(this, scopeDefaults);\n\n this.initDatasources();\n this.panelCtrl.refresh();\n }\n\n initDatasources() {\n return this.panelCtrl.initDatasources()\n .then((datasources) => {\n _.each(datasources, (datasource) => {\n this.bindSuggestionFunctions(datasource);\n });\n });\n }\n\n bindSuggestionFunctions(datasource) {\n // Map functions for bs-typeahead\n let ds = datasource.name;\n this.getGroupNames[ds] = _.bind(this.suggestGroups, this, datasource);\n this.getHostNames[ds] = _.bind(this.suggestHosts, this, datasource);\n this.getApplicationNames[ds] = _.bind(this.suggestApps, this, datasource);\n }\n\n suggestGroups(datasource, query, callback) {\n return datasource.zabbix.getAllGroups()\n .then(groups => {\n return _.map(groups, 'name');\n })\n .then(callback);\n }\n\n suggestHosts(datasource, query, callback) {\n let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);\n return datasource.zabbix.getAllHosts(groupFilter)\n .then(hosts => {\n return _.map(hosts, 'name');\n })\n .then(callback);\n }\n\n suggestApps(datasource, query, callback) {\n let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);\n let hostFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].host.filter);\n return datasource.zabbix.getAllApps(groupFilter, hostFilter)\n .then(apps => {\n return _.map(apps, 'name');\n })\n .then(callback);\n }\n\n datasourcesChanged() {\n _.each(this.panel.datasources, (ds) => {\n if (!this.panel.targets[ds]) {\n this.panel.targets[ds] = _.cloneDeep(DEFAULT_TARGET);\n }\n });\n this.parseTarget();\n }\n\n parseTarget() {\n this.initDatasources()\n .then(() => {\n var newTarget = _.cloneDeep(this.panel.targets);\n if (!_.isEqual(this.oldTarget, newTarget)) {\n this.oldTarget = newTarget;\n }\n this.panelCtrl.refresh();\n });\n }\n\n isRegex(str) {\n return utils.isRegex(str);\n }\n\n isVariable(str) {\n return utils.isTemplateVariable(str, this.templateSrv.variables);\n }\n}\n\nexport function triggerPanelTriggersTab() {\n return {\n restrict: 'E',\n scope: true,\n templateUrl: 'public/plugins/alexanderzobnin-zabbix-app/panel-triggers/partials/triggers_tab.html',\n controller: TriggersTabCtrl,\n };\n}\n"]}
\ No newline at end of file
diff --git a/src/panel-triggers/partials/triggers_tab.html b/src/panel-triggers/partials/triggers_tab.html
index 1b0577d..8af4f09 100644
--- a/src/panel-triggers/partials/triggers_tab.html
+++ b/src/panel-triggers/partials/triggers_tab.html
@@ -6,7 +6,7 @@