Merge pull request #223 from RADAR-base/version/update-grafana

[grafana] Update grafana to chart version 8.3.2

external/grafana/Chart.yaml

@@ -1,8 +1,18 @@
+annotations:
+  artifacthub.io/license: Apache-2.0
+  artifacthub.io/links: |
+    - name: Chart Source
+      url: https://github.com/grafana/helm-charts
+    - name: Upstream Project
+      url: https://github.com/grafana/grafana
 apiVersion: v2
-appVersion: 8.5.0
+appVersion: 11.1.0
 description: The leading tool for querying and visualizing time series and metrics.
-home: https://grafana.net
-icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
+home: https://grafana.com
+icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
+keywords:
+- monitoring
+- metric
 kubeVersion: ^1.8.0-0
 maintainers:
 - email: [email protected]
@@ -15,8 +25,11 @@ maintainers:
   name: Xtigyro
 - email: [email protected]
   name: torstenwalter
+- email: [email protected]
+  name: jkroepke
 name: grafana
 sources:
 - https://github.com/grafana/grafana
+- https://github.com/grafana/helm-charts
 type: application
-version: 6.26.8
+version: 8.3.2

external/grafana/ci/with-image-renderer-values.yaml

@@ -17,3 +17,91 @@ imageRenderer:
     requests:
       cpu: 500m
       memory: 50Mi
+  extraVolumes:
+    - name: empty-renderer-volume
+      emtpyDir: {}
+  extraVolumeMounts:
+    - mountPath: /tmp/renderer
+      name: empty-renderer-volume
+  extraConfigmapMounts:
+    - name: renderer-config
+      mountPath: /usr/src/app/config.json
+      subPath: renderer-config.json
+      configMap: image-renderer-config
+  extraSecretMounts:
+    - name: renderer-certificate
+      mountPath: /usr/src/app/certs/
+      secretName: image-renderer-certificate
+      readOnly: true
+
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: image-renderer-config
+    data:
+      renderer-config.json: |
+        {
+          "service": {
+            "host": null,
+            "port": 8081,
+            "protocol": "http",
+            "certFile": "",
+            "certKey": "",
+
+            "metrics": {
+              "enabled": true,
+              "collectDefaultMetrics": true,
+              "requestDurationBuckets": [1, 5, 7, 9, 11, 13, 15, 20, 30]
+            },
+
+            "logging": {
+              "level": "info",
+              "console": {
+                "json": true,
+                "colorize": false
+              }
+            },
+
+            "security": {
+              "authToken": "-"
+            }
+          },
+          "rendering": {
+            "chromeBin": null,
+            "args": ["--no-sandbox", "--disable-gpu"],
+            "ignoresHttpsErrors": false,
+
+            "timezone": null,
+            "acceptLanguage": null,
+            "width": 1000,
+            "height": 500,
+            "deviceScaleFactor": 1,
+            "maxWidth": 3080,
+            "maxHeight": 3000,
+            "maxDeviceScaleFactor": 4,
+            "pageZoomLevel": 1,
+            "headed": false,
+
+            "mode": "default",
+            "emulateNetworkConditions": false,
+            "clustering": {
+              "monitor": false,
+              "mode": "browser",
+              "maxConcurrency": 5,
+              "timeout": 30
+            },
+
+            "verboseLogging": false,
+            "dumpio": false,
+            "timingMetrics": false
+          }
+        }
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: image-renderer-certificate
+    type: Opaque
+    data:
+      # Decodes to 'PLACEHOLDER CERTIFICATE'
+      not-a-real-certificate: UExBQ0VIT0xERVIgQ0VSVElGSUNBVEU=

external/grafana/templates/NOTES.txt

@@ -1,10 +1,11 @@
 1. Get your '{{ .Values.adminUser }}' user password by running:
 
-   kubectl get secret --namespace {{ template "grafana.namespace" . }} {{ template "grafana.fullname" . }} -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
+   kubectl get secret --namespace {{ include "grafana.namespace" . }} {{ .Values.admin.existingSecret | default (include "grafana.fullname" .) }} -o jsonpath="{.data.{{ .Values.admin.passwordKey | default "admin-password" }}}" | base64 --decode ; echo
+
 
 2. The Grafana server can be accessed via port {{ .Values.service.port }} on the following DNS name from within your cluster:
 
-   {{ template "grafana.fullname" . }}.{{ template "grafana.namespace" . }}.svc.cluster.local
+   {{ include "grafana.fullname" . }}.{{ include "grafana.namespace" . }}.svc.cluster.local
 {{ if .Values.ingress.enabled }}
    If you bind grafana to 80, please update values in values.yaml and reinstall:
    ```
@@ -24,29 +25,29 @@
    Or grafana would always crash.
 
    From outside the cluster, the server URL(s) are:
-{{- range .Values.ingress.hosts }}
+     {{- range .Values.ingress.hosts }}
      http://{{ . }}
-{{- end }}
-{{ else }}
+     {{- end }}
+{{- else }}
    Get the Grafana URL to visit by running these commands in the same shell:
-{{ if contains "NodePort" .Values.service.type -}}
-     export NODE_PORT=$(kubectl get --namespace {{ template "grafana.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana.fullname" . }})
-     export NODE_IP=$(kubectl get nodes --namespace {{ template "grafana.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
+   {{- if contains "NodePort" .Values.service.type }}
+     export NODE_PORT=$(kubectl get --namespace {{ include "grafana.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "grafana.fullname" . }})
+     export NODE_IP=$(kubectl get nodes --namespace {{ include "grafana.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
      echo http://$NODE_IP:$NODE_PORT
-{{ else if contains "LoadBalancer" .Values.service.type -}}
+   {{- else if contains "LoadBalancer" .Values.service.type }}
    NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc --namespace {{ template "grafana.namespace" . }} -w {{ template "grafana.fullname" . }}'
-     export SERVICE_IP=$(kubectl get svc --namespace {{ template "grafana.namespace" . }} {{ template "grafana.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+        You can watch the status of by running 'kubectl get svc --namespace {{ include "grafana.namespace" . }} -w {{ include "grafana.fullname" . }}'
+     export SERVICE_IP=$(kubectl get svc --namespace {{ include "grafana.namespace" . }} {{ include "grafana.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
      http://$SERVICE_IP:{{ .Values.service.port -}}
-{{ else if contains "ClusterIP"  .Values.service.type }}
-     export POD_NAME=$(kubectl get pods --namespace {{ template "grafana.namespace" . }} -l "app.kubernetes.io/name={{ template "grafana.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-     kubectl --namespace {{ template "grafana.namespace" . }} port-forward $POD_NAME 3000
-{{- end }}
+   {{- else if contains "ClusterIP"  .Values.service.type }}
+     export POD_NAME=$(kubectl get pods --namespace {{ include "grafana.namespace" . }} -l "app.kubernetes.io/name={{ include "grafana.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+     kubectl --namespace {{ include "grafana.namespace" . }} port-forward $POD_NAME 3000
+   {{- end }}
 {{- end }}
 
 3. Login with the password from step 1 and the username: {{ .Values.adminUser }}
 
-{{- if not .Values.persistence.enabled }}
+{{- if and (not .Values.persistence.enabled) (not .Values.persistence.disableWarning) }}
 #################################################################################
 ######   WARNING: Persistence is disabled!!! You will lose your data when   #####
 ######            the Grafana pod is terminated.                            #####