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

triggers panel multi-ds supoort: refactor

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-02 22:32:50 +03:00
parent 51c2185cde
commit e0064da209
11 changed files with 279 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/panel-triggers/migrations.js
View File

@@ -0,0 +1,15 @@
export function migratePanelSchema(panel) {
const schemaVersion = getSchemaVersion(panel);
switch (schemaVersion) {
case 1:
panel.datasources = [panel.datasource];
panel.targets[panel.datasources[0]] = panel.triggers;
break;
}
return panel;
}
function getSchemaVersion(panel) {
return panel.schemaVersion || 1;
}

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

@@ -19,6 +19,7 @@ import * as utils from '../datasource-zabbix/utils';
import {PanelCtrl} from 'app/plugins/sdk';
import {triggerPanelOptionsTab} from './options_tab';
import {triggerPanelTriggersTab} from './triggers_tab';
import {migratePanelSchema} from './migrations';
import './ack-tooltip.directive';
loadPluginCss({
@@ -26,7 +27,16 @@ loadPluginCss({
light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css'
});
var defaultSeverity = [
const ZABBIX_DS_ID = 'alexanderzobnin-zabbix-datasource';
export const DEFAULT_TARGET = {
group: {filter: ""},
host: {filter: ""},
application: {filter: ""},
trigger: {filter: ""}
};
const defaultSeverity = [
{ priority: 0, severity: 'Not classified', color: '#B7DBAB', show: true },
{ priority: 1, severity: 'Information', color: '#82B5D8', show: true },
{ priority: 2, severity: 'Warning', color: '#E5AC0E', show: true },
@@ -35,7 +45,7 @@ var defaultSeverity = [
{ priority: 5, severity: 'Disaster', color: '#890F02', show: true }
];
var panelDefaults = {
const panelDefaults = {
datasources: [],
triggers: {
group: {filter: ""},
@@ -64,12 +74,12 @@ var panelDefaults = {
schemaVersion: 2
};
var triggerStatusMap = {
const triggerStatusMap = {
'0': 'OK',
'1': 'Problem'
};
var defaultTimeFormat = "DD MMM YYYY HH:mm:ss";
const defaultTimeFormat = "DD MMM YYYY HH:mm:ss";
class TriggerPanelCtrl extends PanelCtrl {
@@ -81,6 +91,7 @@ class TriggerPanelCtrl extends PanelCtrl {
this.contextSrv = contextSrv;
this.dashboardSrv = dashboardSrv;
this.editorTabIndex = 1;
this.triggerStatusMap = triggerStatusMap;
this.defaultTimeFormat = defaultTimeFormat;
this.pageIndex = 0;
@@ -88,12 +99,16 @@ class TriggerPanelCtrl extends PanelCtrl {
this.currentTriggersPage = [];
this.datasources = {};
this.migratePanelConfig();
// Load panel defaults
// _.cloneDeep() need for prevent changing shared defaultSeverity.
// Load object "by value" istead "by reference".
_.defaults(this.panel, _.cloneDeep(panelDefaults));
this.panel = migratePanelSchema(this.panel);
this.available_datasources = _.map(this.getZabbixDataSources(), 'name');
if (this.panel.datasources.length === 0) {
this.panel.datasources.push(this.available_datasources[0]);
}
if (_.isEmpty(this.panel.targets)) {
this.panel.targets[this.panel.datasources[0]] = DEFAULT_TARGET;
}
this.initDatasources();
this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
@@ -101,19 +116,34 @@ class TriggerPanelCtrl extends PanelCtrl {
}
initDatasources() {
_.each(this.panel.datasources, (ds) => {
let promises = _.map(this.panel.datasources, (ds) => {
// Load datasource
this.datasourceSrv.get(ds)
return this.datasourceSrv.get(ds)
.then(datasource => {
this.datasources[ds] = datasource;
this.datasources[ds].queryBuilder = datasource.queryBuilder;
return datasource;
});
});
return Promise.all(promises);
}
getZabbixDataSources() {
return _.filter(this.datasourceSrv.getMetricSources(), datasource => {
return datasource.meta.id === ZABBIX_DS_ID && datasource.value;
});
}
onInitEditMode() {
this.addEditorTab('Triggers', triggerPanelTriggersTab, 2);
this.addEditorTab('Options', triggerPanelOptionsTab, 3);
this.addEditorTab('Triggers', triggerPanelTriggersTab, 1);
this.addEditorTab('Options', triggerPanelOptionsTab, 2);
}
setTimeQueryStart() {
this.timing.queryStart = new Date().getTime();
}
setTimeQueryEnd() {
this.timing.queryEnd = new Date().getTime();
}
onRefresh() {
@@ -123,41 +153,48 @@ class TriggerPanelCtrl extends PanelCtrl {
// clear loading/error state
delete this.error;
this.loading = true;
this.setTimeQueryStart();
return this.refreshData()
return this.getTriggers()
.then(triggerList => {
// Limit triggers number
this.triggerList = triggerList.slice(0, this.panel.limit);
this.getCurrentTriggersPage();
// Notify panel that request is finished
this.loading = false;
this.setTimeQueryEnd();
// Limit triggers number
this.triggerList = triggerList.slice(0, this.panel.limit);
this.getCurrentTriggersPage();
this.render(this.triggerList);
})
.catch(err => {
// if cancelled keep loading set to true
if (err.cancelled) {
console.log('Panel request cancelled', err);
return;
}
this.loading = false;
this.error = err.message || "Request Error";
if (err.data) {
if (err.data.message) {
this.error = err.data.message;
}
if (err.data.error) {
this.error = err.data.error;
}
}
this.events.emit('data-error', err);
console.log('Panel data error:', err);
});
}
refreshData() {
return this.getTriggers();
}
migratePanelConfig() {
if (!this.panel.datasources || (this.panel.datasource && !this.panel.datasources.length)) {
this.panel.datasources = [this.panel.datasource];
this.panel.targets[this.panel.datasource] = this.panel.triggers;
} else if (_.isEmpty(this.panel.targets)) {
this.panel.targets[this.panel.datasources[0]] = this.panel.triggers;
}
}
getTriggers() {
let promises = _.map(this.panel.datasources, (ds) => {
return this.datasourceSrv.get(ds)
.then(datasource => {
var zabbix = datasource.zabbix;
this.zabbix = zabbix;
this.datasource = datasource;
var showEvents = this.panel.showEvents.value;
var triggerFilter = this.panel.targets[ds];
var hideHostsInMaintenance = this.panel.hideHostsInMaintenance;
@@ -182,6 +219,9 @@ class TriggerPanelCtrl extends PanelCtrl {
return Promise.all(promises)
.then(results => _.flatten(results))
.then((triggers) => {
return this.sortTriggers(triggers);
})
.then(triggers => {
return _.map(triggers, this.formatTrigger.bind(this));
});
@@ -249,13 +289,15 @@ class TriggerPanelCtrl extends PanelCtrl {
return this.panel.triggerSeverity[trigger.priority].show;
});
// Sort triggers
return triggerList;
}
sortTriggers(triggerList) {
if (this.panel.sortTriggersBy.value === 'priority') {
triggerList = _.sortBy(triggerList, 'priority').reverse();
} else {
triggerList = _.sortBy(triggerList, 'lastchangeUnix').reverse();
}
return triggerList;
}
@@ -341,8 +383,9 @@ class TriggerPanelCtrl extends PanelCtrl {
let endPos = Math.min(startPos + pageSize, ctrl.triggerList.length);
ctrl.currentTriggersPage = ctrl.triggerList.slice(startPos, endPos);
scope.$apply();
renderPanel();
scope.$apply(() => {
renderPanel();
});
}
function appendPaginationControls(footerElem) {
@@ -378,6 +421,7 @@ class TriggerPanelCtrl extends PanelCtrl {
appendPaginationControls(footerElem);
rootElem.css({'max-height': panel.scroll ? getTableHeight() : '' });
ctrl.renderingCompleted();
}
elem.on('click', '.triggers-panel-page-link', switchPage);
@@ -390,9 +434,10 @@ class TriggerPanelCtrl extends PanelCtrl {
ctrl.events.on('render', (renderData) => {
data = renderData || data;
if (data) {
renderPanel();
scope.$apply(() => {
renderPanel();
});
}
ctrl.renderingCompleted();
});
}
}

4
src/panel-triggers/partials/triggers_tab.html
View File

@@ -2,12 +2,12 @@
<div class="section gf-form-group">
<div class="gf-form-inline">
<div class="gf-form">
<label class="gf-form-label width-9">Data sources</label>
<label class="gf-form-label width-7">Data sources</label>
</div>
<div class="gf-form">
<datasource-selector
datasources="editor.panel.datasources"
options="editor.available_datasources"
options="editor.panelCtrl.available_datasources"
on-change="editor.datasourcesChanged()">
</datasource-selector>
</div>

76
src/panel-triggers/triggers_tab.js
View File

@@ -2,28 +2,20 @@ import _ from 'lodash';
import * as utils from '../datasource-zabbix/utils';
import './datasource-selector.directive';
import '../datasource-zabbix/css/query-editor.css!';
const ZABBIX_DS_ID = 'alexanderzobnin-zabbix-datasource';
const DEFAULT_TARGET = {
group: {filter: ""},
host: {filter: ""},
application: {filter: ""},
trigger: {filter: ""}
};
import {DEFAULT_TARGET} from './module';
class TriggersTabCtrl {
/** @ngInject */
constructor($scope, $rootScope, uiSegmentSrv, datasourceSrv, templateSrv) {
constructor($scope, $rootScope, uiSegmentSrv, templateSrv) {
$scope.editor = this;
this.panelCtrl = $scope.ctrl;
this.panel = this.panelCtrl.panel;
this.datasourceSrv = datasourceSrv;
this.templateSrv = templateSrv;
this.datasources = this.panelCtrl.datasources;
// Load scope defaults
var scopeDefaults = {
datasources: {},
getGroupNames: {},
getHostNames: {},
getApplicationNames: {},
@@ -31,58 +23,48 @@ class TriggersTabCtrl {
};
_.defaultsDeep(this, scopeDefaults);
this.available_datasources = _.map(this.getZabbixDataSources(), 'name');
if (!this.panel.datasource) {
this.panel.datasource = this.available_datasources[0];
}
this.initDatasources();
this.panelCtrl.refresh();
}
initDatasources() {
_.each(this.panel.datasources, (ds) => {
// Load datasource
this.datasourceSrv.get(ds)
.then(datasource => {
this.panelCtrl.datasources[ds] = datasource;
this.datasources[ds] = datasource;
// Map functions for bs-typeahead
this.getGroupNames[ds] = _.bind(this.suggestGroups, this, datasource);
this.getHostNames[ds] = _.bind(this.suggestHosts, this, datasource);
this.getApplicationNames[ds] = _.bind(this.suggestApps, this, datasource);
return this.panelCtrl.initDatasources()
.then((datasources) => {
_.each(datasources, (datasource) => {
this.bindSuggestionFunctions(datasource);
});
});
}
getZabbixDataSources() {
return _.filter(this.datasourceSrv.getMetricSources(), datasource => {
return datasource.meta.id === ZABBIX_DS_ID && datasource.value;
});
bindSuggestionFunctions(datasource) {
// Map functions for bs-typeahead
let ds = datasource.name;
this.getGroupNames[ds] = _.bind(this.suggestGroups, this, datasource);
this.getHostNames[ds] = _.bind(this.suggestHosts, this, datasource);
this.getApplicationNames[ds] = _.bind(this.suggestApps, this, datasource);
}
suggestGroups(ds, query, callback) {
return ds.zabbix.getAllGroups()
suggestGroups(datasource, query, callback) {
return datasource.zabbix.getAllGroups()
.then(groups => {
return _.map(groups, 'name');
})
.then(callback);
}
suggestHosts(ds, query, callback) {
let groupFilter = ds.replaceTemplateVars(this.panel.targets[ds.name].group.filter);
return ds.zabbix.getAllHosts(groupFilter)
suggestHosts(datasource, query, callback) {
let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);
return datasource.zabbix.getAllHosts(groupFilter)
.then(hosts => {
return _.map(hosts, 'name');
})
.then(callback);
}
suggestApps(ds, query, callback) {
let groupFilter = ds.replaceTemplateVars(this.panel.targets[ds.name].group.filter);
let hostFilter = ds.replaceTemplateVars(this.panel.targets[ds.name].host.filter);
return ds.zabbix.getAllApps(groupFilter, hostFilter)
suggestApps(datasource, query, callback) {
let groupFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].group.filter);
let hostFilter = datasource.replaceTemplateVars(this.panel.targets[datasource.name].host.filter);
return datasource.zabbix.getAllApps(groupFilter, hostFilter)
.then(apps => {
return _.map(apps, 'name');
})
@@ -99,12 +81,14 @@ class TriggersTabCtrl {
}
parseTarget() {
this.initDatasources();
var newTarget = _.cloneDeep(this.panel.targets);
if (!_.isEqual(this.oldTarget, newTarget)) {
this.oldTarget = newTarget;
}
this.panelCtrl.refresh();
this.initDatasources()
.then(() => {
var newTarget = _.cloneDeep(this.panel.targets);
if (!_.isEqual(this.oldTarget, newTarget)) {
this.oldTarget = newTarget;
}
this.panelCtrl.refresh();
});
}
isRegex(str) {