Merge branch 'main' into DOCS-fix-typo-ingester

grafana · Jul 8, 2024 · 7704651 · 7704651
2 parents 14138da + e733d04
commit 7704651
Show file tree

Hide file tree

Showing 35 changed files with 798 additions and 56 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,12 +6,12 @@
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @grafana/helm-charts-admins
 
-/charts/grafana/ @maorfr @torstenwalter @Xtigyro @zanhsieh
+/charts/grafana/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh
 /charts/loki-distributed/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/loki-canary/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/promtail/ @grafana/loki-squad @unguiculus @Whyeasy
 /charts/tempo/ @grafana/tempo @dgzlopes @swartz-k @BitProcessor @faustodavid
-/charts/tempo-distributed/ @grafana/tempo @mapno @swartz-k @BitProcessor @faustodavid
+/charts/tempo-distributed/ @grafana/tempo @Sheikh-Abubaker @mapno @swartz-k @BitProcessor @faustodavid
 /charts/enterprise-metrics/ @grafana/mimir-maintainers
 /charts/rollout-operator/ @grafana/mimir-maintainers
 /charts/enterprise-logs/ @grafana/loki-squad

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 8.0.1
-appVersion: 11.0.0
+version: 8.3.2
+appVersion: 11.1.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com
@@ -27,6 +27,8 @@ maintainers:
     email: [email protected]
   - name: torstenwalter
     email: [email protected]
+  - name: jkroepke
+    email: [email protected]
 type: application
 keywords:
   - monitoring

diff --git a/charts/grafana/README.md b/charts/grafana/README.md
@@ -73,6 +73,8 @@ need to instead set `global.imageRegistry`.
 | `image.pullPolicy`                        | Image pull policy                             | `IfNotPresent`                                          |
 | `image.pullSecrets`                       | Image pull secrets (can be templated)         | `[]`                                                    |
 | `service.enabled`                         | Enable grafana service                        | `true`                                                  |
+| `service.ipFamilies`                      | Kubernetes service IP families                | `[]`                                                    |
+| `service.ipFamilyPolicy`                  | Kubernetes service IP family policy           | `""`                                                    |
 | `service.type`                            | Kubernetes service type                       | `ClusterIP`                                             |
 | `service.port`                            | Kubernetes port where service is exposed      | `80`                                                    |
 | `service.portName`                        | Name of the port on the service               | `service`                                               |
@@ -119,6 +121,7 @@ need to instead set `global.imageRegistry`.
 | `persistence.subPath`                     | Mount a sub dir of the persistent volume (can be templated) | `nil`                                     |
 | `persistence.inMemory.enabled`            | If persistence is not enabled, whether to mount the local storage in-memory to improve performance | `false`                                                   |
 | `persistence.inMemory.sizeLimit`          | SizeLimit for the in-memory local storage     | `nil`                                                   |
+| `persistence.disableWarning`              | Hide NOTES warning, useful when persiting to a database | `false`                                       |
 | `initChownData.enabled`                   | If false, don't reset data ownership at startup | true                                                  |
 | `initChownData.image.registry`            | init-chown-data container image registry      | `docker.io`                                               |
 | `initChownData.image.repository`          | init-chown-data container image repository    | `busybox`                                               |
@@ -274,9 +277,13 @@ need to instead set `global.imageRegistry`.
 | `imageRenderer.image.pullPolicy`           | image-renderer ImagePullPolicy                                                     | `Always`                         |
 | `imageRenderer.env`                        | extra env-vars for image-renderer                                                  | `{}`                             |
 | `imageRenderer.envValueFrom`               | Environment variables for image-renderer from alternate sources. See the API docs on [EnvVarSource](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#envvarsource-v1-core) for format details. Can be templated | `{}` |
+| `imageRenderer.extraConfigmapMounts`       | Additional image-renderer configMap volume mounts (values are templated)           | `[]`                             |
+| `imageRenderer.extraSecretMounts`          | Additional image-renderer secret volume mounts                                     | `[]`                             |
+| `imageRenderer.extraVolumeMounts`          | Additional image-renderer volume mounts                                            | `[]`                             |
+| `imageRenderer.extraVolumes`               | Additional image-renderer volumes                                                  | `[]`                             |
 | `imageRenderer.serviceAccountName`         | image-renderer deployment serviceAccountName                                       | `""`                             |
 | `imageRenderer.securityContext`            | image-renderer deployment securityContext                                          | `{}`                             |
-| `imageRenderer.podAnnotations `            | image-renderer image-renderer pod annotation                                       | `{}`                             |
+| `imageRenderer.podAnnotations`            | image-renderer image-renderer pod annotation                                       | `{}`                             |
 | `imageRenderer.hostAliases`                | image-renderer deployment Host Aliases                                             | `[]`                             |
 | `imageRenderer.priorityClassName`          | image-renderer deployment priority class                                           | `''`                             |
 | `imageRenderer.service.enabled`            | Enable the image-renderer service                                                  | `true`                           |
@@ -438,6 +445,7 @@ Secrets are recommended over configmaps for this usecase because datasources usu
 data like usernames and passwords. Secrets are the more appropriate cluster resource to manage those.
 
 Example values to add a postgres datasource as a kubernetes secret:
+
 ```yaml
 apiVersion: v1
 kind: Secret
@@ -592,6 +600,7 @@ To delete provisioned alert rules is a two step process, you need to delete the
 and then create a configuration which deletes the alert rule.
 
 Example deletion configuration:
+
 ```yaml
 apiVersion: v1
 kind: ConfigMap
@@ -609,6 +618,7 @@ data:
 ```
 
 ## Statically provision alerting resources
+
 If you don't need to change alerting resources (alert rules, contact points, notification policies and notification templates) regularly you could use the `alerting` config option instead of the sidecar option above.
 This will grab the alerting config and apply it statically at build time for the helm file.
 

diff --git a/charts/grafana/ci/with-image-renderer-values.yaml b/charts/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=
diff --git a/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml b/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml
@@ -0,0 +1,38 @@
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: '{{ include "grafana.fullname" . }}-test'
+    data:
+      var1: "value1"
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: '{{ include "grafana.fullname" . }}-test'
+    type: Opaque
+    data:
+      var2: "dmFsdWUy"
+
+sidecar:
+  dashboards:
+    enabled: true
+    envValueFrom:
+      VAR1:
+        configMapKeyRef:
+          name: '{{ include "grafana.fullname" . }}-test'
+          key: var1
+      VAR2:
+        secretKeyRef:
+          name: '{{ include "grafana.fullname" . }}-test'
+          key: var2
+  datasources:
+    enabled: true
+    envValueFrom:
+      VAR1:
+        configMapKeyRef:
+          name: '{{ include "grafana.fullname" . }}-test'
+          key: var1
+      VAR2:
+        secretKeyRef:
+          name: '{{ include "grafana.fullname" . }}-test'
+          key: var2
diff --git a/charts/grafana/templates/NOTES.txt b/charts/grafana/templates/NOTES.txt
@@ -47,7 +47,7 @@
 
 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.                            #####

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -192,6 +192,11 @@ initContainers:
       - name: "{{ $key }}"
         value: "{{ $value }}"
       {{- end }}
+      {{- range $key, $value := .Values.sidecar.datasources.envValueFrom }}
+      - name: {{ $key | quote }}
+        valueFrom:
+          {{- tpl (toYaml $value) $ | nindent 10 }}
+      {{- end }}
       {{- if .Values.sidecar.datasources.ignoreAlreadyProcessed }}
       - name: IGNORE_ALREADY_PROCESSED
         value: "true"
@@ -434,7 +439,7 @@ containers:
       - name: "{{ $key }}"
         value: "{{ $value }}"
       {{- end }}
-      {{- range $key, $value := .Values.sidecar.datasources.envValueFrom }}
+      {{- range $key, $value := .Values.sidecar.dashboards.envValueFrom }}
       - name: {{ $key | quote }}
         valueFrom:
           {{- tpl (toYaml $value) $ | nindent 10 }}
@@ -550,6 +555,11 @@ containers:
       - name: "{{ $key }}"
         value: "{{ $value }}"
       {{- end }}
+      {{- range $key, $value := .Values.sidecar.datasources.envValueFrom }}
+      - name: {{ $key | quote }}
+        valueFrom:
+          {{- tpl (toYaml $value) $ | nindent 10 }}
+      {{- end }}
       {{- if .Values.sidecar.datasources.ignoreAlreadyProcessed }}
       - name: IGNORE_ALREADY_PROCESSED
         value: "true"

diff --git a/charts/grafana/templates/configmap.yaml b/charts/grafana/templates/configmap.yaml
@@ -6,9 +6,14 @@ metadata:
   namespace: {{ include "grafana.namespace" . }}
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
-  {{- with .Values.annotations }}
+  {{- if or .Values.configMapAnnotations .Values.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- with .Values.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.configMapAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
 data:
   {{- include "grafana.configData" . | nindent 2 }}

diff --git a/charts/grafana/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml
@@ -109,6 +109,24 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: image-renderer-tmpfs
+            {{- range .Values.imageRenderer.extraConfigmapMounts }}
+            - name: {{ tpl .name $root }}
+              mountPath: {{ tpl .mountPath $root }}
+              subPath: {{ tpl (.subPath | default "") $root }}
+              readOnly: {{ .readOnly }}
+            {{- end }}
+            {{- range .Values.imageRenderer.extraSecretMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              readOnly: {{ .readOnly }}
+              subPath: {{ .subPath | default "" }}
+            {{- end }}
+            {{- range .Values.imageRenderer.extraVolumeMounts }}
+            - name: {{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath | default "" }}
+              readOnly: {{ .readOnly }}
+            {{- end }}
           {{- with .Values.imageRenderer.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
@@ -128,4 +146,54 @@ spec:
       volumes:
         - name: image-renderer-tmpfs
           emptyDir: {}
+        {{- range .Values.imageRenderer.extraConfigmapMounts }}
+        - name: {{ tpl .name $root }}
+          configMap:
+            name: {{ tpl .configMap $root }}
+            {{- with .items }}
+            items:
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
+        {{- end }}
+        {{- range .Values.imageRenderer.extraSecretMounts }}
+        {{- if .secretName }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{ .secretName }}
+            defaultMode: {{ .defaultMode }}
+            {{- with .items }}
+            items:
+              {{- toYaml . | nindent 14 }}
+            {{- end }}
+        {{- else if .projected }}
+        - name: {{ .name }}
+          projected:
+            {{- toYaml .projected | nindent 12 }}
+        {{- else if .csi }}
+        - name: {{ .name }}
+          csi:
+            {{- toYaml .csi | nindent 12 }}
+        {{- end }}
+        {{- end }}
+        {{- range .Values.imageRenderer.extraVolumes }}
+        - name: {{ .name }}
+          {{- if .existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .existingClaim }}
+          {{- else if .hostPath }}
+          hostPath:
+            {{ toYaml .hostPath | nindent 12 }}
+          {{- else if .csi }}
+          csi:
+            {{- toYaml .csi | nindent 12 }}
+          {{- else if .configMap }}
+          configMap:
+            {{- toYaml .configMap | nindent 12 }}
+          {{- else if .emptyDir }}
+          emptyDir:
+            {{- toYaml .emptyDir | nindent 12 }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
+        {{- end }}
 {{- end }}
diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml
@@ -25,7 +25,7 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
-  {{- if (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }}
+  {{- if and (.Values.persistence.lookupVolumeName) (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }}
   volumeName: {{ (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)).spec.volumeName }}
   {{- end }}
   {{- with .Values.persistence.storageClassName }}

diff --git a/charts/grafana/templates/service.yaml b/charts/grafana/templates/service.yaml
@@ -35,6 +35,12 @@ spec:
   {{- else }}
   type: {{ .Values.service.type }}
   {{- end }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   {{- with .Values.service.externalIPs }}
   externalIPs:
     {{- toYaml . | nindent 4 }}