diff --git a/ui/src/Components/AlertAck/index.js b/ui/src/Components/AlertAck/index.js index 17a1fbd82..4f6839bc5 100644 --- a/ui/src/Components/AlertAck/index.js +++ b/ui/src/Components/AlertAck/index.js @@ -192,7 +192,7 @@ const AlertAck = observer( .filter(([amName, alertCount]) => alertCount > 0) .map(([amName, _]) => amName); const clusters = Object.entries( - alertStore.data.upstreams.clusters + alertStore.data.clustersWithoutReadOnly ).filter(([clusterName, clusterMembers]) => alertmanagers.some(m => clusterMembers.includes(m)) ); diff --git a/ui/src/Components/AlertAck/index.test.js b/ui/src/Components/AlertAck/index.test.js index 9512f7dd8..98b33af45 100644 --- a/ui/src/Components/AlertAck/index.test.js +++ b/ui/src/Components/AlertAck/index.test.js @@ -35,6 +35,7 @@ beforeEach(() => { name: "default", uri: "http://localhost", publicURI: "http://example.com", + readonly: false, headers: { foo: "bar" }, error: "", version: "0.15.0", @@ -287,6 +288,7 @@ describe("", () => { name: "default", uri: "http://am1.example.com", publicURI: "http://am1.example.com", + readonly: false, headers: {}, error: "", version: "0.15.0", @@ -297,6 +299,7 @@ describe("", () => { name: "fallback", uri: "http://am2.example.com", publicURI: "http://am2.example.com", + readonly: false, headers: {}, error: "", version: "0.15.0", @@ -334,6 +337,7 @@ describe("", () => { name: "default", uri: "http://am1.example.com", publicURI: "http://am1.example.com", + readonly: false, headers: {}, error: "", version: "0.16.2", @@ -344,6 +348,7 @@ describe("", () => { name: "fallback", uri: "http://am2.example.com", publicURI: "http://am2.example.com", + readonly: false, headers: {}, error: "", version: "0.16.2", @@ -381,6 +386,7 @@ describe("", () => { name: "default", uri: "http://am1.example.com", publicURI: "http://am1.example.com", + readonly: false, headers: {}, error: "", version: "0.15.0", diff --git a/ui/src/Components/ManagedSilence/DeleteSilence.js b/ui/src/Components/ManagedSilence/DeleteSilence.js index 20589f1db..ecac4df05 100644 --- a/ui/src/Components/ManagedSilence/DeleteSilence.js +++ b/ui/src/Components/ManagedSilence/DeleteSilence.js @@ -113,6 +113,7 @@ const DeleteSilenceModalContent = observer( getAlertmanager = () => this.props.alertStore.data.upstreams.instances .filter(u => u.cluster === this.props.cluster) + .filter(u => u.readonly === false) .slice(0, 1)[0]; parseAlertmanagerResponse = response => { @@ -296,11 +297,16 @@ const DeleteSilence = observer( onModalExit } = this.props; + const members = alertStore.data.getClusterAlertmanagersWithoutReadOnly( + cluster + ); + return (