From 1cc4894996d96d02a40fec713b67a2fe13f29be4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:48:31 +0000 Subject: [PATCH 1/2] chore(deps): update grafana | datasource | package | from | to | | ---------- | ----------------------------------------------------- | ------ | ------ | | docker | cgr.dev/du-uds-defenseunicorns/grafana-fips | 11.2.2 | 11.3.0 | | docker | docker.io/curlimages/curl | 8.10.1 | 8.11.0 | | docker | docker.io/grafana/grafana | 11.2.2 | 11.3.0 | | helm | grafana | 8.5.5 | 8.5.12 | | docker | registry1.dso.mil/ironbank/opensource/grafana/grafana | 11.2.2 | 11.3.0 | --- src/grafana/common/zarf.yaml | 2 +- src/grafana/values/registry1-values.yaml | 2 +- src/grafana/values/unicorn-values.yaml | 2 +- src/grafana/values/upstream-values.yaml | 4 ++-- src/grafana/zarf.yaml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/grafana/common/zarf.yaml b/src/grafana/common/zarf.yaml index 561982e2a..d5735fc68 100644 --- a/src/grafana/common/zarf.yaml +++ b/src/grafana/common/zarf.yaml @@ -17,7 +17,7 @@ components: localPath: ../chart - name: grafana url: https://grafana.github.io/helm-charts/ - version: 8.5.5 + version: 8.5.12 namespace: grafana valuesFiles: - ../values/values.yaml diff --git a/src/grafana/values/registry1-values.yaml b/src/grafana/values/registry1-values.yaml index cfd61e80d..1fc5ec0cb 100644 --- a/src/grafana/values/registry1-values.yaml +++ b/src/grafana/values/registry1-values.yaml @@ -4,7 +4,7 @@ image: registry: registry1.dso.mil repository: ironbank/opensource/grafana/grafana - tag: 11.2.2 + tag: 11.3.0 initChownData: image: diff --git a/src/grafana/values/unicorn-values.yaml b/src/grafana/values/unicorn-values.yaml index 79970420e..e6b8b6531 100644 --- a/src/grafana/values/unicorn-values.yaml +++ b/src/grafana/values/unicorn-values.yaml @@ -4,7 +4,7 @@ image: registry: cgr.dev repository: du-uds-defenseunicorns/grafana-fips - tag: 11.2.2 + tag: 11.3.0 initChownData: image: diff --git a/src/grafana/values/upstream-values.yaml b/src/grafana/values/upstream-values.yaml index 73f3ff340..b2e597e86 100644 --- a/src/grafana/values/upstream-values.yaml +++ b/src/grafana/values/upstream-values.yaml @@ -11,7 +11,7 @@ sidecar: image: registry: docker.io repository: grafana/grafana - tag: 11.2.2 + tag: 11.3.0 initChownData: image: @@ -22,4 +22,4 @@ initChownData: downloadDashboardsImage: registry: docker.io repository: curlimages/curl - tag: 8.10.1 + tag: 8.11.0 diff --git a/src/grafana/zarf.yaml b/src/grafana/zarf.yaml index a0fdde8c4..938ee6ee5 100644 --- a/src/grafana/zarf.yaml +++ b/src/grafana/zarf.yaml @@ -24,8 +24,8 @@ components: valuesFiles: - values/upstream-values.yaml images: - - docker.io/grafana/grafana:11.2.2 - - docker.io/curlimages/curl:8.10.1 + - docker.io/grafana/grafana:11.3.0 + - docker.io/curlimages/curl:8.11.0 - docker.io/library/busybox:1.37.0 - ghcr.io/kiwigrid/k8s-sidecar:1.28.0 @@ -40,7 +40,7 @@ components: valuesFiles: - values/registry1-values.yaml images: - - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.2.2 + - registry1.dso.mil/ironbank/opensource/grafana/grafana:11.3.0 - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4 - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.28.0 @@ -55,7 +55,7 @@ components: valuesFiles: - values/unicorn-values.yaml images: - - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.2.2 + - cgr.dev/du-uds-defenseunicorns/grafana-fips:11.3.0 - cgr.dev/du-uds-defenseunicorns/busybox-fips:1.37.0 - cgr.dev/du-uds-defenseunicorns/curl-fips:8.10.1 - cgr.dev/du-uds-defenseunicorns/k8s-sidecar-fips:1.28.0 From 3d3705c65b56eae93301189c2cabf8a3709ca8cf Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 7 Nov 2024 11:27:09 -0700 Subject: [PATCH 2/2] fix: test selector --- test/playwright/grafana.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/playwright/grafana.test.ts b/test/playwright/grafana.test.ts index 302a7d9aa..f4aa2d75d 100644 --- a/test/playwright/grafana.test.ts +++ b/test/playwright/grafana.test.ts @@ -36,7 +36,7 @@ test("validate namespace dashboard", async ({ page }) => { await page.goto(`/dashboards`); await page.click('text="Kubernetes / Compute Resources / Namespace (Pods)"'); await page.getByTestId('data-testid Dashboard template variables Variable Value DropDown value link text authservice').click(); - await page.getByRole('checkbox', { name: 'grafana' }).click(); + await page.getByRole('option', { name: 'grafana' }).click(); }); }); @@ -48,7 +48,7 @@ test("validate loki dashboard", async ({ page }) => { await page.getByPlaceholder('Search for dashboards and folders').fill('Loki'); await page.click('text="Loki Dashboard quick search"'); await page.getByTestId('data-testid Dashboard template variables Variable Value DropDown value link text authservice').click(); - await page.getByRole('checkbox', { name: 'grafana' }).click(); + await page.getByRole('option', { name: 'grafana' }).click(); await expect(page.getByTestId('data-testid Panel header Logs Panel').getByTestId('data-testid panel content')).toBeVisible(); }); });