diff --git a/src/grafana/chart/templates/uds-package.yaml b/src/grafana/chart/templates/uds-package.yaml index b99690b5fe..9b8d6a004b 100644 --- a/src/grafana/chart/templates/uds-package.yaml +++ b/src/grafana/chart/templates/uds-package.yaml @@ -25,6 +25,8 @@ spec: description: Metrics network: + serviceMesh: + mode: ambient expose: - service: grafana selector: diff --git a/test/jest/prometheus.spec.ts b/test/jest/prometheus.spec.ts index bbb117c0d0..d0bd6332a9 100644 --- a/test/jest/prometheus.spec.ts +++ b/test/jest/prometheus.spec.ts @@ -26,17 +26,16 @@ describe("Prometheus and Alertmanager", () => { }); test("alert manager should be firing watchdog alert", async () => { - // fetch active alerts with alertname="Watchdog" const response = await fetch( - `${alertmanagerProxy.url}/api/v2/alerts/groups?filter=alertname%3D%22Watchdog%22&silenced=false&inhibited=false&active=true`, + `${alertmanagerProxy.url}/api/v2/alerts` ); - expect(response.status).toBe(200); - const body = (await response.json()) as { - alerts: Array<{ status: { state: string } }>; - }[]; - expect(body[0]).toBeDefined(); - expect(body[0].alerts[0].status.state).toEqual("active"); + expect(response.status).toBe(200) + const body = (await response.json()) as Array<{ labels: { alertname: string }; status: { state: string } }>; + + expect(body.some( + alert => alert.labels.alertname === "Watchdog" && alert.status.state === "active" + )).toBe(true); }); test("prometheus web ui should be responsive via the internal service address", async () => {