Merge pull request #842 from kinvolk/invidian/update-grafana

invidian · web-flow · commit 0ff4899aef8e · 2020-08-26T09:46:49.000+02:00
Update Grafana to latest version
diff --git a/assets/charts/components/prometheus-operator/requirements.lock b/assets/charts/components/prometheus-operator/requirements.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: kube-state-metrics
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 2.8.10
+  version: 2.8.14
 - name: prometheus-node-exporter
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 1.10.0
 - name: grafana
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 5.3.0
-digest: sha256:4cafebfa80daacbd651defea2a7cad3074e8022114d27d76a3baa1861998981b
-generated: "2020-06-22T12:36:10.4861206Z"
+  version: 5.5.5
+digest: sha256:e801bb3bcc01ac17f0e2694c3848c7536c4f8530deb4f0a873ebf29769406269
+generated: "2020-08-25T09:45:22.318216443+02:00"
diff --git a/assets/charts/components/prometheus-operator/requirements.yaml b/assets/charts/components/prometheus-operator/requirements.yaml
@@ -11,6 +11,6 @@ dependencies:
     condition: nodeExporter.enabled
 
   - name: grafana
-    version: "5.3.*"
+    version: "5.5.*"
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: grafana.enabled
diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go
diff --git a/pkg/components/prometheus-operator/template.go b/pkg/components/prometheus-operator/template.go
@@ -49,6 +49,8 @@ alertmanager:
 
 grafana:
   plugins: "grafana-piechart-panel"
+  image:
+    tag: 7.1.4
   testFramework:
     enabled: false
   sidecar:
