diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index d6c4eb4116..afcf676be7 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.10.3 +version: 8.11.0 appVersion: 11.5.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/README.md b/charts/grafana/README.md index c529d4c45a..b86a2c25c6 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -173,8 +173,8 @@ need to instead set `global.imageRegistry`. | `sidecar.securityContext` | Sidecar securityContext | `{}` | | `sidecar.enableUniqueFilenames` | Sets the kiwigrid/k8s-sidecar UNIQUE_FILENAMES environment variable. If set to `true` the sidecar will create unique filenames where duplicate data keys exist between ConfigMaps and/or Secrets within the same or multiple Namespaces. | `false` | | `sidecar.alerts.enabled` | Enables the cluster wide search for alerts and adds/updates/deletes them in grafana |`false` | -| `sidecar.alerts.label` | Label that config maps with alerts should have to be added | `grafana_alert` | -| `sidecar.alerts.labelValue` | Label value that config maps with alerts should have to be added | `""` | +| `sidecar.alerts.label` | Label that config maps with alerts should have to be added (can be templated) | `grafana_alert` | +| `sidecar.alerts.labelValue` | Label value that config maps with alerts should have to be added (can be templated) | `""` | | `sidecar.alerts.searchNamespace` | Namespaces list. If specified, the sidecar will search for alerts config-maps inside these namespaces. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces. | `nil` | | `sidecar.alerts.watchMethod` | Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. | `WATCH` | | `sidecar.alerts.resource` | Should the sidecar looks into secrets, configmaps or both. | `both` | @@ -194,8 +194,8 @@ need to instead set `global.imageRegistry`. | `sidecar.dashboards.provider.foldersFromFilesStructure` | Allow Grafana to replicate dashboard structure from filesystem. | `false` | | `sidecar.dashboards.watchMethod` | Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. | `WATCH` | | `sidecar.skipTlsVerify` | Set to true to skip tls verification for kube api calls | `nil` | -| `sidecar.dashboards.label` | Label that config maps with dashboards should have to be added | `grafana_dashboard` | -| `sidecar.dashboards.labelValue` | Label value that config maps with dashboards should have to be added | `""` | +| `sidecar.dashboards.label` | Label that config maps with dashboards should have to be added (can be templated) | `grafana_dashboard` | +| `sidecar.dashboards.labelValue` | Label value that config maps with dashboards should have to be added (can be templated) | `""` | | `sidecar.dashboards.folder` | Folder in the pod that should hold the collected dashboards (unless `sidecar.dashboards.defaultFolderName` is set). This path will be mounted. | `/tmp/dashboards` | | `sidecar.dashboards.folderAnnotation` | The annotation the sidecar will look for in configmaps to override the destination folder for files | `nil` | | `sidecar.dashboards.defaultFolderName` | The default folder name, it will create a subfolder under the `sidecar.dashboards.folder` and put dashboards in there instead | `nil` | @@ -206,8 +206,8 @@ need to instead set `global.imageRegistry`. | `sidecar.dashboards.resource` | Should the sidecar looks into secrets, configmaps or both. | `both` | | `sidecar.dashboards.extraMounts` | Additional dashboard sidecar volume mounts. | `[]` | | `sidecar.datasources.enabled` | Enables the cluster wide search for datasources and adds/updates/deletes them in grafana |`false` | -| `sidecar.datasources.label` | Label that config maps with datasources should have to be added | `grafana_datasource` | -| `sidecar.datasources.labelValue` | Label value that config maps with datasources should have to be added | `""` | +| `sidecar.datasources.label` | Label that config maps with datasources should have to be added (can be templated) | `grafana_datasource` | +| `sidecar.datasources.labelValue` | Label value that config maps with datasources should have to be added (can be templated) | `""` | | `sidecar.datasources.searchNamespace` | Namespaces list. If specified, the sidecar will search for datasources config-maps inside these namespaces. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces. | `nil` | | `sidecar.datasources.watchMethod` | Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. | `WATCH` | | `sidecar.datasources.resource` | Should the sidecar looks into secrets, configmaps or both. | `both` | @@ -215,8 +215,8 @@ need to instead set `global.imageRegistry`. | `sidecar.datasources.skipReload` | Enabling this omits defining the REQ_URL and REQ_METHOD environment variables | `false` | | `sidecar.datasources.initDatasources` | Set to true to deploy the datasource sidecar as an initContainer in addition to a container. This is needed if skipReload is true, to load any datasources defined at startup time. | `false` | | `sidecar.notifiers.enabled` | Enables the cluster wide search for notifiers and adds/updates/deletes them in grafana | `false` | -| `sidecar.notifiers.label` | Label that config maps with notifiers should have to be added | `grafana_notifier` | -| `sidecar.notifiers.labelValue` | Label value that config maps with notifiers should have to be added | `""` | +| `sidecar.notifiers.label` | Label that config maps with notifiers should have to be added (can be templated) | `grafana_notifier` | +| `sidecar.notifiers.labelValue` | Label value that config maps with notifiers should have to be added (can be templated) | `""` | | `sidecar.notifiers.searchNamespace` | Namespaces list. If specified, the sidecar will search for notifiers config-maps (or secrets) inside these namespaces. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces. | `nil` | | `sidecar.notifiers.watchMethod` | Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. | `WATCH` | | `sidecar.notifiers.resource` | Should the sidecar looks into secrets, configmaps or both. | `both` | diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index 374b3a3b66..fe98f187a9 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -127,10 +127,10 @@ initContainers: - name: METHOD value: "LIST" - name: LABEL - value: "{{ .Values.sidecar.alerts.label }}" + value: "{{ tpl .Values.sidecar.alerts.label $root }}" {{- with .Values.sidecar.alerts.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.alerts.logLevel }} - name: LOG_LEVEL @@ -205,10 +205,10 @@ initContainers: - name: METHOD value: "LIST" - name: LABEL - value: "{{ .Values.sidecar.datasources.label }}" + value: "{{ tpl .Values.sidecar.datasources.label $root }}" {{- with .Values.sidecar.datasources.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }} - name: LOG_LEVEL @@ -263,10 +263,10 @@ initContainers: - name: METHOD value: LIST - name: LABEL - value: "{{ .Values.sidecar.notifiers.label }}" + value: "{{ tpl .Values.sidecar.notifiers.label $root }}" {{- with .Values.sidecar.notifiers.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.notifiers.logLevel }} - name: LOG_LEVEL @@ -340,10 +340,10 @@ containers: - name: METHOD value: {{ .Values.sidecar.alerts.watchMethod }} - name: LABEL - value: "{{ .Values.sidecar.alerts.label }}" + value: "{{ tpl .Values.sidecar.alerts.label $root }}" {{- with .Values.sidecar.alerts.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.alerts.logLevel }} - name: LOG_LEVEL @@ -464,10 +464,10 @@ containers: - name: METHOD value: {{ .Values.sidecar.dashboards.watchMethod }} - name: LABEL - value: "{{ .Values.sidecar.dashboards.label }}" + value: "{{ tpl .Values.sidecar.dashboards.label $root }}" {{- with .Values.sidecar.dashboards.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.dashboards.logLevel }} - name: LOG_LEVEL @@ -592,10 +592,10 @@ containers: - name: METHOD value: {{ .Values.sidecar.datasources.watchMethod }} - name: LABEL - value: "{{ .Values.sidecar.datasources.label }}" + value: "{{ tpl .Values.sidecar.datasources.label $root }}" {{- with .Values.sidecar.datasources.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.datasources.logLevel }} - name: LOG_LEVEL @@ -711,10 +711,10 @@ containers: - name: METHOD value: {{ .Values.sidecar.notifiers.watchMethod }} - name: LABEL - value: "{{ .Values.sidecar.notifiers.label }}" + value: "{{ tpl .Values.sidecar.notifiers.label $root }}" {{- with .Values.sidecar.notifiers.labelValue }} - name: LABEL_VALUE - value: {{ quote . }} + value: {{ quote (tpl . $root) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.notifiers.logLevel }} - name: LOG_LEVEL @@ -830,10 +830,10 @@ containers: - name: METHOD value: {{ .Values.sidecar.plugins.watchMethod }} - name: LABEL - value: "{{ .Values.sidecar.plugins.label }}" + value: "{{ tpl .Values.sidecar.plugins.label $root }}" {{- if .Values.sidecar.plugins.labelValue }} - name: LABEL_VALUE - value: {{ quote .Values.sidecar.plugins.labelValue }} + value: {{ quote (tpl .Values.sidecar.plugins.labelValue $) }} {{- end }} {{- if or .Values.sidecar.logLevel .Values.sidecar.plugins.logLevel }} - name: LOG_LEVEL diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 706f31f988..d4a09ad182 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -966,9 +966,9 @@ sidecar: env: {} # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true - # label that the configmaps with alert are marked with + # label that the configmaps with alert are marked with (can be templated) label: grafana_alert - # value of label that the configmaps with alert are set to + # value of label that the configmaps with alert are set to (can be templated) labelValue: "" # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. # logLevel: INFO @@ -1039,9 +1039,9 @@ sidecar: # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true SCProvider: true - # label that the configmaps with dashboards are marked with + # label that the configmaps with dashboards are marked with (can be templated) label: grafana_dashboard - # value of label that the configmaps with dashboards are set to + # value of label that the configmaps with dashboards are set to (can be templated) labelValue: "" # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. # logLevel: INFO @@ -1134,9 +1134,9 @@ sidecar: # key: value_key # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true - # label that the configmaps with datasources are marked with + # label that the configmaps with datasources are marked with (can be templated) label: grafana_datasource - # value of label that the configmaps with datasources are set to + # value of label that the configmaps with datasources are set to (can be templated) labelValue: "" # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. # logLevel: INFO @@ -1193,9 +1193,9 @@ sidecar: env: {} # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true - # label that the configmaps with plugins are marked with + # label that the configmaps with plugins are marked with (can be templated) label: grafana_plugin - # value of label that the configmaps with plugins are set to + # value of label that the configmaps with plugins are set to (can be templated) labelValue: "" # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. # logLevel: INFO @@ -1252,9 +1252,9 @@ sidecar: env: {} # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true - # label that the configmaps with notifiers are marked with + # label that the configmaps with notifiers are marked with (can be templated) label: grafana_notifier - # value of label that the configmaps with notifiers are set to + # value of label that the configmaps with notifiers are set to (can be templated) labelValue: "" # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. # logLevel: INFO