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

triggers panel: fix undefined username in acknowledges #393

Browse Source
This commit is contained in:
Alexander Zobnin
2018-03-23 16:57:51 +03:00
parent 4c3c799458
commit 0c8308a951
5 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dist/panel-triggers/specs/panel_ctrl.spec.js vendored
View File

@@ -187,6 +187,26 @@ describe('TriggerPanelCtrl', () => {
});
});
});
describe('When formatting acknowledges', () => {
beforeEach(() => {
ctx.panelCtrl = createPanelCtrl();
});
it('should build proper user name', () => {
const ack = {
alias: 'alias', name: 'name', surname: 'surname'
};
const formatted = ctx.panelCtrl.formatAcknowledge(ack);
expect(formatted.user).toBe('alias (name surname)');
});
it('should return empty name if it is not defined', () => {
const formatted = ctx.panelCtrl.formatAcknowledge({});
expect(formatted.user).toBe('');
});
});
});
const defaultTrigger = {

27
dist/panel-triggers/triggers_panel_ctrl.js vendored
View File

@@ -367,16 +367,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
});
if (event) {
trigger.acknowledges = _.map(event.acknowledges, function (ack) {
var timestamp = moment.unix(ack.clock);
if (_this6.panel.customLastChangeFormat) {
ack.time = timestamp.format(_this6.panel.lastChangeFormat);
} else {
ack.time = timestamp.format(_this6.defaultTimeFormat);
}
ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';
return ack;
});
trigger.acknowledges = _.map(event.acknowledges, _this6.formatAcknowledge.bind(_this6));
}
if (!trigger.lastEvent.eventid) {
@@ -387,6 +378,22 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
return triggerList;
});
}
}, {
key: 'formatAcknowledge',
value: function formatAcknowledge(ack) {
var timestamp = moment.unix(ack.clock);
if (this.panel.customLastChangeFormat) {
ack.time = timestamp.format(this.panel.lastChangeFormat);
} else {
ack.time = timestamp.format(this.defaultTimeFormat);
}
ack.user = ack.alias || '';
if (ack.name || ack.surname) {
var fullName = (ack.name || '') + ' ' + (ack.surname || '');
ack.user += ' (' + fullName + ')';
}
return ack;
}
}, {
key: 'filterTriggersPre',
value: function filterTriggersPre(triggerList, ds) {

2
dist/panel-triggers/triggers_panel_ctrl.js.map vendored
View File

File diff suppressed because one or more lines are too long

20
src/panel-triggers/specs/panel_ctrl.spec.js
View File

@@ -187,6 +187,26 @@ describe('TriggerPanelCtrl', () => {
});
});
});
describe('When formatting acknowledges', () => {
beforeEach(() => {
ctx.panelCtrl = createPanelCtrl();
});
it('should build proper user name', () => {
const ack = {
alias: 'alias', name: 'name', surname: 'surname'
};
const formatted = ctx.panelCtrl.formatAcknowledge(ack);
expect(formatted.user).toBe('alias (name surname)');
});
it('should return empty name if it is not defined', () => {
const formatted = ctx.panelCtrl.formatAcknowledge({});
expect(formatted.user).toBe('');
});
});
});
const defaultTrigger = {

26
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -243,16 +243,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
});
if (event) {
trigger.acknowledges = _.map(event.acknowledges, ack => {
let timestamp = moment.unix(ack.clock);
if (this.panel.customLastChangeFormat) {
ack.time = timestamp.format(this.panel.lastChangeFormat);
} else {
ack.time = timestamp.format(this.defaultTimeFormat);
}
ack.user = ack.alias + ' (' + ack.name + ' ' + ack.surname + ')';
return ack;
});
trigger.acknowledges = _.map(event.acknowledges, this.formatAcknowledge.bind(this));
}
if (!trigger.lastEvent.eventid) {
@@ -264,6 +255,21 @@ export class TriggerPanelCtrl extends PanelCtrl {
});
}
formatAcknowledge(ack) {
let timestamp = moment.unix(ack.clock);
if (this.panel.customLastChangeFormat) {
ack.time = timestamp.format(this.panel.lastChangeFormat);
} else {
ack.time = timestamp.format(this.defaultTimeFormat);
}
ack.user = ack.alias || '';
if (ack.name || ack.surname) {
const fullName = `${ack.name || ''} ${ack.surname || ''}`;
ack.user += ` (${fullName})`;
}
return ack;
}
filterTriggersPre(triggerList, ds) {
// Filter triggers by description
let triggerFilter = this.panel.targets[ds].trigger.filter;