Skip to content

Commit b7adcea

Browse files
HH-Harryzoltanbedi
andauthored
More info about acknowledges from zabbix (#2071)
This PR is trying to add functionality requested in [#2061 More info about acknowledges from zabbix](#2061) ### Key features - already described in [Enhancement request](#2061) ### How It Works - using bitwise AND checks of [**action** field in zabbix event.acknowledges](https://www.zabbix.com/documentation/current/en/manual/api/reference/event/acknowledge) keywords are added at beginning of ack.message field on problem panel in grafana in fllowing order: - (un)acknowledged - (un)supressed - changed severity ### Testing - No testing was done, sorry --------- Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
1 parent 6a1d3b6 commit b7adcea

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

.changeset/plain-boxes-carry.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'grafana-zabbix': minor
3+
---
4+
5+
Feat: Show details about acknowledge actions

src/panel-triggers/components/Problems/AcknowledgesList.tsx

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function AcknowledgesList(props: AcknowledgesListProps) {
2626
<div className="problem-ack-col problem-ack-message">
2727
{acknowledges.map((ack) => (
2828
<span key={ack.acknowledgeid} className="problem-ack-message">
29-
{ack.message}
29+
{formatAckMessage(ack)}
3030
</span>
3131
))}
3232
</div>
@@ -41,3 +41,27 @@ function formatUserName(ack: ZBXAcknowledge): string {
4141
return `${ack.name} ${ack.surname}`.trim();
4242
}
4343
}
44+
45+
function formatAckMessage(ack: ZBXAcknowledge): string {
46+
let msg = '';
47+
let action = parseInt(ack.action, 10);
48+
49+
if ((action & 2) !== 0) {
50+
msg = msg + '(Acknowledged) ';
51+
} else if ((action & 16) !== 0) {
52+
msg = msg + '(Unacknowledged) ';
53+
}
54+
55+
if ((action & 32) !== 0) {
56+
msg = msg + '(Suppressed) ';
57+
} else if ((action & 64) !== 0) {
58+
msg = msg + '(Unsuppressed) ';
59+
}
60+
61+
if ((action & 8) !== 0) {
62+
msg = msg + '(Changed severity) ';
63+
}
64+
65+
msg = msg + ack.message;
66+
return msg.trim();
67+
}

0 commit comments

Comments
 (0)