From 7cdd7429fe09a24407c566cbf60e160ddd0957af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:48:52 -0700 Subject: [PATCH] chore(deps): update grafana to 11.3.0 (#921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cgr.dev/du-uds-defenseunicorns/grafana-fips](https://images.chainguard.dev/directory/image/grafana-fips/overview) ([source](https://redirect.github.com/chainguard-images/images-private/tree/HEAD/images/grafana-fips)) | minor | `11.2.2` -> `11.3.0` | | [docker.io/curlimages/curl](https://redirect.github.com/curl/curl-container) | minor | `8.10.1` -> `8.11.0` | | docker.io/grafana/grafana | minor | `11.2.2` -> `11.3.0` | | [grafana](https://grafana.com) ([source](https://redirect.github.com/grafana/helm-charts)) | patch | `8.5.5` -> `8.5.12` | | [registry1.dso.mil/ironbank/opensource/grafana/grafana](https://redirect.github.com/grafana/grafana) ([source](https://repo1.dso.mil/dsop/opensource/grafana/grafana)) | minor | `11.2.2` -> `11.3.0` | --- ### Release Notes
curl/curl-container (docker.io/curlimages/curl) ### [`v8.11.0`](https://redirect.github.com/curl/curl-container/blob/HEAD/CHANGELOG.md#8110---2024-11-06) [Compare Source](https://redirect.github.com/curl/curl-container/compare/8.10.1...8.11.0) ##### Changed - bump to curl 8.11.0
grafana/helm-charts (grafana) ### [`v8.5.12`](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.11...grafana-8.5.12) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.11...grafana-8.5.12) ### [`v8.5.11`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.11) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.10...grafana-8.5.11) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] Make the Helm hook type for the testFramework configurable by [@​baileymjensen](https://redirect.github.com/baileymjensen) in [https://github.com/grafana/helm-charts/pull/3388](https://redirect.github.com/grafana/helm-charts/pull/3388) #### New Contributors - [@​baileymjensen](https://redirect.github.com/baileymjensen) made their first contribution in [https://github.com/grafana/helm-charts/pull/3388](https://redirect.github.com/grafana/helm-charts/pull/3388) **Full Changelog**: https://github.com/grafana/helm-charts/compare/grafana-8.5.10...grafana-8.5.11 ### [`v8.5.10`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.10) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.9...grafana-8.5.10) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] FIX: yaml indentation in README.md by [@​b-o-g-d-a-n](https://redirect.github.com/b-o-g-d-a-n) in [https://github.com/grafana/helm-charts/pull/3382](https://redirect.github.com/grafana/helm-charts/pull/3382) #### New Contributors - [@​b-o-g-d-a-n](https://redirect.github.com/b-o-g-d-a-n) made their first contribution in [https://github.com/grafana/helm-charts/pull/3382](https://redirect.github.com/grafana/helm-charts/pull/3382) **Full Changelog**: https://github.com/grafana/helm-charts/compare/beyla-1.4.4...grafana-8.5.10 ### [`v8.5.9`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.9) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.8...grafana-8.5.9) The leading tool for querying and visualizing time series and metrics. #### What's Changed - Add missing permissions in update-helm-repo workflow by [@​narqo](https://redirect.github.com/narqo) in [https://github.com/grafana/helm-charts/pull/3383](https://redirect.github.com/grafana/helm-charts/pull/3383) - \[grafana] Bump Grafana appVersion to v11.3.0 by [@​anders-elastisys](https://redirect.github.com/anders-elastisys) in [https://github.com/grafana/helm-charts/pull/3386](https://redirect.github.com/grafana/helm-charts/pull/3386) #### New Contributors - [@​anders-elastisys](https://redirect.github.com/anders-elastisys) made their first contribution in [https://github.com/grafana/helm-charts/pull/3386](https://redirect.github.com/grafana/helm-charts/pull/3386) **Full Changelog**: https://github.com/grafana/helm-charts/compare/k8s-monitoring-1.6.1...grafana-8.5.9 ### [`v8.5.8`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.8) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.7...grafana-8.5.8) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] add extraMounts to plugins sidecar by [@​coutug](https://redirect.github.com/coutug) in [https://github.com/grafana/helm-charts/pull/3355](https://redirect.github.com/grafana/helm-charts/pull/3355) #### New Contributors - [@​coutug](https://redirect.github.com/coutug) made their first contribution in [https://github.com/grafana/helm-charts/pull/3355](https://redirect.github.com/grafana/helm-charts/pull/3355) **Full Changelog**: https://github.com/grafana/helm-charts/compare/grafana-8.5.7...grafana-8.5.8 ### [`v8.5.7`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.7) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.6...grafana-8.5.7) The leading tool for querying and visualizing time series and metrics. #### What's Changed - \[grafana] use release with security fix for CVE-2024-9264 by [@​kubicgruenfeld](https://redirect.github.com/kubicgruenfeld) in [https://github.com/grafana/helm-charts/pull/3369](https://redirect.github.com/grafana/helm-charts/pull/3369) **Full Changelog**: https://github.com/grafana/helm-charts/compare/alloy-0.9.2...grafana-8.5.7 ### [`v8.5.6`](https://redirect.github.com/grafana/helm-charts/releases/tag/grafana-8.5.6) [Compare Source](https://redirect.github.com/grafana/helm-charts/compare/grafana-8.5.5...grafana-8.5.6) The leading tool for querying and visualizing time series and metrics. ##### What's Changed - \[grafana] correct array formatting for grafana.ini by [@​nathwill](https://redirect.github.com/nathwill) in [https://github.com/grafana/helm-charts/pull/3352](https://redirect.github.com/grafana/helm-charts/pull/3352) ##### New Contributors - [@​nathwill](https://redirect.github.com/nathwill) made their first contribution in [https://github.com/grafana/helm-charts/pull/3352](https://redirect.github.com/grafana/helm-charts/pull/3352) **Full Changelog**: https://github.com/grafana/helm-charts/compare/helm-loki-6.18.0...grafana-8.5.6
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/uds-core). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Micah Nagel --- 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 ++++---- test/playwright/grafana.test.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 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 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(); }); });