github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-05-07 03:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): use publicURI for alertmanager requests in the silence form

Browse Source
This commit is contained in:
Łukasz Mierzwa
2018-09-11 21:03:47 +01:00
parent 80e7caf627
commit 756539d744
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/Components/SilenceModal/AlertManagerInput.js
View File

@@ -12,7 +12,7 @@ import { ValidationError } from "Components/MultiSelect/ValidationError";
const AlertmanagerInstancesToOptions = instances =>
instances.map(i => ({
label: i.name,
value: i.uri
value: i.publicURI
}));
const AlertManagerInput = observer(

23
ui/src/Components/SilenceModal/AlertManagerInput.test.js
View File

@@ -19,9 +19,24 @@ const AlertmanagerOption = index => ({
beforeEach(() => {
alertStore = new AlertStore([]);
alertStore.data.upstreams.instances = [
{ name: "am1", uri: "http://am1.example.com", error: "" },
{ name: "am2", uri: "http://am2.example.com", error: "" },
{ name: "am3", uri: "http://am3.example.com", error: "" }
{
name: "am1",
uri: "http://am1.example.com",
publicURI: "http://am1.example.com",
error: ""
},
{
name: "am2",
uri: "http://am2.example.com",
publicURI: "http://am2.example.com",
error: ""
},
{
name: "am3",
uri: "http://am3.example.com",
publicURI: "http://am3.example.com",
error: ""
}
];
silenceFormStore = new SilenceFormStore();
});
@@ -123,7 +138,7 @@ describe("<AlertManagerInput />", () => {
const tree = ShallowAlertManagerInput();
alertStore.data.upstreams.instances[0] = {
name: "am1",
uri: "http://am1.example.com/new",
publicURI: "http://am1.example.com/new",
error: ""
};
// force update since this is where the mismatch check lives