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

fix: Pin grafana-logging to 8.5 #1760

Merged
merged 2 commits into from
Dec 7, 2023
Merged

fix: Pin grafana-logging to 8.5 #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
207f33d
fix: Pin grafana-logging to 8.5
gracedo Dec 6, 2023
c635687
feat: Add grafana 8.5.26 image to licenses
gracedo Dec 6, 2023
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
6 changes: 6 additions & 0 deletions licenses.d2iq.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ resources:
- license_path: LICENSE
ref: v${image_tag%-rootless}
url: https://github.com/go-gitea/gitea
- container_image: docker.io/grafana/grafana:8.5.26
sources:
- license_path: LICENSE
notice_path: NOTICE.md
ref: v${image_tag}
url: https://github.com/grafana/grafana
- container_image: docker.io/grafana/grafana:9.4.7
sources:
- license_path: LICENSE
Expand Down
5 changes: 2 additions & 3 deletions services/grafana-logging/6.60.1/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ data:
values.yaml: |
---
priorityClassName: "dkp-critical-priority"
# pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scraping
# grafana metrics
# pinning grafana to 8.5 since it appears that v9+ is causing the kubernetes audit dashboard to crash
image:
tag: 9.5.7
tag: 8.5.26
datasources:
datasources.yaml:
apiVersion: 1
Expand Down
2 changes: 1 addition & 1 deletion services/grafana-logging/6.60.1/grafana.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ data:
dashboardLink: "/dkp/logging/grafana"
docsLink: "https://grafana.com/docs/"
# Check https://artifacthub.io/packages/helm/grafana/grafana/6.58.6 for app version
version: "9.5.7"
version: "8.5.26"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down
5 changes: 2 additions & 3 deletions services/project-grafana-logging/6.60.1/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ data:
values.yaml: |
---
priorityClassName: "dkp-critical-priority"
# pinning grafana to 9.5 since it appears that upgrading to v10 is causing issues with prometheus scraping
# grafana metrics
# pinning grafana to 8.5 since it appears that v9+ is causing the kubernetes audit dashboard to crash
image:
tag: 9.5.7
tag: 8.5.26
datasources:
datasources.yaml:
apiVersion: 1
Expand Down
Loading