Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update grafana #921

Merged
merged 3 commits into from
Nov 7, 2024
Merged

chore(deps): update grafana #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cc4894
chore(deps): update grafana
renovate[bot] Nov 6, 2024
3d3705c
fix: test selector
mjnagel Nov 7, 2024
d9d210f
Merge branch 'main' into renovate/grafana
mjnagel Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/grafana/common/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/grafana/values/registry1-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
image:
registry: registry1.dso.mil
repository: ironbank/opensource/grafana/grafana
tag: 11.2.2
tag: 11.3.0

initChownData:
image:
Expand Down
2 changes: 1 addition & 1 deletion src/grafana/values/unicorn-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
image:
registry: cgr.dev
repository: du-uds-defenseunicorns/grafana-fips
tag: 11.2.2
tag: 11.3.0

initChownData:
image:
Expand Down
4 changes: 2 additions & 2 deletions src/grafana/values/upstream-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sidecar:
image:
registry: docker.io
repository: grafana/grafana
tag: 11.2.2
tag: 11.3.0

initChownData:
image:
Expand All @@ -22,4 +22,4 @@ initChownData:
downloadDashboardsImage:
registry: docker.io
repository: curlimages/curl
tag: 8.10.1
tag: 8.11.0
8 changes: 4 additions & 4 deletions src/grafana/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
4 changes: 2 additions & 2 deletions test/playwright/grafana.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});

Expand All @@ -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();
});
});