github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-02-13 20:59:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1147 from prymitive/ack-author

Browse Source 
fix(ui): prefer author from headers when acking alerts
This commit is contained in:
Łukasz Mierzwa
2019-11-11 18:51:42 +00:00
committed by GitHub
parent 4d2e25e68f 7ade445cf0
commit f0430c42b7
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/Components/AlertAck/index.js
View File

@@ -207,7 +207,9 @@ const AlertAck = observer(
toJS(group),
toJS(clusterMembers),
toJS(alertStore.settings.values.alertAcknowledgement.durationSeconds),
silenceFormStore.data.author !== ""
alertStore.settings.values.silenceForm.author !== ""
? alertStore.settings.values.silenceForm.author
: silenceFormStore.data.author !== ""
? toJS(silenceFormStore.data.author)
: toJS(alertStore.settings.values.alertAcknowledgement.author),
toJS(alertStore.settings.values.alertAcknowledgement.commentPrefix)

59
ui/src/Components/AlertAck/index.test.js
View File

@@ -200,6 +200,65 @@ describe("<AlertAck />", () => {
});
});
it("uses author from alertStore if present", () => {
alertStore.settings.values.silenceForm.author = "john@example.com";
alertStore.settings.values.alertAcknowledgement.durationSeconds = 222;
alertStore.settings.values.alertAcknowledgement.author = "me";
alertStore.settings.values.alertAcknowledgement.commentPrefix = "FOO:";
MountAndClick();
expect(JSON.parse(fetch.mock.calls[0][1].body)).toEqual({
comment:
"FOO: This alert was acknowledged using karma on Tue Feb 01 2000 00:00:00 GMT+0000",
createdBy: "john@example.com",
endsAt: "2000-02-01T00:03:42.000Z",
matchers: [
{ isRegex: false, name: "alertname", value: "Fake Alert" },
{ isRegex: true, name: "foo", value: "(bar|baz)" }
],
startsAt: "2000-02-01T00:00:00.000Z"
});
});
it("uses author from silenceFormStore if alertStore is empty", () => {
alertStore.settings.values.silenceForm.author = "";
alertStore.settings.values.alertAcknowledgement.durationSeconds = 222;
alertStore.settings.values.alertAcknowledgement.author = "me";
alertStore.settings.values.alertAcknowledgement.commentPrefix = "FOO:";
silenceFormStore.data.author = "bob@example.com";
MountAndClick();
expect(JSON.parse(fetch.mock.calls[0][1].body)).toEqual({
comment:
"FOO: This alert was acknowledged using karma on Tue Feb 01 2000 00:00:00 GMT+0000",
createdBy: "bob@example.com",
endsAt: "2000-02-01T00:03:42.000Z",
matchers: [
{ isRegex: false, name: "alertname", value: "Fake Alert" },
{ isRegex: true, name: "foo", value: "(bar|baz)" }
],
startsAt: "2000-02-01T00:00:00.000Z"
});
});
it("uses default author as fallback", () => {
alertStore.settings.values.silenceForm.author = "";
alertStore.settings.values.alertAcknowledgement.durationSeconds = 222;
alertStore.settings.values.alertAcknowledgement.author = "me";
alertStore.settings.values.alertAcknowledgement.commentPrefix = "FOO:";
silenceFormStore.data.author = "";
MountAndClick();
expect(JSON.parse(fetch.mock.calls[0][1].body)).toEqual({
comment:
"FOO: This alert was acknowledged using karma on Tue Feb 01 2000 00:00:00 GMT+0000",
createdBy: "me",
endsAt: "2000-02-01T00:03:42.000Z",
matchers: [
{ isRegex: false, name: "alertname", value: "Fake Alert" },
{ isRegex: true, name: "foo", value: "(bar|baz)" }
],
startsAt: "2000-02-01T00:00:00.000Z"
});
});
it("[v1] sends POST request to /api/v1/silences", () => {
MountAndClick();
const uri = fetch.mock.calls[0][0];