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

Added template variables support for Triggers panel. Fixed panel refreshing.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-03-27 22:10:35 +03:00
parent be79dfd448
commit c00132ff04
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
import _ from 'lodash'; import _ from 'lodash';
import moment from 'moment'; import moment from 'moment';
import {PanelCtrl} from 'app/plugins/sdk'; import {MetricsPanelCtrl} from 'app/plugins/sdk';
import {triggerPanelEditor} from './editor'; import {triggerPanelEditor} from './editor';
import './css/panel_triggers.css!'; import './css/panel_triggers.css!';
@@ -55,12 +55,13 @@ var triggerStatusMap = {
var defaultTimeFormat = "DD MMM YYYY HH:mm:ss"; var defaultTimeFormat = "DD MMM YYYY HH:mm:ss";
class TriggerPanelCtrl extends PanelCtrl { class TriggerPanelCtrl extends MetricsPanelCtrl {
/** @ngInject */ /** @ngInject */
constructor($scope, $injector, $q, $element, datasourceSrv) { constructor($scope, $injector, $q, $element, datasourceSrv, templateSrv) {
super($scope, $injector); super($scope, $injector);
this.datasourceSrv = datasourceSrv; this.datasourceSrv = datasourceSrv;
this.templateSrv = templateSrv;
this.triggerStatusMap = triggerStatusMap; this.triggerStatusMap = triggerStatusMap;
this.defaultTimeFormat = defaultTimeFormat; this.defaultTimeFormat = defaultTimeFormat;
@@ -73,9 +74,12 @@ class TriggerPanelCtrl extends PanelCtrl {
// Add panel editor // Add panel editor
initEditMode() { initEditMode() {
super.initEditMode(); //super.initEditMode();
this.editorTabs = [];
this.addEditorTab('General', 'public/app/partials/panelgeneral.html');
this.icon = "fa fa-lightbulb-o"; this.icon = "fa fa-lightbulb-o";
this.addEditorTab('Options', triggerPanelEditor, 2); this.addEditorTab('Options', triggerPanelEditor, 2);
this.editModeInitiated = true;
} }
refreshData() { refreshData() {
@@ -85,11 +89,12 @@ class TriggerPanelCtrl extends PanelCtrl {
return this.datasourceSrv.get(this.panel.datasource).then(datasource => { return this.datasourceSrv.get(this.panel.datasource).then(datasource => {
var zabbix = datasource.zabbixAPI; var zabbix = datasource.zabbixAPI;
var queryProcessor = datasource.queryProcessor; var queryProcessor = datasource.queryProcessor;
var triggerFilter = self.panel.triggers;
var showEvents = self.panel.showEvents.value; var showEvents = self.panel.showEvents.value;
var buildQuery = queryProcessor.buildTriggerQuery(triggerFilter.group.filter, var triggerFilter = self.panel.triggers;
triggerFilter.host.filter, var groupFilter = self.templateSrv.replace(triggerFilter.group.filter);
triggerFilter.application.filter); var hostFilter = self.templateSrv.replace(triggerFilter.host.filter);
var appFilter = self.templateSrv.replace(triggerFilter.application.filter);
var buildQuery = queryProcessor.buildTriggerQuery(groupFilter, hostFilter, appFilter);
return buildQuery.then(query => { return buildQuery.then(query => {
return zabbix.getTriggers(query.groupids, return zabbix.getTriggers(query.groupids,
query.hostids, query.hostids,