diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index a27a069944..b10af493da 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -96,6 +96,12 @@ resources: - license_path: LICENSE ref: v1.19.2-d2iq url: https://github.com/mesosphere/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 diff --git a/services/grafana-logging/6.60.1/defaults/cm.yaml b/services/grafana-logging/6.60.1/defaults/cm.yaml index 7be6cb35a4..7273bb1551 100644 --- a/services/grafana-logging/6.60.1/defaults/cm.yaml +++ b/services/grafana-logging/6.60.1/defaults/cm.yaml @@ -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.13 + tag: 8.5.26 datasources: datasources.yaml: apiVersion: 1 diff --git a/services/grafana-logging/6.60.1/grafana.yaml b/services/grafana-logging/6.60.1/grafana.yaml index 28ec2019cb..cc388fab2d 100644 --- a/services/grafana-logging/6.60.1/grafana.yaml +++ b/services/grafana-logging/6.60.1/grafana.yaml @@ -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.13" + version: "8.5.26" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/services/project-grafana-logging/6.60.1/defaults/cm.yaml b/services/project-grafana-logging/6.60.1/defaults/cm.yaml index 3b7de6a9f9..5884c2d511 100644 --- a/services/project-grafana-logging/6.60.1/defaults/cm.yaml +++ b/services/project-grafana-logging/6.60.1/defaults/cm.yaml @@ -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.13 + tag: 8.5.26 datasources: datasources.yaml: apiVersion: 1