From f73f988057abe945e438cd201b2cb0c94c4869ec Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 04:19:35 +0530 Subject: [PATCH 001/152] gateway.service.additionalPorts default value set to array Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 9b815d1696..a1cc09edd9 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.7.5 +version: 1.7.6 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e28f0acd3c..f97855dfa2 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.5](https://img.shields.io/badge/Version-1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0e16fc70a8..5b27d68d6e 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1677,7 +1677,7 @@ gateway: # -- Labels for gateway service labels: {} # -- Additional ports to be opneed on gateway service (e.g. for RPC connections) - additionalPorts: {} + additionalPorts: [] # Gateway ingress configuration ingress: # -- Specifies whether an ingress for the gateway should be created From e5e109f624bff06f63b04ad278e4c7706bb8e859 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 05:08:40 +0530 Subject: [PATCH 002/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index f97855dfa2..7b6de90d80 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,7 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) + +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -41,6 +42,7 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. + ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -91,6 +93,7 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. + ### From chart version < 0.26.0 Version 0.26.0 @@ -434,7 +437,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.readinessProbe.timeoutSeconds | int | `1` | | | gateway.replicas | int | `1` | Number of replicas for the gateway | | gateway.resources | object | `{}` | Resource requests and limits for the gateway | -| gateway.service.additionalPorts | object | `{}` | Additional ports to be opneed on gateway service (e.g. for RPC connections) | +| gateway.service.additionalPorts | list | `[]` | Additional ports to be opneed on gateway service (e.g. for RPC connections) | | gateway.service.annotations | object | `{}` | Annotations for the gateway service | | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service | | gateway.service.labels | object | `{}` | Labels for gateway service | @@ -791,6 +794,7 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | + ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -844,6 +848,7 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. + ### Example configuration using S3 for storage ```yaml From 9562789b8cd91986f2cb453d47d675042f9b3744 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 05:21:20 +0530 Subject: [PATCH 003/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 7b6de90d80..8ebc8a2935 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,5 @@ # tempo-distributed - ![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -42,7 +41,6 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. - ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -93,7 +91,6 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. - ### From chart version < 0.26.0 Version 0.26.0 @@ -794,7 +791,6 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | - ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -848,7 +844,6 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. - ### Example configuration using S3 for storage ```yaml From 4579e5732fa48d03c95d510784aeef4664fd169f Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 05:27:29 +0530 Subject: [PATCH 004/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 8ebc8a2935..7b6de90d80 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,5 +1,6 @@ # tempo-distributed + ![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -41,6 +42,7 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. + ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -91,6 +93,7 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. + ### From chart version < 0.26.0 Version 0.26.0 @@ -791,6 +794,7 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | + ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -844,6 +848,7 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. + ### Example configuration using S3 for storage ```yaml From 6fc11c6551796c569f75438d79bd520381b6a33f Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 05:35:07 +0530 Subject: [PATCH 005/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 7b6de90d80..8ebc8a2935 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,5 @@ # tempo-distributed - ![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -42,7 +41,6 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. - ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -93,7 +91,6 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. - ### From chart version < 0.26.0 Version 0.26.0 @@ -794,7 +791,6 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | - ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -848,7 +844,6 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. - ### Example configuration using S3 for storage ```yaml From 81d6f37ed8e0d244b6706b3ae351dd4c9d11055d Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 05:38:26 +0530 Subject: [PATCH 006/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 8ebc8a2935..45100b91ff 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 82d25d076488e1b03a5d3e8bb937e95bbbd85563 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 01:53:48 +0530 Subject: [PATCH 007/152] Setting Custom Labels on Gateway Ingress is allowed now Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../tempo-distributed/templates/gateway/ingress-gateway.yaml | 3 +++ charts/tempo-distributed/values.yaml | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 9b815d1696..a1cc09edd9 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.7.5 +version: 1.7.6 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e28f0acd3c..f97855dfa2 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.5](https://img.shields.io/badge/Version-1.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/gateway/ingress-gateway.yaml b/charts/tempo-distributed/templates/gateway/ingress-gateway.yaml index 56691d89a2..f38d63cf8e 100644 --- a/charts/tempo-distributed/templates/gateway/ingress-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/ingress-gateway.yaml @@ -11,6 +11,9 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" (dict "ctx" . "component" "gateway") | nindent 4 }} + {{- with .Values.gateway.ingress.labels }} + {{- toYaml . | nindent 4}} + {{- end}} {{- with .Values.gateway.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0e16fc70a8..2e663ee749 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1675,7 +1675,8 @@ gateway: # -- Annotations for the gateway service annotations: {} # -- Labels for gateway service - labels: {} + labels: + external-dns.alpha.kubernetes.io/hostname: "" # -- Additional ports to be opneed on gateway service (e.g. for RPC connections) additionalPorts: {} # Gateway ingress configuration From 2dd07f1d3fdb6211ecff2d7589eff950b87b0d0a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 02:18:55 +0530 Subject: [PATCH 008/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index f97855dfa2..a2b401363f 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,7 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) + +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -41,6 +42,7 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. + ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -91,6 +93,7 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. + ### From chart version < 0.26.0 Version 0.26.0 @@ -437,7 +440,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.service.additionalPorts | object | `{}` | Additional ports to be opneed on gateway service (e.g. for RPC connections) | | gateway.service.annotations | object | `{}` | Annotations for the gateway service | | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service | -| gateway.service.labels | object | `{}` | Labels for gateway service | +| gateway.service.labels | object | `{"external-dns.alpha.kubernetes.io/hostname":""}` | Labels for gateway service | | gateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer | | gateway.service.nodePort | string | `nil` | Node port if service type is NodePort | | gateway.service.port | int | `80` | Port of the gateway service | @@ -791,6 +794,7 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | + ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -844,6 +848,7 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. + ### Example configuration using S3 for storage ```yaml From 06acb81c850e90e551883e6c21c445667f84f8b0 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 02:22:36 +0530 Subject: [PATCH 009/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a2b401363f..23514150af 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,5 @@ # tempo-distributed - ![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -42,7 +41,6 @@ helm delete my-release The command removes all the Kubernetes components associated with the chart and deletes the release. - ## Upgrading A major chart version change indicates that there is an incompatible breaking change needing manual actions. @@ -93,7 +91,6 @@ minio: ``` * allow configuration to be stored in a secret. See the documentation for `useExternalConfig` and `configStorageType` in the values file for more details. - ### From chart version < 0.26.0 Version 0.26.0 @@ -794,7 +791,6 @@ The other components are optional and must be explicitly enabled. | memcached | yes | | gateway | yes | - ## [Configuration](https://grafana.com/docs/tempo/latest/configuration/) This chart configures Tempo in microservices mode. @@ -848,7 +844,6 @@ global_overrides: * Volumes are mounted to `/var/tempo`. The various directories Tempo needs should be configured as subdirectories (e. g. `/var/tempo/wal`, `/var/tempo/traces`). Tempo will create the directories automatically. * The config file is mounted to `/conf/tempo-query.yaml` and passed as CLI arg. - ### Example configuration using S3 for storage ```yaml From 03d3de19d7e553882edac77ed6af73f79a3290ac Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 02:24:37 +0530 Subject: [PATCH 010/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 23514150af..80afc5f844 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,5 +1,4 @@ # tempo-distributed - ![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 0247d81b443982353e257fe6f43c980e7c225533 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 02:28:31 +0530 Subject: [PATCH 011/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 80afc5f844..5c6aa93ea1 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,5 +1,6 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) + +![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From db0e734cc8ae7846a213cfdbc8a802642d63fa08 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 21:49:18 +0530 Subject: [PATCH 012/152] Updated values.yaml Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/values.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 2e663ee749..cac509fdc0 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1675,14 +1675,16 @@ gateway: # -- Annotations for the gateway service annotations: {} # -- Labels for gateway service - labels: - external-dns.alpha.kubernetes.io/hostname: "" + labels: {} # -- Additional ports to be opneed on gateway service (e.g. for RPC connections) additionalPorts: {} # Gateway ingress configuration ingress: # -- Specifies whether an ingress for the gateway should be created enabled: false + # -- Labels for the gateway ingress + labels: + external-dns.alpha.kubernetes.io/hostname: "" # -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18 # ingressClassName: nginx # -- Annotations for the gateway ingress From 64a4bb84faf65930aae2446bac3a61389369edae Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 21:58:25 +0530 Subject: [PATCH 013/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 5c6aa93ea1..dc87d69e95 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -418,6 +418,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress | | gateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created | | gateway.ingress.hosts | list | `[{"host":"gateway.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | +| gateway.ingress.labels | object | `{"external-dns.alpha.kubernetes.io/hostname":""}` | Labels for the gateway ingress | | gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress | | gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating | | gateway.nginxConfig.httpSnippet | string | `""` | Allows appending custom configuration to the http block | @@ -437,7 +438,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.service.additionalPorts | object | `{}` | Additional ports to be opneed on gateway service (e.g. for RPC connections) | | gateway.service.annotations | object | `{}` | Annotations for the gateway service | | gateway.service.clusterIP | string | `nil` | ClusterIP of the gateway service | -| gateway.service.labels | object | `{"external-dns.alpha.kubernetes.io/hostname":""}` | Labels for gateway service | +| gateway.service.labels | object | `{}` | Labels for gateway service | | gateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer | | gateway.service.nodePort | string | `nil` | Node port if service type is NodePort | | gateway.service.port | int | `80` | Port of the gateway service | From 1517a581f3a014a0485d23be5d22d0cdbd3e7ba7 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 17 Jan 2024 22:17:33 +0530 Subject: [PATCH 014/152] Updated branch Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a1cc09edd9..4791cb9a9e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.7.6 +version: 1.7.7 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 274368daa3..6264a9d0e0 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.7](https://img.shields.io/badge/Version-1.7.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 3ebe708dd94b59e5c0048cf57148864a86914d61 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 18 Jan 2024 16:01:08 +0530 Subject: [PATCH 015/152] Resolved conflicts Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a1cc09edd9..4791cb9a9e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.7.6 +version: 1.7.7 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a430d7cb88..71419fa441 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.7.6](https://img.shields.io/badge/Version-1.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.7](https://img.shields.io/badge/Version-1.7.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 78938b40f2baa79842e9d9ca8302f97fa6a6c784 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 19 Jan 2024 20:57:00 +0530 Subject: [PATCH 016/152] Updated values.yaml Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 8bada25cef..b63cab2723 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1689,8 +1689,7 @@ gateway: # -- Specifies whether an ingress for the gateway should be created enabled: false # -- Labels for the gateway ingress - labels: - external-dns.alpha.kubernetes.io/hostname: "" + labels: {} # -- Ingress Class Name. MAY be required for Kubernetes versions >= 1.18 # ingressClassName: nginx # -- Annotations for the gateway ingress From 22d1e3592eb4ff30168ccf11a2ea8afc156be5ac Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 19 Jan 2024 21:05:03 +0530 Subject: [PATCH 017/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 1bcec88315..820426997e 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -418,7 +418,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress | | gateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created | | gateway.ingress.hosts | list | `[{"host":"gateway.tempo.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | -| gateway.ingress.labels | object | `{"external-dns.alpha.kubernetes.io/hostname":""}` | Labels for the gateway ingress | +| gateway.ingress.labels | object | `{}` | Labels for the gateway ingress | | gateway.ingress.tls | list | `[{"hosts":["gateway.tempo.example.com"],"secretName":"tempo-gateway-tls"}]` | TLS configuration for the gateway ingress | | gateway.nginxConfig.file | string | See values.yaml | Config file contents for Nginx. Passed through the `tpl` function to allow templating | | gateway.nginxConfig.httpSnippet | string | `""` | Allows appending custom configuration to the http block | From 7862f079edcc3ec2699c63c0dedab06ac67ade82 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 01:39:52 +0530 Subject: [PATCH 018/152] Added Network Policy for tempo Signed-off-by: Sheikh-Abubaker --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 2 +- charts/tempo/templates/networkpolicy.yaml | 61 ++++++++++++++++++++ charts/tempo/values.yaml | 69 +++++++++++++++++++++++ 4 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 charts/tempo/templates/networkpolicy.yaml diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 9830b9988b..5826d6ae22 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.1 +version: 1.7.2 appVersion: 2.3.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index f2db7c95b8..4c090ee0f5 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.1](https://img.shields.io/badge/Version-1.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) Grafana Tempo Single Binary Mode diff --git a/charts/tempo/templates/networkpolicy.yaml b/charts/tempo/templates/networkpolicy.yaml new file mode 100644 index 0000000000..7877d3314a --- /dev/null +++ b/charts/tempo/templates/networkpolicy.yaml @@ -0,0 +1,61 @@ +{{- if .Values.networkPolicy.enabled }} +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: {{ include "tempo.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "tempo.labels" . | nindent 4 }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + policyTypes: + {{- if .Values.networkPolicy.ingress }} + - Ingress + {{- end }} + {{- if .Values.networkPolicy.egress.enabled }} + - Egress + {{- end }} + podSelector: + matchLabels: + {{- include "tempo.selectorLabels" . | nindent 6 }} + + {{- if .Values.networkPolicy.egress.enabled }} + egress: + {{- if not .Values.networkPolicy.egress.blockDNSResolution }} + - ports: + - port: 53 + protocol: UDP + {{- end }} + - ports: + {{ .Values.networkPolicy.egress.ports | toJson }} + {{- with .Values.networkPolicy.egress.to }} + to: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.networkPolicy.ingress }} + ingress: + - ports: + - port: {{ .Values.service.targetPort }} + {{- if not .Values.networkPolicy.allowExternal }} + from: + - podSelector: + matchLabels: + {{ include "tempo.fullname" . }}-client: "true" + {{- with .Values.networkPolicy.explicitNamespacesSelector }} + - namespaceSelector: + {{- toYaml . | nindent 12 }} + {{- end }} + - podSelector: + matchLabels: + {{- include "tempo.labels" . | nindent 14 }} + role: read + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index e0a521d8e3..f9e6b6c7fa 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -10,6 +10,9 @@ replicas: 1 # -- Number of old history to retain to allow rollback (If not set, default Kubernetes value is set to 10) # revisionHistoryLimit: 1 +# -- labels for tempo +labels: {} + # -- Annotations for the StatefulSet annotations: {} @@ -256,6 +259,7 @@ service: type: ClusterIP annotations: {} labels: {} + targetPort: "" serviceMonitor: enabled: false @@ -294,3 +298,68 @@ affinity: {} # -- The name of the PriorityClass priorityClassName: null + +networkPolicy: + ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now. + ## + enabled: false + ## @param networkPolicy.allowExternal Don't require client label for connections + ## The Policy model to apply. When set to false, only pods with the correct + ## client label will have network access to tempo port defined. + ## When true, tempo will accept connections from any source + ## (with the correct destination port). + ## + ingress: true + ## @param networkPolicy.ingress When true enables the creation + ## an ingress network policy + ## + allowExternal: true + ## @param networkPolicy.explicitNamespacesSelector A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed + ## If explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace + ## and that match other criteria, the ones that have the good label, can reach the tempo. + ## But sometimes, we want the tempo to be accessible to clients from other namespaces, in this case, we can use this + ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added. + ## + ## Example: + ## explicitNamespacesSelector: + ## matchLabels: + ## role: frontend + ## matchExpressions: + ## - {key: role, operator: In, values: [frontend]} + ## + explicitNamespacesSelector: {} + ## + ## + ## + ## + ## + ## + egress: + ## @param networkPolicy.egress.enabled When enabled, an egress network policy will be + ## created allowing tempo to connect to external data sources from kubernetes cluster. + enabled: false + ## + ## @param networkPolicy.egress.blockDNSResolution When enabled, DNS resolution will be blocked + ## for all pods in the tempo namespace. + blockDNSResolution: false + ## + ## @param networkPolicy.egress.ports Add individual ports to be allowed by the egress + ports: [] + ## Add ports to the egress by specifying - port: + ## E.X. + ## - port: 80 + ## - port: 443 + ## + ## @param networkPolicy.egress.to Allow egress traffic to specific destinations + to: [] + ## Add destinations to the egress by specifying - ipBlock: + ## E.X. + ## to: + ## - namespaceSelector: + ## matchExpressions: + ## - {key: role, operator: In, values: [tempo]} + ## + ## + ## + ## + ## From 5d910885d71ae7d8bda17d7bbaff1f96da823cdf Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 01:46:06 +0530 Subject: [PATCH 019/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo/README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 4c090ee0f5..eef50ffce5 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -8,6 +8,7 @@ Grafana Tempo Single Binary Mode * + ## Values | Key | Type | Default | Description | @@ -18,7 +19,16 @@ Grafana Tempo Single Binary Mode | extraLabels | object | `{}` | | | extraVolumes | list | `[]` | Volumes to add | | fullnameOverride | string | `""` | Overrides the chart's computed fullname | +| labels | object | `{}` | labels for tempo | | nameOverride | string | `""` | Overrides the chart's name | +| networkPolicy.allowExternal | bool | `true` | | +| networkPolicy.egress.blockDNSResolution | bool | `false` | | +| networkPolicy.egress.enabled | bool | `false` | | +| networkPolicy.egress.ports | list | `[]` | | +| networkPolicy.egress.to | list | `[]` | | +| networkPolicy.enabled | bool | `false` | | +| networkPolicy.explicitNamespacesSelector | object | `{}` | | +| networkPolicy.ingress | bool | `true` | | | nodeSelector | object | `{}` | Node labels for pod assignment. See: https://kubernetes.io/docs/user-guide/node-selection/ | | persistence.accessModes[0] | string | `"ReadWriteOnce"` | | | persistence.enabled | bool | `false` | | @@ -30,6 +40,7 @@ Grafana Tempo Single Binary Mode | securityContext | object | `{}` | securityContext for container | | service.annotations | object | `{}` | | | service.labels | object | `{}` | | +| service.targetPort | string | `""` | | | service.type | string | `"ClusterIP"` | | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.automountServiceAccountToken | bool | `true` | | @@ -131,11 +142,11 @@ We recommend reviewing the [release notes](https://github.com/grafana/tempo/rele ### From Chart versions < 1.0.0 Please note that we've incremented the major version when upgrading to Tempo 2.0. There were a large number of -changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/) +changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/) and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgrade/) before upgrading. ### From Chart versions < 0.7.0 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`. -This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the +This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the old folder to the new. \ No newline at end of file From 27d7a469b07abe8c673227b248538a185e2888ff Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 01:49:40 +0530 Subject: [PATCH 020/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index eef50ffce5..d5eac67458 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -8,7 +8,6 @@ Grafana Tempo Single Binary Mode * - ## Values | Key | Type | Default | Description | From b39a68beab458d9fe9fcf2fa21b802506d7c2e26 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 01:54:28 +0530 Subject: [PATCH 021/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index d5eac67458..2516ce459e 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -141,11 +141,11 @@ We recommend reviewing the [release notes](https://github.com/grafana/tempo/rele ### From Chart versions < 1.0.0 Please note that we've incremented the major version when upgrading to Tempo 2.0. There were a large number of -changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/) +changes in this release (breaking and otherwise). It is encouraged to review the [release notes](https://grafana.com/docs/tempo/latest/release-notes/v2-0/) and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgrade/) before upgrading. ### From Chart versions < 0.7.0 Upgrading from pre 0.7.0 will, by default, move your trace storage from `/tmp/tempo/traces` to `/var/tempo/traces`. -This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the +This will cause Tempo to lose trace history. If you would like to retain history just copy the contents from the old folder to the new. \ No newline at end of file From 813d4cf3a254f1d34a4b46f898dfd3de4f1b74eb Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 14:10:01 +0530 Subject: [PATCH 022/152] Updated values.yaml Signed-off-by: Sheikh-Abubaker --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 3 ++- charts/tempo/values.yaml | 13 +++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 5826d6ae22..3adbb30e62 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.2 +version: 1.8.0 appVersion: 2.3.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 2516ce459e..b392c194b8 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) Grafana Tempo Single Binary Mode @@ -37,6 +37,7 @@ Grafana Tempo Single Binary Mode | priorityClassName | string | `nil` | The name of the PriorityClass | | replicas | int | `1` | Define the amount of instances | | securityContext | object | `{}` | securityContext for container | +| selectorLabels | object | `{}` | selectorLabels for tempo | | service.annotations | object | `{}` | | | service.labels | object | `{}` | | | service.targetPort | string | `""` | | diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index f9e6b6c7fa..986980fe48 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -13,6 +13,9 @@ replicas: 1 # -- labels for tempo labels: {} +# -- selectorLabels for tempo +selectorLabels: {} + # -- Annotations for the StatefulSet annotations: {} @@ -329,11 +332,6 @@ networkPolicy: ## explicitNamespacesSelector: {} ## - ## - ## - ## - ## - ## egress: ## @param networkPolicy.egress.enabled When enabled, an egress network policy will be ## created allowing tempo to connect to external data sources from kubernetes cluster. @@ -358,8 +356,3 @@ networkPolicy: ## - namespaceSelector: ## matchExpressions: ## - {key: role, operator: In, values: [tempo]} - ## - ## - ## - ## - ## From 389462d6921f36e60e23c3a73624cbc8a8b05048 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 22 Jan 2024 15:53:53 +0530 Subject: [PATCH 023/152] Updated values.yaml Signed-off-by: Sheikh-Abubaker --- charts/tempo/README.md | 1 - charts/tempo/values.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index b392c194b8..a04f9f8662 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -37,7 +37,6 @@ Grafana Tempo Single Binary Mode | priorityClassName | string | `nil` | The name of the PriorityClass | | replicas | int | `1` | Define the amount of instances | | securityContext | object | `{}` | securityContext for container | -| selectorLabels | object | `{}` | selectorLabels for tempo | | service.annotations | object | `{}` | | | service.labels | object | `{}` | | | service.targetPort | string | `""` | | diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 986980fe48..507aaf213e 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -13,9 +13,6 @@ replicas: 1 # -- labels for tempo labels: {} -# -- selectorLabels for tempo -selectorLabels: {} - # -- Annotations for the StatefulSet annotations: {} From e19284ef25d54cb7c1baa8fa9a5f429183a99337 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 24 Jan 2024 00:38:15 +0530 Subject: [PATCH 024/152] Fixed indentation of deployment.strategy in value.yaml Signed-off-by: Sheikh-Abubaker --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- charts/promtail/values.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 555eb23705..e938d73a70 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 2.9.2 -version: 6.15.3 +version: 6.15.4 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 03799f9463..a2913c858c 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.15.3](https://img.shields.io/badge/Version-6.15.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square) +![Version: 6.15.4](https://img.shields.io/badge/Version-6.15.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index b483599002..f40c48ca21 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -58,9 +58,9 @@ deployment: targetMemoryUtilizationPercentage: # behavior: {} - # -- Set deployment object update strategy - strategy: - type: RollingUpdate + # -- Set deployment object update strategy + strategy: + type: RollingUpdate secret: # -- Labels for the Secret From 05f79a73ea3782df145d612c35a653786193f3dd Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 24 Jan 2024 00:46:47 +0530 Subject: [PATCH 025/152] Updated README.md Signed-off-by: Sheikh-Abubaker --- charts/promtail/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/promtail/README.md b/charts/promtail/README.md index a2913c858c..381f51745a 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -96,11 +96,11 @@ The new release which will pick up again from the existing `positions.yaml`. | deployment.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for the deployment | | deployment.autoscaling.maxReplicas | int | `10` | | | deployment.autoscaling.minReplicas | int | `1` | | -| deployment.autoscaling.strategy | object | `{"type":"RollingUpdate"}` | Set deployment object update strategy | | deployment.autoscaling.targetCPUUtilizationPercentage | int | `80` | | | deployment.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | | | deployment.enabled | bool | `false` | Deploys Promtail as a Deployment | | deployment.replicaCount | int | `1` | | +| deployment.strategy | object | `{"type":"RollingUpdate"}` | Set deployment object update strategy | | enableServiceLinks | bool | `true` | Configure enableServiceLinks in pod | | extraArgs | list | `[]` | | | extraContainers | object | `{}` | | From c3be1ac3bd4082759e5340cf8e25e456f786f4e4 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 25 Jan 2024 01:34:25 +0530 Subject: [PATCH 026/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 0bab675544..ff14820528 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 2.9.3 -version: 6.15.4 +version: 6.15.5 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index e45557b062..863f0b8168 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.15.4](https://img.shields.io/badge/Version-6.15.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 6.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance From 0acf47d92fe4379d6c3fb0b907de159b44fa1221 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 25 Jan 2024 01:45:11 +0530 Subject: [PATCH 027/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 95b56b5943..e1e1b5478b 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.1 +version: 1.8.2 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 46fb1fc34f..8e066ac139 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From d974078626b078879d1dcd268222ec510f5df138 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 25 Jan 2024 01:54:09 +0530 Subject: [PATCH 028/152] Bumped Chart version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 95b56b5943..e1e1b5478b 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.1 +version: 1.8.2 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index c324f9752c..b4b00af719 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 0a332085c386866fe55223fcfbc8ea88078a9a84 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sun, 4 Feb 2024 15:26:08 +0530 Subject: [PATCH 029/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index ff14820528..fa9bec5146 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 2.9.3 -version: 6.15.5 +version: 6.15.6 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 863f0b8168..fa0c3cc4a8 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 6.15.6](https://img.shields.io/badge/Version-6.15.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance From 024f480617382eb7194d130f8285e7bf8071dd02 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sun, 4 Feb 2024 15:29:11 +0530 Subject: [PATCH 030/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index e1e1b5478b..97d9d2b5fd 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.2 +version: 1.8.3 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 8e066ac139..9e2b8aefa3 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From dae01e86b9535f0b747757fe5d55ddd9c4d07498 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sun, 4 Feb 2024 15:31:21 +0530 Subject: [PATCH 031/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index e1e1b5478b..97d9d2b5fd 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.2 +version: 1.8.3 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index b4b00af719..60564595ba 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From f5d75b92104324a26967c49e36440244c563220e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 7 Feb 2024 23:19:50 +0530 Subject: [PATCH 032/152] Bumped version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 97d9d2b5fd..6e04c1a684 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.3 +version: 1.8.4 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 771bf095ab..23fc8ec936 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From bf832dba3eb60ae26fed69164b3fcebcf5577932 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 7 Feb 2024 23:26:10 +0530 Subject: [PATCH 033/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 97d9d2b5fd..6e04c1a684 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.3 +version: 1.8.4 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ebc9c0af74..cfab024285 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From df5da8ef65af9344e292be3b45fb98d7880824b1 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 17 Feb 2024 22:58:12 +0530 Subject: [PATCH 034/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6e04c1a684..5f9ec77378 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.4 +version: 1.8.5 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a5bc7baef8..4c6b4a53c7 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From ab44369682c6b5cf33d39964ee407bc41e9afd30 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 17 Feb 2024 23:03:12 +0530 Subject: [PATCH 035/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6e04c1a684..5f9ec77378 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.4 +version: 1.8.5 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e031449400..cbd0b0c15d 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 362f28fc35a34ce4f6cd59758725557fcbc7f6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikolai=20R=C3=B8ed=20Kristiansen?= Date: Mon, 11 Mar 2024 09:58:29 +0100 Subject: [PATCH 036/152] [grafana] Allow hiding persistence warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is fine if you have configured grafana.ini to use something that is not sqlite Signed-off-by: Nikolai Røed Kristiansen --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 6 +++++- charts/grafana/templates/NOTES.txt | 2 +- charts/grafana/values.yaml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 27d41d8200..0d8eb8364d 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.5 +version: 7.3.6 appVersion: 10.3.3 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 0ff07f297d..06e9a954a7 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -119,6 +119,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` | @@ -275,7 +276,7 @@ need to instead set `global.imageRegistry`. | `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.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` | @@ -437,6 +438,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 @@ -591,6 +593,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 @@ -608,6 +611,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/templates/NOTES.txt b/charts/grafana/templates/NOTES.txt index d86419fe23..a40f666a47 100644 --- 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/values.yaml b/charts/grafana/values.yaml index 65dabd2506..61519c70de 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -370,6 +370,7 @@ persistence: # existingClaim: ## Extra labels to apply to a PVC. extraPvcLabels: {} + disableWarning: false ## If persistence is not enabled, this allows to mount the ## local storage in-memory to improve performance From 22df0a34b0482beee898f3135a2984269ad06853 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 12 Mar 2024 07:23:50 +0800 Subject: [PATCH 037/152] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 0d8eb8364d..41ed07224e 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.6 +version: 7.3.7 appVersion: 10.3.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From c00c56a97f070e549a4742b8d6e7665d2882a8bd Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 12 Mar 2024 07:29:39 +0800 Subject: [PATCH 038/152] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 41ed07224e..eba0ad61b2 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.7 +version: 7.4.0 appVersion: 10.3.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 4d5a1c09f163b847e6bf4d483829f1f049244615 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 14 Mar 2024 22:40:49 +0530 Subject: [PATCH 039/152] Bumped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 5f9ec77378..d1dff04598 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.5 +version: 1.8.6 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 67d2b9b89b..298263ecf7 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.6](https://img.shields.io/badge/Version-1.8.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 203c63d5bca34cccdbe12a9b3e8374e4661a1411 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 14 Mar 2024 22:43:43 +0530 Subject: [PATCH 040/152] Bunped Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 5f9ec77378..d1dff04598 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.8.5 +version: 1.8.6 appVersion: 2.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index b37f3a764f..d50fa7eb4d 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.6](https://img.shields.io/badge/Version-1.8.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode From ac0941e25d0de474a5423fc4e79a10e355516f5e Mon Sep 17 00:00:00 2001 From: Jaroslaw Miszczak Date: Fri, 5 Apr 2024 01:40:41 +0200 Subject: [PATCH 041/152] Adding configmap annotation with example in values file how to use it with ArgoCD in case configmap is too big. Signed-off-by: jmiszczak Signed-off-by: Jaroslaw Miszczak --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/configmap.yaml | 9 +++++++-- charts/grafana/values.yaml | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index ab3f6a3636..7127c28b43 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.7 +version: 7.3.8 appVersion: 10.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/configmap.yaml b/charts/grafana/templates/configmap.yaml index 7d7428be51..0a2edf47e3 100644 --- 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/values.yaml b/charts/grafana/values.yaml index 81fcda59a0..391866a2b2 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -198,6 +198,10 @@ downloadDashboards: ## Pod Annotations # podAnnotations: {} +## ConfigMap Annotations +# configMapAnnotations: {} + # argocd.argoproj.io/sync-options: Replace=true + ## Pod Labels # podLabels: {} From 121a8967a64476d56b6a4542b745dc9b7abba03e Mon Sep 17 00:00:00 2001 From: Maksym Lisogorskyi Date: Thu, 18 Apr 2024 13:23:27 +0100 Subject: [PATCH 042/152] issue/2980 upgraded lgtm-distributed dependencies Signed-off-by: Maksym Lisogorskyi --- charts/lgtm-distributed/Chart.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 04cf805e07..79bc3cf68f 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v2 name: lgtm-distributed description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack type: application -version: 1.0.1 -appVersion: "6.59.4" +version: 2.0.0 +appVersion: "^7.3.9" home: https://grafana.com/oss/ icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116 @@ -44,19 +44,19 @@ dependencies: alias: grafana condition: grafana.enabled repository: https://grafana.github.io/helm-charts - version: "^6.59.4" + version: "^7.3.9" - name: loki-distributed alias: loki condition: loki.enabled repository: "https://grafana.github.io/helm-charts" - version: "^0.74.3" + version: "^0.79.0" - name: mimir-distributed alias: mimir condition: mimir.enabled repository: "https://grafana.github.io/helm-charts" - version: "^5.0.0" + version: "^5.3.0" - name: tempo-distributed alias: tempo condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" - version: "^1.6.4" + version: "^1.9.2" From 25e6e4fad18559e0f388a8073bc8e6f2521726cf Mon Sep 17 00:00:00 2001 From: Maksym Lisogorskyi Date: Thu, 18 Apr 2024 13:27:31 +0100 Subject: [PATCH 043/152] issue/2980 generated new readme Signed-off-by: Maksym Lisogorskyi --- charts/lgtm-distributed/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index 76c4bae8db..ad3c7d0c4e 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -1,6 +1,6 @@ # lgtm-distributed -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.59.4](https://img.shields.io/badge/AppVersion-6.59.4-informational?style=flat-square) +![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square) Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack @@ -24,10 +24,10 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | Repository | Name | Version | |------------|------|---------| -| https://grafana.github.io/helm-charts | grafana(grafana) | ^6.59.4 | -| https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.74.3 | -| https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.0.0 | -| https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.6.4 | +| https://grafana.github.io/helm-charts | grafana(grafana) | ^7.3.9 | +| https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.79.0 | +| https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.3.0 | +| https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.9.2 | ## Values From 6a3b40aec2482f48299da07de0b1155d47045b60 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 19 Apr 2024 18:11:17 +0530 Subject: [PATCH 044/152] Bumped chart version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 41429d7631..4153f810d7 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.2 +version: 1.9.3 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e1a1f0fbb5..7061d6f1ff 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 6f090e30b889ef9de0160097f0e87cbf9c8fe6c0 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 19 Apr 2024 18:13:41 +0530 Subject: [PATCH 045/152] Bump Chart Version Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 41429d7631..4153f810d7 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.2 +version: 1.9.3 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 88bf574c69..5b366ea779 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.3](https://img.shields.io/badge/Version-1.9.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode From 4796dbb2b6f584c3372d1a787a1f39f02ac3ab68 Mon Sep 17 00:00:00 2001 From: footur <3769085+Footur@users.noreply.github.com> Date: Tue, 7 May 2024 10:49:22 +0000 Subject: [PATCH 046/152] Update Loki to v2.9.8 Signed-off-by: footur <3769085+Footur@users.noreply.github.com> --- charts/loki-distributed/Chart.yaml | 4 ++-- charts/loki-distributed/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index f6befe5899..62b62a61cd 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application -appVersion: 2.9.6 -version: 0.79.0 +appVersion: 2.9.8 +version: 0.79.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index d40ea8b510..5fb930a22d 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.79.0](https://img.shields.io/badge/Version-0.79.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) +![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.8](https://img.shields.io/badge/AppVersion-2.9.8-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode From 248fa69d1fe43434c8bb29bf1dc219c530dab034 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 15 May 2024 17:53:24 +0000 Subject: [PATCH 047/152] [tempo-distributed] Update for v2.4.2 release Signed-off-by: Zach Leslie --- charts/tempo-distributed/Chart.yaml | 4 ++-- charts/tempo-distributed/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 4cd2f6cd74..1ab1d88267 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.9 -appVersion: 2.4.1 +version: 1.9.10 +appVersion: 2.4.2 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 7e3f743496..fe2b1a0a2f 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.9](https://img.shields.io/badge/Version-1.9.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.10](https://img.shields.io/badge/Version-1.9.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) Grafana Tempo in MicroService mode From afeca842cf8fcb36ff0506edfaaa257eebb8d321 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 15 May 2024 17:54:46 +0000 Subject: [PATCH 048/152] [tempo] Update for v2.4.2 release Signed-off-by: Zach Leslie --- charts/tempo/Chart.yaml | 4 ++-- charts/tempo/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 5dfa24f2e6..ee09ebd7c8 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.3 -appVersion: 2.3.1 +version: 1.8.0 +appVersion: 2.4.2 engine: gotpl home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 07321130fd..4eec988285 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) Grafana Tempo Single Binary Mode From a96f07fd47ff35e19409f493376c32c17131421e Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Wed, 15 May 2024 19:07:13 +0100 Subject: [PATCH 049/152] Update to Agent v0.40.5 Signed-off-by: Paulin Todev --- charts/agent-operator/Chart.yaml | 8 ++++---- charts/agent-operator/README.md | 6 +++--- charts/agent-operator/values.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 7f83bf24b1..60e55344da 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.21 -appVersion: "0.40.4" +version: 0.3.22 +appVersion: "0.40.5" home: https://grafana.com/docs/agent/v0.40/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.40.4/docs/sources/assets/logo_and_name.png +icon: https://raw.githubusercontent.com/grafana/agent/v0.40.5/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.40.4/pkg/operator + - https://github.com/grafana/agent/tree/v0.40.5/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 693da6935e..8500500acd 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.21](https://img.shields.io/badge/Version-0.3.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square) +![Version: 0.3.22](https://img.shields.io/badge/Version-0.3.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.5](https://img.shields.io/badge/AppVersion-0.40.5-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.40.4"` | Image tag | +| image.tag | string | `"v0.40.5"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index b1610a0321..ed005a5492 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.40.4 + tag: v0.40.5 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets From a5923d9e82fd1aad7e46752dbdb6fcfaf1ab8747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 19 May 2024 09:59:28 +0200 Subject: [PATCH 050/152] [grafana] Update Grafana to 11.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f9b619ef6c..f4a6f85a1a 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 7.3.11 -appVersion: 10.4.1 +version: 8.0.0 +appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 0a399094e337cc44e5b9400332e53706295d8de0 Mon Sep 17 00:00:00 2001 From: Mathieu Herbert Date: Mon, 20 May 2024 11:50:57 +0200 Subject: [PATCH 051/152] [synthetic-monitoring-agent] feat: add support for existing secret Signed-off-by: Mathieu Herbert --- charts/synthetic-monitoring-agent/Chart.yaml | 2 +- charts/synthetic-monitoring-agent/README.md | 5 +++-- charts/synthetic-monitoring-agent/templates/deployment.yaml | 2 +- charts/synthetic-monitoring-agent/templates/secret.yaml | 4 +++- charts/synthetic-monitoring-agent/values.yaml | 6 +++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index acf3ac73b5..f5d62363a7 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -15,4 +15,4 @@ name: synthetic-monitoring-agent sources: - https://github.com/grafana/synthetic-monitoring-agent type: application -version: 0.2.0 +version: 0.3.0 diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 9e9a4192a1..415439a498 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -1,6 +1,6 @@ # synthetic-monitoring-agent -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. @@ -28,7 +28,7 @@ Kubernetes: `^1.16.0-0` |-----|------|---------|-------------| | affinity | object | `{}` | Node affinity for pod assignment. | | agent.apiServerAddress | string | `"synthetic-monitoring-grpc.grafana.net:443"` | Default server endpoint for receiving synthetic monitoring checks on Grafana's side. See https://grafana.com/docs/grafana-cloud/synthetic-monitoring/private-probes/#probe-api-server-url for more information. | -| agent.apiToken | string | `""` | **REQUIRED** API token from Grafana Cloud. | +| agent.apiToken | string | `""` | API token from Grafana Cloud when secret is created by the chart. | | agent.debug | bool | `false` | Enable / disable debug logging on the agent. | | agent.enableDisconnect | bool | `false` | Enable / disable the HTTP /disconnect endpoint | | agent.verbose | bool | `false` | Enable / disable verbose logging on the agent. | @@ -54,6 +54,7 @@ Kubernetes: `^1.16.0-0` | readinessProbe | object | `{"httpGet":{"path":"/ready","port":"http"}}` | Readiness probe for the agent | | replicaCount | int | `1` | Number of replicas to use; ignored if `autoscaling.enabled` is set to `true`. | | resources | object | `{}` | Default resources to apply. | +| secret.existingSecret | string | `""` | Reference an existing secret for API token | | securityContext | object | `{"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65534}` | Security context for the container level. | | service.annotations | object | `{}` | Annotations for the service | | service.port | int | `4050` | Service port. | diff --git a/charts/synthetic-monitoring-agent/templates/deployment.yaml b/charts/synthetic-monitoring-agent/templates/deployment.yaml index 137177aabb..7fde2e0540 100644 --- a/charts/synthetic-monitoring-agent/templates/deployment.yaml +++ b/charts/synthetic-monitoring-agent/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: valueFrom: secretKeyRef: key: api-token - name: {{ include "synthetic-monitoring-agent.fullname" . }} + name: {{ (tpl .Values.secret.existingSecret .) | default (include "synthetic-monitoring-agent.fullname" .) }} name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} diff --git a/charts/synthetic-monitoring-agent/templates/secret.yaml b/charts/synthetic-monitoring-agent/templates/secret.yaml index ce2ed51f73..1d363b7656 100644 --- a/charts/synthetic-monitoring-agent/templates/secret.yaml +++ b/charts/synthetic-monitoring-agent/templates/secret.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.secret.existingSecret }} apiVersion: v1 kind: Secret metadata: @@ -6,4 +7,5 @@ metadata: {{- include "synthetic-monitoring-agent.labels" . | nindent 4 }} type: Opaque data: - api-token: {{ required "A valid .Values.agent.apiToken is required!" .Values.agent.apiToken | b64enc }} + api-token: {{ .Values.agent.apiToken | b64enc }} +{{- end }} \ No newline at end of file diff --git a/charts/synthetic-monitoring-agent/values.yaml b/charts/synthetic-monitoring-agent/values.yaml index f924c53634..970450d196 100644 --- a/charts/synthetic-monitoring-agent/values.yaml +++ b/charts/synthetic-monitoring-agent/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. agent: - # -- **REQUIRED** API token from Grafana Cloud. + # -- API token from Grafana Cloud when secret is created by the chart. apiToken: "" # -- Default server endpoint for receiving synthetic monitoring checks on Grafana's side. # See https://grafana.com/docs/grafana-cloud/synthetic-monitoring/private-probes/#probe-api-server-url for more information. @@ -148,3 +148,7 @@ affinity: {} # -- Add dynamic manifests via values: extraObjects: [] + +secret: +# -- Reference an existing secret for API token + existingSecret: "" \ No newline at end of file From 9c413df0312de44b93bde5fa18b0c81b1145a8e3 Mon Sep 17 00:00:00 2001 From: Mathieu Herbert Date: Mon, 20 May 2024 11:51:53 +0200 Subject: [PATCH 052/152] add values end of file Signed-off-by: Mathieu Herbert --- charts/synthetic-monitoring-agent/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/synthetic-monitoring-agent/values.yaml b/charts/synthetic-monitoring-agent/values.yaml index 970450d196..a6e534844c 100644 --- a/charts/synthetic-monitoring-agent/values.yaml +++ b/charts/synthetic-monitoring-agent/values.yaml @@ -151,4 +151,4 @@ extraObjects: [] secret: # -- Reference an existing secret for API token - existingSecret: "" \ No newline at end of file + existingSecret: "" From e576a7fba2691139ad3f396b421b6f28b9404250 Mon Sep 17 00:00:00 2001 From: Sem Schilder Date: Fri, 17 May 2024 12:25:33 +0200 Subject: [PATCH 053/152] Update Grafana version Update Grafana version Signed-off-by: Sem Schilder --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f9b619ef6c..2cf3b19d5d 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 7.3.11 -appVersion: 10.4.1 +version: 7.3.12 +appVersion: 10.4.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 7cbcd42f73cf9dd5cf291ba73f0f569f671d16b8 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 4 Apr 2024 15:37:11 +0300 Subject: [PATCH 054/152] add apiVersion and kind to pvc template in ingester sts Signed-off-by: AvivGuiser --- .../templates/ingester/statefulset-ingester.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index de84ca588b..56d3ab5327 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -151,7 +151,9 @@ spec: {{- end }} {{- else }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: {{- with .Values.ingester.persistence.annotations }} annotations: {{- toYaml . | nindent 10 }} From b512c2b273f7ca6de5a4b574dbdeb06ccc59f5bb Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 4 Apr 2024 15:38:27 +0300 Subject: [PATCH 055/152] add apiVersion and kind to pvc template in metrics-generator sts Signed-off-by: AvivGuiser --- .../metrics-generator/statefulset-metrics-generator.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index 02e330eda6..5f1737ddc7 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -140,7 +140,9 @@ spec: emptyDir: {{- toYaml .Values.metricsGenerator.walEmptyDir | nindent 12 }} {{- else }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: {{- with .Values.metricsGenerator.persistence.annotations }} annotations: {{- toYaml . | nindent 10 }} From af9e638bd41835c75485c4a5e3b05cb60fdd7365 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 27 May 2024 16:21:08 +0300 Subject: [PATCH 056/152] bump chart version Signed-off-by: AvivGuiser --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 1ab1d88267..1c9d10771e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.10 +version: 1.9.11 appVersion: 2.4.2 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 9dc0004151314eb8bff1a9904ed27a2e1fe6bf07 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 27 May 2024 16:23:41 +0300 Subject: [PATCH 057/152] ran helm-docs Signed-off-by: AvivGuiser --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index fe2b1a0a2f..9623d9faaf 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.10](https://img.shields.io/badge/Version-1.9.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) +![Version: 1.9.11](https://img.shields.io/badge/Version-1.9.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) Grafana Tempo in MicroService mode From fe858389732b4781564ea9b9fd39db3600230ff9 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 30 May 2024 11:09:31 -0600 Subject: [PATCH 058/152] chore: promtail update Signed-off-by: Micah Nagel --- .github/workflows/update-helm-repo.yaml | 46 ++++++++++--------- charts/agent-operator/Chart.yaml | 8 ++-- charts/agent-operator/README.md | 6 +-- charts/agent-operator/values.yaml | 2 +- charts/grafana-sampling/Chart.yaml | 2 +- charts/grafana-sampling/README.md | 2 +- .../_otelcol_processor_batch.river.txt | 2 +- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_helpers.tpl | 12 ++--- charts/grafana/templates/pvc.yaml | 3 ++ charts/grafana/templates/tests/test.yaml | 4 ++ charts/grafana/values.yaml | 7 +++ charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 5 +- charts/loki-distributed/README.md.gotmpl | 3 ++ .../compactor/deployment-compactor.yaml | 1 - charts/loki-distributed/values.yaml | 1 + charts/promtail/Chart.yaml | 4 +- charts/promtail/README.md | 9 ++-- .../promtail/templates/service-metrics.yaml | 5 +- charts/promtail/values.yaml | 11 ++++- charts/tempo-distributed/Chart.yaml | 4 +- charts/tempo-distributed/README.md | 18 +++++++- charts/tempo-distributed/README.md.gotmpl | 2 +- .../templates/admin-api/_helpers.tpl | 7 +++ .../templates/admin-api/admin-api-dep.yaml | 7 +-- .../templates/enterprise-gateway/_helpers.tpl | 8 ++++ .../enterprise-gateway/gateway-dep.yaml | 7 +-- .../ingester/statefulset-ingester.yaml | 6 ++- .../templates/lib/service-monitor.tpl | 3 +- .../statefulset-metrics-generator.yaml | 6 ++- .../templates/tokengen/__helpers.tpl | 7 +++ .../templates/tokengen/tokengen-job.yaml | 8 +--- charts/tempo-distributed/values.yaml | 35 ++++++++++++++ charts/tempo/Chart.yaml | 4 +- charts/tempo/README.md | 2 +- charts/tempo/values.yaml | 2 +- 37 files changed, 180 insertions(+), 83 deletions(-) create mode 100644 charts/tempo-distributed/templates/admin-api/_helpers.tpl create mode 100644 charts/tempo-distributed/templates/tokengen/__helpers.tpl diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index 8382c1f231..5716b07eb5 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -79,15 +79,15 @@ jobs: if [ $(git tag -l "${name}-${version}") ]; then echo "Tag ${tagname} already exists, skipping release" - echo "::set-output name=changed::false" + echo "changed=false" >> $GITHUB_OUTPUT else echo "Releasing ${changed}" - echo "::set-output name=changed::true" - echo "::set-output name=chartpath::${changed}" + echo "changed=true" >> $GITHUB_OUTPUT + echo "chartpath=${changed}" >> $GITHUB_OUTPUT fi else echo "No charts have changed, skipping release" - echo "::set-output name=changed::false" + echo "changed=false" >> $GITHUB_OUTPUT fi release: @@ -145,19 +145,6 @@ jobs: with: version: v3.5.2 - - name: Add dependency chart repos - # Todo replace this by https://github.com/grafana/helm-charts/issues/1534 - run: | - helm repo add elastic https://helm.elastic.co - helm repo add grafana https://grafana.github.io/helm-charts - helm repo add prometheus https://prometheus-community.github.io/helm-charts - helm repo add bitnami https://charts.bitnami.com/bitnami - helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami - helm repo add hashicorp https://helm.releases.hashicorp.com - helm repo add minio-new https://charts.min.io - helm repo add jetstack https://charts.jetstack.io - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx - - name: Parse Chart.yaml id: parse-chart run: | @@ -166,14 +153,29 @@ jobs: description=$(yq ".description" < ${changed}/Chart.yaml) name=$(yq ".name" < ${changed}/Chart.yaml) version=$(yq ".version" < ${changed}/Chart.yaml) - echo "::set-output name=chartpath::${changed}" - echo "::set-output name=desc::${description}" + echo "chartpath=${changed}" >> $GITHUB_OUTPUT + echo "desc=${description}" >> $GITHUB_OUTPUT if [[ -n "${HELM_TAG_PREFIX}" ]]; then - echo "::set-output name=tagname::${HELM_TAG_PREFIX}-${name}-${version}" + echo "tagname=${HELM_TAG_PREFIX}-${name}-${version}" >> $GITHUB_OUTPUT else - echo "::set-output name=tagname::${name}-${version}" + echo "tagname=${name}-${version}" >> $GITHUB_OUTPUT fi - echo "::set-output name=packagename::${name}-${version}" + echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT + + - name: Add dependency chart repos + run: | + cd source + # Skip the header line and make sure that tabs are expanded into spaces + deps=$(helm dependency list "${{ steps.parse-chart.outputs.chartpath }}" | tail +2 | expand) + while read -r row; do + IFS=' ' read -ra parts <<< "$row" + name="${parts[0]}" + repo="${parts[2]}" + case "$repo" in + "https://"*) helm repo add "$name" "$repo" ;; + *) echo >&2 "Skipping dependency $name: unsupported schema for \"$repo\"" ;; + esac + done <<< "$deps" - name: Install CR tool run: | diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 7f83bf24b1..60e55344da 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.21 -appVersion: "0.40.4" +version: 0.3.22 +appVersion: "0.40.5" home: https://grafana.com/docs/agent/v0.40/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.40.4/docs/sources/assets/logo_and_name.png +icon: https://raw.githubusercontent.com/grafana/agent/v0.40.5/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.40.4/pkg/operator + - https://github.com/grafana/agent/tree/v0.40.5/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 693da6935e..8500500acd 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.21](https://img.shields.io/badge/Version-0.3.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square) +![Version: 0.3.22](https://img.shields.io/badge/Version-0.3.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.5](https://img.shields.io/badge/AppVersion-0.40.5-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.40.4"` | Image tag | +| image.tag | string | `"v0.40.5"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index b1610a0321..ed005a5492 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.40.4 + tag: v0.40.5 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml index 44e076b128..a5b985588b 100644 --- a/charts/grafana-sampling/Chart.yaml +++ b/charts/grafana-sampling/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-sampling description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. type: application -version: 0.1.0 +version: 0.1.1 appVersion: "v0.40.2" sources: - https://github.com/grafana/agent diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 6ad9785b72..0c10e0ec84 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. diff --git a/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt b/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt index 4c1f6b58cb..25fb2ef497 100644 --- a/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt +++ b/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt @@ -12,7 +12,7 @@ otelcol.processor.batch "default" { otelcol.processor.batch "default" { // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.batch/ output { - {{ if .Values.metricsGeneration.Enabled }} + {{ if .Values.metricsGeneration.enabled }} metrics = [otelcol.exporter.prometheus.grafana_cloud_prometheus.input] {{ end }} traces = [otelcol.exporter.otlp.grafana_cloud_tempo.input] diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 167bdf17a8..f9b619ef6c 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.8 +version: 7.3.11 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 790d5a293a..f3ebc37c93 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress. Return the appropriate apiVersion for Horizontal Pod Autoscaler. */}} {{- define "grafana.hpa.apiVersion" -}} -{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2" }} -{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2beta2" }} -{{- else }} -{{- print "autoscaling/v2beta1" }} -{{- end }} +{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} +{{- print "autoscaling/v2" }} +{{- else }} +{{- print "autoscaling/v2beta2" }} +{{- end }} {{- end }} {{/* diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml index eb8f87f077..c0edad2c46 100644 --- a/charts/grafana/templates/pvc.yaml +++ b/charts/grafana/templates/pvc.yaml @@ -25,6 +25,9 @@ spec: resources: requests: storage: {{ .Values.persistence.size | quote }} + {{- if (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 }} storageClassName: {{ . }} {{- end }} diff --git a/charts/grafana/templates/tests/test.yaml b/charts/grafana/templates/tests/test.yaml index 15067ae307..9e88afcfa0 100644 --- a/charts/grafana/templates/tests/test.yaml +++ b/charts/grafana/templates/tests/test.yaml @@ -41,6 +41,10 @@ spec: - mountPath: /tests name: tests readOnly: true + {{- with .Values.testFramework.resources }} + resources: + {{- toYaml . | nindent 8 }} + {{- end }} volumes: - name: tests configMap: diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 81fcda59a0..a327a7a01e 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -121,6 +121,13 @@ testFramework: tag: "v1.4.1" imagePullPolicy: IfNotPresent securityContext: {} + resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi # dns configuration for pod dnsPolicy: ~ diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index efdd9ead60..f6befe5899 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.9.6 -version: 0.78.5 +version: 0.79.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index c84763a8ff..d40ea8b510 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.78.5](https://img.shields.io/badge/Version-0.78.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) +![Version: 0.79.0](https://img.shields.io/badge/Version-0.79.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -24,6 +24,9 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. +### From 0.78.x to 0.79.0 +Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. + ### From 0.74.x to 0.75.0 The Index Gateway and Query Scheduler now expose the memberlist port 7946. In order to join the member list, you need to specify this in the `structuredConfig`: diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl index 4c1967c807..23153d19b2 100644 --- a/charts/loki-distributed/README.md.gotmpl +++ b/charts/loki-distributed/README.md.gotmpl @@ -22,6 +22,9 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. +### From 0.78.x to 0.79.0 +Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. + ### From 0.74.x to 0.75.0 The Index Gateway and Query Scheduler now expose the memberlist port 7946. In order to join the member list, you need to specify this in the `structuredConfig`: diff --git a/charts/loki-distributed/templates/compactor/deployment-compactor.yaml b/charts/loki-distributed/templates/compactor/deployment-compactor.yaml index f6b440931c..80601c7725 100644 --- a/charts/loki-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/loki-distributed/templates/compactor/deployment-compactor.yaml @@ -67,7 +67,6 @@ spec: args: - -config.file=/etc/loki/config/config.yaml - -target=compactor - - -boltdb.shipper.compactor.working-directory=/var/loki/compactor {{- with .Values.compactor.extraArgs }} {{- toYaml . | nindent 12 }} {{- end }} diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index 0f0bc1624a..15e9343e84 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -212,6 +212,7 @@ loki: compactor: shared_store: filesystem + working_directory: /var/loki/compactor ruler: storage: diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index ff14820528..24fa5edac6 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application -appVersion: 2.9.3 -version: 6.15.5 +appVersion: 3.0.0 +version: 6.16.0 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 19b9a14b59..a22d448157 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.15.5](https://img.shields.io/badge/Version-6.15.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 6.16.0](https://img.shields.io/badge/Version-6.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance @@ -143,6 +143,9 @@ The new release which will pick up again from the existing `positions.yaml`. | resources | object | `{}` | Resource requests and limits | | secret.annotations | object | `{}` | Annotations for the Secret | | secret.labels | object | `{}` | Labels for the Secret | +| service.annotations | object | `{}` | Annotations for the service | +| service.enabled | bool | `false` | | +| service.labels | object | `{}` | Labels for the service | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account | @@ -167,9 +170,9 @@ The new release which will pick up again from the existing `positions.yaml`. | sidecar.configReloader.extraEnv | list | `[]` | Extra environment variables for sidecar config-reloader | | sidecar.configReloader.extraEnvFrom | list | `[]` | Extra environment variables from secrets or configmaps for sidecar config-reloader | | sidecar.configReloader.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy for sidecar config-reloader | -| sidecar.configReloader.image.registry | string | `"docker.io"` | The Docker registry for sidecar config-reloader | +| sidecar.configReloader.image.registry | string | `"ghcr.io"` | The Docker registry for sidecar config-reloader | | sidecar.configReloader.image.repository | string | `"jimmidyson/configmap-reload"` | Docker image repository for sidecar config-reloader | -| sidecar.configReloader.image.tag | string | `"v0.8.0"` | Docker image tag for sidecar config-reloader | +| sidecar.configReloader.image.tag | string | `"v0.12.0"` | Docker image tag for sidecar config-reloader | | sidecar.configReloader.livenessProbe | object | `{}` | Liveness probe for sidecar config-reloader | | sidecar.configReloader.readinessProbe | object | `{}` | Readiness probe for sidecar config-reloader | | sidecar.configReloader.resources | object | `{}` | Resource requests and limits for sidecar config-reloader | diff --git a/charts/promtail/templates/service-metrics.yaml b/charts/promtail/templates/service-metrics.yaml index 4948ceecf4..89602d6c44 100644 --- a/charts/promtail/templates/service-metrics.yaml +++ b/charts/promtail/templates/service-metrics.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceMonitor.enabled }} +{{- if or .Values.serviceMonitor.enabled .Values.service.enabled }} apiVersion: v1 kind: Service metadata: @@ -6,6 +6,9 @@ metadata: namespace: {{ include "promtail.namespaceName" . }} labels: {{- include "promtail.labels" . | nindent 4 }} + {{- toYaml .Values.service.labels | nindent 4 }} + annotations: + {{- toYaml .Values.service.annotations | nindent 4 }} spec: clusterIP: None ports: diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index b483599002..dc72be5cbf 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -62,6 +62,13 @@ deployment: strategy: type: RollingUpdate +service: + enabled: false + # -- Labels for the service + labels: {} + # -- Annotations for the service + annotations: {} + secret: # -- Labels for the Secret labels: {} @@ -584,11 +591,11 @@ sidecar: enabled: false image: # -- The Docker registry for sidecar config-reloader - registry: docker.io + registry: ghcr.io # -- Docker image repository for sidecar config-reloader repository: jimmidyson/configmap-reload # -- Docker image tag for sidecar config-reloader - tag: v0.8.0 + tag: v0.12.0 # -- Docker image pull policy for sidecar config-reloader pullPolicy: IfNotPresent # Extra args for the config-reloader container. diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 41429d7631..1c9d10771e 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.2 -appVersion: 2.4.1 +version: 1.9.11 +appVersion: 2.4.2 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index babba59334..9623d9faaf 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.11](https://img.shields.io/badge/Version-1.9.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -223,6 +223,10 @@ The memcached default args are removed and should be provided manually. The sett | adminApi.extraVolumeMounts | list | `[]` | | | adminApi.extraVolumes | list | `[]` | | | adminApi.hostAliases | list | `[]` | hostAliases to add | +| adminApi.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | +| adminApi.image.registry | string | `nil` | The Docker registry for the adminApi image. Overrides `tempo.image.registry` | +| adminApi.image.repository | string | `nil` | Docker image repository for the adminApi image. Overrides `tempo.image.repository` | +| adminApi.image.tag | string | `nil` | Docker image tag for the adminApi image. Overrides `tempo.image.tag` | | adminApi.initContainers | list | `[]` | | | adminApi.nodeSelector | object | `{}` | | | adminApi.persistence.subPath | string | `nil` | | @@ -369,6 +373,10 @@ The memcached default args are removed and should be provided manually. The sett | enterpriseGateway.extraVolumeMounts | list | `[]` | | | enterpriseGateway.extraVolumes | list | `[]` | | | enterpriseGateway.hostAliases | list | `[]` | hostAliases to add | +| enterpriseGateway.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | +| enterpriseGateway.image.registry | string | `nil` | The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry` | +| enterpriseGateway.image.repository | string | `nil` | Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository` | +| enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` | | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress | | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created | | enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress | @@ -494,6 +502,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` | | ingester.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` | | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` | +| ingester.initContainers | list | `[]` | | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | | ingester.persistence.annotations | object | `{}` | Annotations for ingester's persist volume claim | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | @@ -591,6 +600,7 @@ The memcached default args are removed and should be provided manually. The sett | metricsGenerator.image.registry | string | `nil` | The Docker registry for the metrics-generator image. Overrides `tempo.image.registry` | | metricsGenerator.image.repository | string | `nil` | Docker image repository for the metrics-generator image. Overrides `tempo.image.repository` | | metricsGenerator.image.tag | string | `nil` | Docker image tag for the metrics-generator image. Overrides `tempo.image.tag` | +| metricsGenerator.initContainers | list | `[]` | | | metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] | | metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods | | metricsGenerator.persistence | object | `{"annotations":{},"enabled":false,"size":"10Gi","storageClass":null}` | Persistence configuration for metrics-generator | @@ -775,6 +785,10 @@ The memcached default args are removed and should be provided manually. The sett | tokengenJob.extraArgs | object | `{}` | | | tokengenJob.extraEnvFrom | list | `[]` | | | tokengenJob.hostAliases | list | `[]` | hostAliases to add | +| tokengenJob.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | +| tokengenJob.image.registry | string | `nil` | The Docker registry for the tokengenJob image. Overrides `tempo.image.registry` | +| tokengenJob.image.repository | string | `nil` | Docker image repository for the tokengenJob image. Overrides `tempo.image.repository` | +| tokengenJob.image.tag | string | `nil` | Docker image tag for the tokengenJob image. Overrides `tempo.image.tag` | | tokengenJob.initContainers | list | `[]` | | | traces.jaeger.grpc.enabled | bool | `false` | Enable Tempo to ingest Jaeger GRPC traces | | traces.jaeger.grpc.receiverConfig | object | `{}` | Jaeger GRPC receiver config | @@ -910,7 +924,7 @@ config: | backend: s3 s3: access_key: tempo - bucket: tempo + bucket: endpoint: minio:9000 insecure: true secret_key: supersecret diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 72219e0359..446c654362 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -323,7 +323,7 @@ config: | backend: s3 s3: access_key: tempo - bucket: tempo + bucket: endpoint: minio:9000 insecure: true secret_key: supersecret diff --git a/charts/tempo-distributed/templates/admin-api/_helpers.tpl b/charts/tempo-distributed/templates/admin-api/_helpers.tpl new file mode 100644 index 0000000000..3b72a6633d --- /dev/null +++ b/charts/tempo-distributed/templates/admin-api/_helpers.tpl @@ -0,0 +1,7 @@ +{{/* +adminApi imagePullSecrets +*/}} +{{- define "tempo.adminApiImagePullSecrets" -}} +{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.adminApi.image "global" .Values.global.image -}} +{{- include "tempo.imagePullSecrets" $dict -}} +{{- end }} diff --git a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml index 469417a506..ae0d733c33 100644 --- a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml +++ b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml @@ -37,12 +37,7 @@ spec: {{- with .Values.adminApi.initContainers }} {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.tempo.image.pullSecrets }} - imagePullSecrets: - {{- range .Values.image.pullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} + {{- include "tempo.adminApiImagePullSecrets" . | nindent 6 -}} {{- with .Values.adminApi.hostAliases }} hostAliases: {{- toYaml . | nindent 8 }} diff --git a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl index 2b25560845..cb030eee62 100644 --- a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl +++ b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl @@ -31,3 +31,11 @@ Return if ingress supports pathType. {{- define "tempo.ingress.supportsPathType" -}} {{- or (eq (include "tempo.ingress.isStable" .) "true") (and (eq (include "tempo.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) -}} {{- end -}} + +{{/* +enterpriseGateway imagePullSecrets +*/}} +{{- define "tempo.enterpriseGatewayImagePullSecrets" -}} +{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.enterpriseGateway.image "global" .Values.global.image -}} +{{- include "tempo.imagePullSecrets" $dict -}} +{{- end }} diff --git a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml index 011322ddfc..0da57a1548 100644 --- a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml +++ b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml @@ -35,12 +35,7 @@ spec: {{- toYaml .Values.enterpriseGateway.securityContext | nindent 8 }} initContainers: {{- toYaml .Values.enterpriseGateway.initContainers | nindent 8 }} - {{- if .Values.tempo.image.pullSecrets }} - imagePullSecrets: - {{- range .Values.image.pullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} + {{- include "tempo.enterpriseGatewayImagePullSecrets" . | nindent 6 -}} {{- with .Values.enterpriseGateway.hostAliases }} hostAliases: {{- toYaml . | nindent 8 }} diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 79abf99e9c..56d3ab5327 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -55,6 +55,8 @@ spec: hostAliases: {{- toYaml . | nindent 8 }} {{- end }} + initContainers: + {{- toYaml .Values.ingester.initContainers | nindent 8 }} containers: - args: - -target=ingester @@ -149,7 +151,9 @@ spec: {{- end }} {{- else }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: {{- with .Values.ingester.persistence.annotations }} annotations: {{- toYaml . | nindent 10 }} diff --git a/charts/tempo-distributed/templates/lib/service-monitor.tpl b/charts/tempo-distributed/templates/lib/service-monitor.tpl index a068dff4a4..896110f61b 100644 --- a/charts/tempo-distributed/templates/lib/service-monitor.tpl +++ b/charts/tempo-distributed/templates/lib/service-monitor.tpl @@ -47,7 +47,8 @@ spec: scrapeTimeout: {{ . }} {{- end }} relabelings: - - sourceLabels: [job] + - action: replace + sourceLabels: [job] replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}" targetLabel: job {{- if kindIs "string" .clusterLabel }} diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index 286e68c37e..5f1737ddc7 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -55,6 +55,8 @@ spec: hostAliases: {{- toYaml . | nindent 8 }} {{- end }} + initContainers: + {{- toYaml .Values.metricsGenerator.initContainers | nindent 8 }} containers: - args: - -target=metrics-generator @@ -138,7 +140,9 @@ spec: emptyDir: {{- toYaml .Values.metricsGenerator.walEmptyDir | nindent 12 }} {{- else }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: {{- with .Values.metricsGenerator.persistence.annotations }} annotations: {{- toYaml . | nindent 10 }} diff --git a/charts/tempo-distributed/templates/tokengen/__helpers.tpl b/charts/tempo-distributed/templates/tokengen/__helpers.tpl new file mode 100644 index 0000000000..f23d971c38 --- /dev/null +++ b/charts/tempo-distributed/templates/tokengen/__helpers.tpl @@ -0,0 +1,7 @@ +{{/* +tokengen-job imagePullSecrets +*/}} +{{- define "tempo.tokengenJobImagePullSecrets" -}} +{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.tokengenJob.image "global" .Values.global.image -}} +{{- include "tempo.imagePullSecrets" $dict -}} +{{- end }} diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml index b73c699031..0af68007c7 100644 --- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml +++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml @@ -17,7 +17,6 @@ spec: backoffLimit: 6 completions: 1 parallelism: 1 - selector: template: metadata: labels: @@ -33,12 +32,7 @@ spec: {{- end }} securityContext: {{- toYaml .Values.tokengenJob.securityContext | nindent 8 }} - {{- if .Values.tempo.image.pullSecrets }} - imagePullSecrets: - {{- range .Values.tempo.image.pullSecrets }} - - name: {{ . }} - {{- end }} - {{- end }} + {{- include "tempo.tokengenJobImagePullSecrets" . | nindent 6 -}} {{- with .Values.tokengenJob.hostAliases }} hostAliases: {{- toYaml . | nindent 8 }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 2720dc418b..d47c76db75 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -112,6 +112,7 @@ ingester: # - ip: 1.2.3.4 # hostnames: # - domain.tld + initContainers: [] autoscaling: # -- Enable autoscaling for the ingester. WARNING: Autoscaling ingesters can result in lost data. Only do this if you know what you're doing. enabled: false @@ -239,6 +240,7 @@ metricsGenerator: # - ip: 1.2.3.4 # hostnames: # - domain.tld + initContainers: [] image: # -- The Docker registry for the metrics-generator image. Overrides `tempo.image.registry` registry: null @@ -1834,6 +1836,10 @@ gateway: proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces; } + location = /otlp/v1/traces { + proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces; + } + location ^~ /api { proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri; } @@ -1900,6 +1906,15 @@ tokengenJob: env: [] extraEnvFrom: [] annotations: {} + image: + # -- The Docker registry for the tokengenJob image. Overrides `tempo.image.registry` + registry: null + # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` + pullSecrets: [] + # -- Docker image repository for the tokengenJob image. Overrides `tempo.image.repository` + repository: null + # -- Docker image tag for the tokengenJob image. Overrides `tempo.image.tag` + tag: null initContainers: [] # -- The SecurityContext for tokenjobgen containers containerSecurityContext: @@ -1920,6 +1935,16 @@ adminApi: annotations: {} labels: {} + image: + # -- The Docker registry for the adminApi image. Overrides `tempo.image.registry` + registry: null + # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` + pullSecrets: [] + # -- Docker image repository for the adminApi image. Overrides `tempo.image.repository` + repository: null + # -- Docker image tag for the adminApi image. Overrides `tempo.image.tag` + tag: null + initContainers: [] strategy: @@ -2007,6 +2032,16 @@ enterpriseGateway: # hostnames: # - domain.tld + image: + # -- The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry` + registry: null + # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` + pullSecrets: [] + # -- Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository` + repository: null + # -- Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` + tag: null + annotations: {} service: # -- Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 104e2126c5..ee09ebd7c8 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.2 -appVersion: 2.3.1 +version: 1.8.0 +appVersion: 2.4.2 engine: gotpl home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 9e61f7a23b..4eec988285 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) Grafana Tempo Single Binary Mode diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index e0a521d8e3..f19418fb52 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -66,7 +66,7 @@ tempo: # backend: s3 # store traces in s3 # s3: - # bucket: tempo # store traces in this bucket + # bucket: # store traces in this bucket # endpoint: s3.dualstack.us-east-2.amazonaws.com # api endpoint # access_key: ... # optional. access key when using static credentials. # secret_key: ... # optional. secret key when using static credentials. From 27baf921fe068d16bfe116ba33135c6263922094 Mon Sep 17 00:00:00 2001 From: Jennie Pham Date: Fri, 31 May 2024 12:51:19 -0500 Subject: [PATCH 059/152] [tempo-distributed] Update for v2.5.0 release Signed-off-by: Jennie Pham --- charts/tempo-distributed/Chart.yaml | 4 ++-- charts/tempo-distributed/README.md | 6 ++---- charts/tempo-distributed/values.yaml | 6 ------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 1c9d10771e..989b46ccf2 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.11 -appVersion: 2.4.2 +version: 1.10.0 +appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 9623d9faaf..6c7d4e590a 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.11](https://img.shields.io/badge/Version-1.9.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) +![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -694,9 +694,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | | queryFrontend.config.search.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when searching the backend | | queryFrontend.config.search.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when performing a backend search | -| queryFrontend.config.trace_by_id | object | `{"hedge_requests_at":"2s","hedge_requests_up_to":2,"query_shards":50}` | Trace by ID lookup configuration | -| queryFrontend.config.trace_by_id.hedge_requests_at | string | `"2s"` | If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency. | -| queryFrontend.config.trace_by_id.hedge_requests_up_to | int | `2` | The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0. | +| queryFrontend.config.trace_by_id | object | `{"query_shards":50}` | Trace by ID lookup configuration | | queryFrontend.config.trace_by_id.query_shards | int | `50` | The number of shards to split a trace by id query into. | | queryFrontend.extraArgs | list | `[]` | Additional CLI args for the query-frontend | | queryFrontend.extraEnv | list | `[]` | Environment variables to add to the query-frontend pods | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index d47c76db75..b08122a96d 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -723,10 +723,6 @@ queryFrontend: trace_by_id: # -- The number of shards to split a trace by id query into. query_shards: 50 - # -- If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency. - hedge_requests_at: 2s - # -- The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0. - hedge_requests_up_to: 2 autoscaling: # -- Enable autoscaling for the query-frontend enabled: false @@ -1221,8 +1217,6 @@ config: | concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }} trace_by_id: query_shards: {{ .Values.queryFrontend.config.trace_by_id.query_shards }} - hedge_requests_at: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_at }} - hedge_requests_up_to: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_up_to }} ingester: lifecycler: From 41be9d6d9b2644d2a6861da8850ab6dfc17d4dcd Mon Sep 17 00:00:00 2001 From: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Date: Fri, 31 May 2024 15:02:31 -0400 Subject: [PATCH 060/152] update helm for agent v0.41.0 Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --- charts/agent-operator/Chart.yaml | 10 +++++----- charts/agent-operator/README.md | 6 +++--- charts/agent-operator/values.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 60e55344da..958324697e 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.22 -appVersion: "0.40.5" -home: https://grafana.com/docs/agent/v0.40/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.40.5/docs/sources/assets/logo_and_name.png +version: 0.3.23 +appVersion: "0.41.0" +home: https://grafana.com/docs/agent/v0.41/ +icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.40.5/pkg/operator + - https://github.com/grafana/agent/tree/v0.41.0/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 8500500acd..4eba48bc33 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.22](https://img.shields.io/badge/Version-0.3.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.5](https://img.shields.io/badge/AppVersion-0.40.5-informational?style=flat-square) +![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.40.5"` | Image tag | +| image.tag | string | `"v0.41.0"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index ed005a5492..6e7dea5059 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.40.5 + tag: v0.41.0 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets From 344749519e353c9798a1cf92503c49689f059867 Mon Sep 17 00:00:00 2001 From: Jennie Pham Date: Fri, 31 May 2024 13:05:18 -0500 Subject: [PATCH 061/152] [tempo] Update for v2.5.0 release Signed-off-by: Jennie Pham --- charts/tempo/Chart.yaml | 4 ++-- charts/tempo/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index ee09ebd7c8..0cda20a162 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.8.0 -appVersion: 2.4.2 +version: 1.9.0 +appVersion: 2.5.0 engine: gotpl home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 4eec988285..980fd36c6b 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.2](https://img.shields.io/badge/AppVersion-2.4.2-informational?style=flat-square) +![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode From f5983cca58d00e0e379710b328841c070962cfb3 Mon Sep 17 00:00:00 2001 From: tom Date: Wed, 7 Feb 2024 15:52:23 +0100 Subject: [PATCH 062/152] conf(grafana): Add folderUid option TICKET: #2955 Signed-off-by: tom --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 1 + charts/grafana/templates/_config.tpl | 1 + charts/grafana/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f4a6f85a1a..4e06406282 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.0.0 +version: 8.0.1 appVersion: 11.0.0 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 0ff07f297d..dde2a202bb 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -183,6 +183,7 @@ need to instead set `global.imageRegistry`. | `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` | | `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` | | `sidecar.dashboards.provider.folder` | Logical folder in which grafana groups dashboards | `""` | +| `sidecar.dashboards.provider.folderUid` | Allows you to specify the static UID for the logical folder above | `""` | | `sidecar.dashboards.provider.disableDelete` | Activate to avoid the deletion of imported dashboards | `false` | | `sidecar.dashboards.provider.allowUiUpdates` | Allow updating provisioned dashboards from the UI | `false` | | `sidecar.dashboards.provider.type` | Provider type | `file` | diff --git a/charts/grafana/templates/_config.tpl b/charts/grafana/templates/_config.tpl index 19df19cd2a..b866217f2e 100644 --- a/charts/grafana/templates/_config.tpl +++ b/charts/grafana/templates/_config.tpl @@ -146,6 +146,7 @@ provider.yaml: |- orgId: {{ .Values.sidecar.dashboards.provider.orgid }} {{- if not .Values.sidecar.dashboards.provider.foldersFromFilesStructure }} folder: '{{ .Values.sidecar.dashboards.provider.folder }}' + folderUid: '{{ .Values.sidecar.dashboards.provider.folderUid }}' {{- end }} type: {{ .Values.sidecar.dashboards.provider.type }} disableDeletion: {{ .Values.sidecar.dashboards.provider.disableDelete }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index a327a7a01e..bdc1cd2404 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -963,6 +963,8 @@ sidecar: orgid: 1 # folder in which the dashboards should be imported in grafana folder: '' + # folder UID. will be automatically generated if not specified + folderUid: '' # type of the provider type: file # disableDelete to activate a import-only behaviour From 9920a97ca881afcfa9eb5321ab2fc20fc6b45ef3 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Tue, 4 Jun 2024 21:09:32 +0530 Subject: [PATCH 063/152] Trigger DCO Signed-off-by: Sheikh-Abubaker From fbdae0b6568865b119aadd35422b78ae1f1fec13 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 5 Jun 2024 00:08:43 +0530 Subject: [PATCH 064/152] Trigger DCO Signed-off-by: Sheikh-Abubaker From 8f3597528a91528f4a19f011a1d6a7332e09623a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 5 Jun 2024 00:18:14 +0530 Subject: [PATCH 065/152] Trigger DCO Signed-off-by: Sheikh-Abubaker From f7246b3bdac1db5edce1581f2741220aba21aea2 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 5 Jun 2024 21:08:00 +0530 Subject: [PATCH 066/152] Add missing namespace in deployment template Signed-off-by: Sheikh-Abubaker --- charts/agent-operator/Chart.yaml | 2 +- charts/agent-operator/README.md | 2 +- charts/agent-operator/templates/operator-deployment.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 958324697e..80745df2d2 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.23 +version: 0.4.23 appVersion: "0.41.0" home: https://grafana.com/docs/agent/v0.41/ icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 4eba48bc33..76c48ae5c7 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) +![Version: 0.4.23](https://img.shields.io/badge/Version-0.4.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) A Helm chart for Grafana Agent Operator diff --git a/charts/agent-operator/templates/operator-deployment.yaml b/charts/agent-operator/templates/operator-deployment.yaml index e2c741ecb6..3367db194a 100644 --- a/charts/agent-operator/templates/operator-deployment.yaml +++ b/charts/agent-operator/templates/operator-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "ga-operator.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "ga-operator.labels" . | indent 4 }} {{- with .Values.annotations }} From b92f81a887e0b211c5202030a7d11d8af13ac97c Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 7 Jun 2024 00:11:39 +0530 Subject: [PATCH 067/152] Update chart version Signed-off-by: Sheikh-Abubaker --- charts/agent-operator/Chart.yaml | 2 +- charts/agent-operator/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 80745df2d2..bb5fa1c9cb 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.4.23 +version: 0.4.0 appVersion: "0.41.0" home: https://grafana.com/docs/agent/v0.41/ icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 76c48ae5c7..10c5460c27 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.4.23](https://img.shields.io/badge/Version-0.4.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) A Helm chart for Grafana Agent Operator From 7452a48fa47f6792f481e7f3cf3d5603caabf39e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 7 Jun 2024 00:17:11 +0530 Subject: [PATCH 068/152] Trigger DCO Signed-off-by: Sheikh-Abubaker From 8a5b02187f5b19f765de0c70beff072687640e65 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 7 Jun 2024 22:56:37 +0530 Subject: [PATCH 069/152] Trigger DCO Signed-off-by: Sheikh-Abubaker From f9c2004cdbf613547b66e7ee75867ab8ad01d5dc Mon Sep 17 00:00:00 2001 From: matt durham Date: Fri, 7 Jun 2024 13:21:01 -0400 Subject: [PATCH 070/152] update helm chart Signed-off-by: matt durham --- charts/agent-operator/README.md | 2 +- charts/agent-operator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 4eba48bc33..14ee099127 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.41.0"` | Image tag | +| image.tag | string | `"v0.41.1"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index 6e7dea5059..d4660a7a12 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.41.0 + tag: v0.41.1 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets From 8cfc38d8df8ee1e6e314f8dd56791419cdd01eb0 Mon Sep 17 00:00:00 2001 From: matt durham Date: Fri, 7 Jun 2024 13:23:13 -0400 Subject: [PATCH 071/152] update helm chart Signed-off-by: matt durham --- charts/agent-operator/Chart.yaml | 6 +-- charts/agent-operator/README.md | 4 +- charts/grafana-sampling/README.md | 50 --------------------- charts/lgtm-distributed/README.md | 2 +- charts/loki-distributed/README.md | 4 +- charts/synthetic-monitoring-agent/README.md | 2 +- 6 files changed, 9 insertions(+), 59 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 958324697e..c081e46937 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.23 -appVersion: "0.41.0" +version: 0.3.24 +appVersion: "0.41.1" home: https://grafana.com/docs/agent/v0.41/ icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.41.0/pkg/operator + - https://github.com/grafana/agent/tree/v0.41.1/pkg/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 14ee099127..33738aaceb 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square) +![Version: 0.3.24](https://img.shields.io/badge/Version-0.3.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.1](https://img.shields.io/badge/AppVersion-0.41.1-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 0c10e0ec84..db918c13f6 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -62,56 +62,6 @@ A major chart version change indicates that there is an incompatible breaking ch | Key | Type | Default | Description | |-----|------|---------|-------------| -| grafana-agent-deployment.agent.configMap.create | bool | `false` | | -| grafana-agent-deployment.agent.extraPorts[0].name | string | `"otlp-grpc"` | | -| grafana-agent-deployment.agent.extraPorts[0].port | int | `4317` | | -| grafana-agent-deployment.agent.extraPorts[0].protocol | string | `"TCP"` | | -| grafana-agent-deployment.agent.extraPorts[0].targetPort | int | `4317` | | -| grafana-agent-deployment.agent.extraPorts[1].name | string | `"otlp-http"` | | -| grafana-agent-deployment.agent.extraPorts[1].port | int | `4318` | | -| grafana-agent-deployment.agent.extraPorts[1].protocol | string | `"TCP"` | | -| grafana-agent-deployment.agent.extraPorts[1].targetPort | int | `4318` | | -| grafana-agent-deployment.agent.resources.requests.cpu | string | `"1"` | | -| grafana-agent-deployment.agent.resources.requests.memory | string | `"2G"` | | -| grafana-agent-deployment.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. | -| grafana-agent-deployment.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. | -| grafana-agent-deployment.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. | -| grafana-agent-deployment.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. | -| grafana-agent-deployment.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. | -| grafana-agent-deployment.controller.replicas | int | `1` | | -| grafana-agent-deployment.controller.type | string | `"deployment"` | | -| grafana-agent-deployment.nameOverride | string | `"deployment"` | Do not change this. | -| grafana-agent-statefulset.agent.configMap.create | bool | `false` | | -| grafana-agent-statefulset.agent.extraEnv[0].name | string | `"GRAFANA_CLOUD_API_KEY"` | | -| grafana-agent-statefulset.agent.extraEnv[0].value | string | `""` | | -| grafana-agent-statefulset.agent.extraEnv[1].name | string | `"GRAFANA_CLOUD_PROMETHEUS_URL"` | | -| grafana-agent-statefulset.agent.extraEnv[1].value | string | `""` | | -| grafana-agent-statefulset.agent.extraEnv[2].name | string | `"GRAFANA_CLOUD_PROMETHEUS_USERNAME"` | | -| grafana-agent-statefulset.agent.extraEnv[2].value | string | `""` | | -| grafana-agent-statefulset.agent.extraEnv[3].name | string | `"GRAFANA_CLOUD_TEMPO_ENDPOINT"` | | -| grafana-agent-statefulset.agent.extraEnv[3].value | string | `""` | | -| grafana-agent-statefulset.agent.extraEnv[4].name | string | `"GRAFANA_CLOUD_TEMPO_USERNAME"` | | -| grafana-agent-statefulset.agent.extraEnv[4].value | string | `""` | | -| grafana-agent-statefulset.agent.extraEnv[5].name | string | `"POD_UID"` | | -| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.apiVersion | string | `"v1"` | | -| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.fieldPath | string | `"metadata.uid"` | | -| grafana-agent-statefulset.agent.extraPorts[0].name | string | `"otlp-grpc"` | | -| grafana-agent-statefulset.agent.extraPorts[0].port | int | `4317` | | -| grafana-agent-statefulset.agent.extraPorts[0].protocol | string | `"TCP"` | | -| grafana-agent-statefulset.agent.extraPorts[0].targetPort | int | `4317` | | -| grafana-agent-statefulset.agent.resources.requests.cpu | string | `"1"` | | -| grafana-agent-statefulset.agent.resources.requests.memory | string | `"2G"` | | -| grafana-agent-statefulset.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. | -| grafana-agent-statefulset.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. | -| grafana-agent-statefulset.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. | -| grafana-agent-statefulset.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. | -| grafana-agent-statefulset.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. | -| grafana-agent-statefulset.controller.replicas | int | `1` | | -| grafana-agent-statefulset.controller.type | string | `"statefulset"` | | -| grafana-agent-statefulset.nameOverride | string | `"statefulset"` | Do not change this. | -| grafana-agent-statefulset.rbac.create | bool | `false` | | -| grafana-agent-statefulset.service.clusterIP | string | `"None"` | | -| grafana-agent-statefulset.serviceAccount.create | bool | `false` | | | metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name"]` | Additional dimensions to add to generated metrics. | | metricsGeneration.enabled | bool | `true` | Toggle generation of spanmetrics and servicegraph metrics. | | sampling.decisionWait | string | `"15s"` | Wait time since the first span of a trace before making a sampling decision. | diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index ad3c7d0c4e..cc91d4afa5 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -43,4 +43,4 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | tempo.ingester.replicas | int | `1` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index d40ea8b510..9851c6e82d 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -110,7 +110,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | +| compactor.persistence.claims | list | | List of the compactor PVCs | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -303,7 +303,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | +| ingester.persistence.claims | list | | List of the ingester PVCs | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 9e9a4192a1..9fa2769caa 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -75,4 +75,4 @@ Kubernetes: `^1.16.0-0` | tolerations | list | `[]` | List of node taints to tolerate. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) From 962cc8b93aa8563e81304ffe13b8070513077311 Mon Sep 17 00:00:00 2001 From: matt durham Date: Fri, 7 Jun 2024 13:27:33 -0400 Subject: [PATCH 072/152] undo helm docs Signed-off-by: matt durham --- charts/grafana-sampling/README.md | 52 ++++++++++++++++++++- charts/loki-distributed/README.md | 4 +- charts/synthetic-monitoring-agent/README.md | 2 +- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index db918c13f6..6ad9785b72 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. @@ -62,6 +62,56 @@ A major chart version change indicates that there is an incompatible breaking ch | Key | Type | Default | Description | |-----|------|---------|-------------| +| grafana-agent-deployment.agent.configMap.create | bool | `false` | | +| grafana-agent-deployment.agent.extraPorts[0].name | string | `"otlp-grpc"` | | +| grafana-agent-deployment.agent.extraPorts[0].port | int | `4317` | | +| grafana-agent-deployment.agent.extraPorts[0].protocol | string | `"TCP"` | | +| grafana-agent-deployment.agent.extraPorts[0].targetPort | int | `4317` | | +| grafana-agent-deployment.agent.extraPorts[1].name | string | `"otlp-http"` | | +| grafana-agent-deployment.agent.extraPorts[1].port | int | `4318` | | +| grafana-agent-deployment.agent.extraPorts[1].protocol | string | `"TCP"` | | +| grafana-agent-deployment.agent.extraPorts[1].targetPort | int | `4318` | | +| grafana-agent-deployment.agent.resources.requests.cpu | string | `"1"` | | +| grafana-agent-deployment.agent.resources.requests.memory | string | `"2G"` | | +| grafana-agent-deployment.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. | +| grafana-agent-deployment.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. | +| grafana-agent-deployment.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. | +| grafana-agent-deployment.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. | +| grafana-agent-deployment.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. | +| grafana-agent-deployment.controller.replicas | int | `1` | | +| grafana-agent-deployment.controller.type | string | `"deployment"` | | +| grafana-agent-deployment.nameOverride | string | `"deployment"` | Do not change this. | +| grafana-agent-statefulset.agent.configMap.create | bool | `false` | | +| grafana-agent-statefulset.agent.extraEnv[0].name | string | `"GRAFANA_CLOUD_API_KEY"` | | +| grafana-agent-statefulset.agent.extraEnv[0].value | string | `""` | | +| grafana-agent-statefulset.agent.extraEnv[1].name | string | `"GRAFANA_CLOUD_PROMETHEUS_URL"` | | +| grafana-agent-statefulset.agent.extraEnv[1].value | string | `""` | | +| grafana-agent-statefulset.agent.extraEnv[2].name | string | `"GRAFANA_CLOUD_PROMETHEUS_USERNAME"` | | +| grafana-agent-statefulset.agent.extraEnv[2].value | string | `""` | | +| grafana-agent-statefulset.agent.extraEnv[3].name | string | `"GRAFANA_CLOUD_TEMPO_ENDPOINT"` | | +| grafana-agent-statefulset.agent.extraEnv[3].value | string | `""` | | +| grafana-agent-statefulset.agent.extraEnv[4].name | string | `"GRAFANA_CLOUD_TEMPO_USERNAME"` | | +| grafana-agent-statefulset.agent.extraEnv[4].value | string | `""` | | +| grafana-agent-statefulset.agent.extraEnv[5].name | string | `"POD_UID"` | | +| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.apiVersion | string | `"v1"` | | +| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.fieldPath | string | `"metadata.uid"` | | +| grafana-agent-statefulset.agent.extraPorts[0].name | string | `"otlp-grpc"` | | +| grafana-agent-statefulset.agent.extraPorts[0].port | int | `4317` | | +| grafana-agent-statefulset.agent.extraPorts[0].protocol | string | `"TCP"` | | +| grafana-agent-statefulset.agent.extraPorts[0].targetPort | int | `4317` | | +| grafana-agent-statefulset.agent.resources.requests.cpu | string | `"1"` | | +| grafana-agent-statefulset.agent.resources.requests.memory | string | `"2G"` | | +| grafana-agent-statefulset.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. | +| grafana-agent-statefulset.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. | +| grafana-agent-statefulset.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. | +| grafana-agent-statefulset.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. | +| grafana-agent-statefulset.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. | +| grafana-agent-statefulset.controller.replicas | int | `1` | | +| grafana-agent-statefulset.controller.type | string | `"statefulset"` | | +| grafana-agent-statefulset.nameOverride | string | `"statefulset"` | Do not change this. | +| grafana-agent-statefulset.rbac.create | bool | `false` | | +| grafana-agent-statefulset.service.clusterIP | string | `"None"` | | +| grafana-agent-statefulset.serviceAccount.create | bool | `false` | | | metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name"]` | Additional dimensions to add to generated metrics. | | metricsGeneration.enabled | bool | `true` | Toggle generation of spanmetrics and servicegraph metrics. | | sampling.decisionWait | string | `"15s"` | Wait time since the first span of a trace before making a sampling decision. | diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 9851c6e82d..d40ea8b510 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -110,7 +110,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | | List of the compactor PVCs | +| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -303,7 +303,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | | List of the ingester PVCs | +| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 9fa2769caa..9e9a4192a1 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -75,4 +75,4 @@ Kubernetes: `^1.16.0-0` | tolerations | list | `[]` | List of node taints to tolerate. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) From 8ab9894e352a785db0f8cca0de705f250e2fe4ad Mon Sep 17 00:00:00 2001 From: matt durham Date: Fri, 7 Jun 2024 13:28:29 -0400 Subject: [PATCH 073/152] undo helm docs Signed-off-by: matt durham --- charts/grafana-sampling/README.md | 2 +- charts/lgtm-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 6ad9785b72..12cae8093b 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index cc91d4afa5..ad3c7d0c4e 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -43,4 +43,4 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | tempo.ingester.replicas | int | `1` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) From 2db0a89453f4263bdb5765ed440c3fc15ed31c05 Mon Sep 17 00:00:00 2001 From: matt durham Date: Fri, 7 Jun 2024 13:29:02 -0400 Subject: [PATCH 074/152] undo helm docs Signed-off-by: matt durham --- charts/grafana-sampling/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 12cae8093b..0c10e0ec84 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. From 2e998f40701ea8e401479004755a35f6720fbdea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 9 Jun 2024 13:07:48 +0200 Subject: [PATCH 075/152] grafana: Introduce toggle for volumeName lookup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/pvc.yaml | 2 +- charts/grafana/values.yaml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 4e06406282..9590f10b50 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.0.1 +version: 8.0.2 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml index c0edad2c46..0a4613edc7 100644 --- 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/values.yaml b/charts/grafana/values.yaml index bdc1cd2404..2e64dd8087 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -389,6 +389,10 @@ persistence: ## # sizeLimit: 300Mi + ## If 'lookupVolumeName' is set to true, Helm will attempt to retrieve + ## the current value of 'spec.volumeName' and incorporate it into the template. + lookupVolumeName: true + initChownData: ## If false, data ownership will not be reset at startup ## This allows the grafana-server to be run with an arbitrary user From 8a12dfc9b7d677e3f27a5eeea813957a9627d69c Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sun, 9 Jun 2024 21:35:52 +0530 Subject: [PATCH 076/152] Restore Chart.lock file Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.lock | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 charts/tempo-distributed/Chart.lock diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock new file mode 100644 index 0000000000..03cf000ca3 --- /dev/null +++ b/charts/tempo-distributed/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: minio + repository: https://charts.min.io/ + version: 4.0.12 +- name: grafana-agent-operator + repository: https://grafana.github.io/helm-charts + version: 0.2.2 +digest: sha256:761a500ff2fd8b8c5a52b70683abcdec8b6ffcae6b81ad26ea4ddeddbaf609f1 +generated: "2023-09-28T13:42:34.486521-07:00" From 7c0a9e7235d1ed918ad406a2aac06abe40a9f1be Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sun, 9 Jun 2024 23:57:15 +0530 Subject: [PATCH 077/152] Update service template Signed-off-by: Sheikh-Abubaker --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- charts/promtail/templates/service-metrics.yaml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 24fa5edac6..d412ab048a 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 3.0.0 -version: 6.16.0 +version: 6.16.1 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index a22d448157..6ff66f4225 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.0](https://img.shields.io/badge/Version-6.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.16.1](https://img.shields.io/badge/Version-6.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance diff --git a/charts/promtail/templates/service-metrics.yaml b/charts/promtail/templates/service-metrics.yaml index 89602d6c44..aa3d74d45e 100644 --- a/charts/promtail/templates/service-metrics.yaml +++ b/charts/promtail/templates/service-metrics.yaml @@ -6,7 +6,9 @@ metadata: namespace: {{ include "promtail.namespaceName" . }} labels: {{- include "promtail.labels" . | nindent 4 }} - {{- toYaml .Values.service.labels | nindent 4 }} + {{- with .Values.service.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: {{- toYaml .Values.service.annotations | nindent 4 }} spec: From ff031a64432fb0b89bad239e207e16b8695db76e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 10 Jun 2024 00:11:34 +0530 Subject: [PATCH 078/152] Update service template Signed-off-by: Sheikh-Abubaker --- charts/promtail/templates/service-metrics.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/promtail/templates/service-metrics.yaml b/charts/promtail/templates/service-metrics.yaml index aa3d74d45e..631d906910 100644 --- a/charts/promtail/templates/service-metrics.yaml +++ b/charts/promtail/templates/service-metrics.yaml @@ -9,8 +9,10 @@ metadata: {{- with .Values.service.labels }} {{- toYaml . | nindent 4 }} {{- end }} + {{- with .Values.service.annotations }} annotations: - {{- toYaml .Values.service.annotations | nindent 4 }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: clusterIP: None ports: From f897742671a7dfec8b29a5e565cf52013da33a52 Mon Sep 17 00:00:00 2001 From: Matt Clegg Date: Tue, 11 Jun 2024 16:05:00 +0100 Subject: [PATCH 079/152] DOCS grafana Signed-off-by: Matt Clegg --- charts/grafana/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index bdc1cd2404..3cfb84d69f 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -4,7 +4,7 @@ global: # To help compatibility with other charts which use global.imagePullSecrets. # Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style). - # Can be tempalted. + # Can be templated. # global: # imagePullSecrets: # - name: pullSecret1 From 8994d56ebcc0cffd5088de91a830ed2909c4282b Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 14 Jun 2024 23:55:40 +0530 Subject: [PATCH 080/152] Add support for remote-write-add-org-pr Signed-off-by: Sheikh-Abubaker --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 2 +- charts/tempo/values.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 0cda20a162..715c5b61d3 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.9.0 +version: 1.10.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 980fd36c6b..1545893641 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index f19418fb52..55125847b3 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -147,6 +147,7 @@ config: | metrics_generator: storage: path: "/tmp/tempo" + remote_write_add_org_id_header: false remote_write: - url: {{ .Values.tempo.metricsGenerator.remoteWriteUrl }} {{- end }} From 96309080085dc6bd2b072671f9639d720230308d Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 15 Jun 2024 00:58:06 +0530 Subject: [PATCH 081/152] Add support for remote-write-add-org-pr Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 2 ++ charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 2 +- charts/tempo/values.yaml | 1 - 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index f9120e96f3..34d8b8b918 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.11.0 +version: 1.12.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 1dcec38c83..ea07ad05ea 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index fd614bc391..f6111b18a0 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -356,6 +356,8 @@ metricsGenerator: path: /var/tempo/wal wal: remote_write_flush_deadline: 1m + # Whether to add X-Scope-OrgID header in remote write requests + remote_write_add_org_id_header: true # -- A list of remote write endpoints. # -- https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write remote_write: [] diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 715c5b61d3..0cda20a162 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.10.0 +version: 1.9.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 1545893641..980fd36c6b 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 55125847b3..f19418fb52 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -147,7 +147,6 @@ config: | metrics_generator: storage: path: "/tmp/tempo" - remote_write_add_org_id_header: false remote_write: - url: {{ .Values.tempo.metricsGenerator.remoteWriteUrl }} {{- end }} From 4977904730bf18fcec9836bee958f636c20728e2 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 15 Jun 2024 01:05:20 +0530 Subject: [PATCH 082/152] Update README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ea07ad05ea..5a46858afa 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -584,7 +584,7 @@ The memcached default args are removed and should be provided manually. The sett | metricsGenerator.annotations | object | `{}` | Annotations for the metrics-generator StatefulSet | | metricsGenerator.appProtocol | object | `{"grpc":null}` | Adds the appProtocol field to the metricsGenerator service. This allows metricsGenerator to work with istio protocol selection. | | metricsGenerator.appProtocol.grpc | string | `nil` | Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" | -| metricsGenerator.config | object | `{"metrics_ingestion_time_range_slack":"30s","processor":{"service_graphs":{"dimensions":[],"histogram_buckets":[0.1,0.2,0.4,0.8,1.6,3.2,6.4,12.8],"max_items":10000,"wait":"10s","workers":10},"span_metrics":{"dimensions":[],"histogram_buckets":[0.002,0.004,0.008,0.016,0.032,0.064,0.128,0.256,0.512,1.02,2.05,4.1]}},"registry":{"collection_interval":"15s","external_labels":{},"stale_duration":"15m"},"storage":{"path":"/var/tempo/wal","remote_write":[],"remote_write_flush_deadline":"1m","wal":null},"traces_storage":{"path":"/var/tempo/traces"}}` | More information on configuration: https://grafana.com/docs/tempo/latest/configuration/#metrics-generator | +| metricsGenerator.config | object | `{"metrics_ingestion_time_range_slack":"30s","processor":{"service_graphs":{"dimensions":[],"histogram_buckets":[0.1,0.2,0.4,0.8,1.6,3.2,6.4,12.8],"max_items":10000,"wait":"10s","workers":10},"span_metrics":{"dimensions":[],"histogram_buckets":[0.002,0.004,0.008,0.016,0.032,0.064,0.128,0.256,0.512,1.02,2.05,4.1]}},"registry":{"collection_interval":"15s","external_labels":{},"stale_duration":"15m"},"storage":{"path":"/var/tempo/wal","remote_write":[],"remote_write_add_org_id_header":true,"remote_write_flush_deadline":"1m","wal":null},"traces_storage":{"path":"/var/tempo/traces"}}` | More information on configuration: https://grafana.com/docs/tempo/latest/configuration/#metrics-generator | | metricsGenerator.config.processor.service_graphs | object | `{"dimensions":[],"histogram_buckets":[0.1,0.2,0.4,0.8,1.6,3.2,6.4,12.8],"max_items":10000,"wait":"10s","workers":10}` | For processors to be enabled and generate metrics, pass the names of the processors to overrides.metrics_generator_processors value like [service-graphs, span-metrics] | | metricsGenerator.config.processor.service_graphs.dimensions | list | `[]` | resource and span attributes and are added to the metrics if present. | | metricsGenerator.config.processor.span_metrics.dimensions | list | `[]` | Dimensions are searched for in the resource and span attributes and are added to the metrics if present. | From 48cef09f9214ee8dcfe7a1bc5ee2d0e130256eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 16 Jun 2024 23:40:09 +0200 Subject: [PATCH 083/152] bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 9590f10b50..b42a5cc290 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.0.2 +version: 8.0.3 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From ba9f0d01418cac1bd1b29cf8ff430bac6559e866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Mon, 17 Jun 2024 16:24:57 +0200 Subject: [PATCH 084/152] Update rollout-operator Helm chart to v0.17.0 (#3177) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Štibraný --- charts/rollout-operator/Chart.yaml | 4 ++-- charts/rollout-operator/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index 817940e6e3..18c57c8750 100644 --- a/charts/rollout-operator/Chart.yaml +++ b/charts/rollout-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: rollout-operator description: "Grafana rollout-operator" type: application -version: 0.15.0 -appVersion: v0.14.0 +version: 0.16.0 +appVersion: v0.17.0 home: https://github.com/grafana/rollout-operator kubeVersion: ^1.10.0-0 diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md index 360e462007..e0d11cc71a 100644 --- a/charts/rollout-operator/README.md +++ b/charts/rollout-operator/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r # rollout-operator -![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square) +![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.17.0](https://img.shields.io/badge/AppVersion-v0.17.0-informational?style=flat-square) Grafana rollout-operator From 9a1711e6d3599f88d9473683d3f9d73965435993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Tue, 18 Jun 2024 19:56:10 +0200 Subject: [PATCH 085/152] [grafana] Adding jkroepke as maintainer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .github/CODEOWNERS | 2 +- charts/grafana/Chart.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ce6681f871..b3d10d065f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,7 +6,7 @@ # 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 diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 9590f10b50..7c16259c0e 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.0.2 +version: 8.0.3 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. @@ -27,6 +27,8 @@ maintainers: email: miroslav.hadzhiev@gmail.com - name: torstenwalter email: mail@torstenwalter.de + - name: jkroepke + email: github@jkroepke.de type: application keywords: - monitoring From 85aad7cf76039e935aa60aa4f5c7c00c448060c8 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:14:12 +0530 Subject: [PATCH 086/152] Add Grafana OnCall to the chart dependencies Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 7 ++++++- charts/lgtm-distributed/README.md | 2 +- charts/lgtm-distributed/values.yaml | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 79bc3cf68f..0351540a9b 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: lgtm-distributed description: Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack type: application -version: 2.0.0 +version: 2.1.0 appVersion: "^7.3.9" home: https://grafana.com/oss/ @@ -60,3 +60,8 @@ dependencies: condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.9.2" + - name: grafana-oncall + alias: oncall + condition: grafana-oncall.enabled + repository: https://github.com/grafana/oncall + version: "^1.3.114" diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index ad3c7d0c4e..656dd74ac9 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -1,6 +1,6 @@ # lgtm-distributed -![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square) +![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: ^7.3.9](https://img.shields.io/badge/AppVersion-^7.3.9-informational?style=flat-square) Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack diff --git a/charts/lgtm-distributed/values.yaml b/charts/lgtm-distributed/values.yaml index f4aaaa8347..3a9c349dfc 100644 --- a/charts/lgtm-distributed/values.yaml +++ b/charts/lgtm-distributed/values.yaml @@ -106,3 +106,7 @@ tempo: enabled: true ingester: replicas: 1 + +grafana-oncall: + # -- Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference. + enabled: false \ No newline at end of file From c3311b256354ca6d4962aa77cf2ccb6aea626db5 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:22:24 +0530 Subject: [PATCH 087/152] Update README.md Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index 656dd74ac9..69fd9e958b 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -24,6 +24,7 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | Repository | Name | Version | |------------|------|---------| +| https://github.com/grafana/oncall | oncall(grafana-oncall) | ^1.3.114 | | https://grafana.github.io/helm-charts | grafana(grafana) | ^7.3.9 | | https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.79.0 | | https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.3.0 | @@ -33,6 +34,7 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | Key | Type | Default | Description | |-----|------|---------|-------------| +| grafana-oncall.enabled | bool | `false` | Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference. | | grafana.datasources | object | `{"datasources.yaml":{"apiVersion":1,"datasources":[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]}}` | Grafana data sources config. Connects to all three by default | | grafana.datasources."datasources.yaml".datasources | list | `[{"isDefault":false,"name":"Loki","type":"loki","uid":"loki","url":"http://{{ .Release.Name }}-loki-gateway"},{"isDefault":true,"name":"Mimir","type":"prometheus","uid":"prom","url":"http://{{ .Release.Name }}-mimir-nginx/prometheus"},{"isDefault":false,"jsonData":{"lokiSearch":{"datasourceUid":"loki"},"serviceMap":{"datasourceUid":"prom"},"tracesToLogsV2":{"datasourceUid":"loki"},"tracesToMetrics":{"datasourceUid":"prom"}},"name":"Tempo","type":"tempo","uid":"tempo","url":"http://{{ .Release.Name }}-tempo-query-frontend:3100"}]` | Datasources linked to the Grafana instance. Override if you disable any components. | | grafana.enabled | bool | `true` | Deploy Grafana if enabled. See [upstream readme](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration) for full values reference. | From ce2b1cdf9a7ed114476d80005f3f486f63078929 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:33:58 +0530 Subject: [PATCH 088/152] Update Chart.yaml Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 0351540a9b..cbae3b57d6 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -63,5 +63,5 @@ dependencies: - name: grafana-oncall alias: oncall condition: grafana-oncall.enabled - repository: https://github.com/grafana/oncall + repository: "https://grafana.github.io/helm-charts" version: "^1.3.114" From 1245ae2110595c5fffc56f2f39f8504d0a658a05 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:37:44 +0530 Subject: [PATCH 089/152] Update Chart.yaml Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index cbae3b57d6..f5cf1e6f24 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -60,7 +60,7 @@ dependencies: condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.9.2" - - name: grafana-oncall + - name: oncall alias: oncall condition: grafana-oncall.enabled repository: "https://grafana.github.io/helm-charts" From 7d19bf2a303d43e7f060613538371c2762687429 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:46:35 +0530 Subject: [PATCH 090/152] Update Chart.yaml Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index f5cf1e6f24..77476939ce 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -61,7 +61,7 @@ dependencies: repository: "https://grafana.github.io/helm-charts" version: "^1.9.2" - name: oncall - alias: oncall + alias: grafana-oncall condition: grafana-oncall.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.3.114" From 6a4ea728c2022dfd83cc5af126f0a7911f5e8a4b Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:50:16 +0530 Subject: [PATCH 091/152] Add new line at the end in Chart.yaml Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 77476939ce..50c63bfaaf 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -64,4 +64,4 @@ dependencies: alias: grafana-oncall condition: grafana-oncall.enabled repository: "https://grafana.github.io/helm-charts" - version: "^1.3.114" + version: "^1.3.114" From 329a36383265c0656b538fb0be7875589e3f21dc Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 08:55:19 +0530 Subject: [PATCH 092/152] Fix CI lint Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/Chart.yaml | 2 +- charts/lgtm-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/lgtm-distributed/Chart.yaml b/charts/lgtm-distributed/Chart.yaml index 50c63bfaaf..77476939ce 100644 --- a/charts/lgtm-distributed/Chart.yaml +++ b/charts/lgtm-distributed/Chart.yaml @@ -64,4 +64,4 @@ dependencies: alias: grafana-oncall condition: grafana-oncall.enabled repository: "https://grafana.github.io/helm-charts" - version: "^1.3.114" + version: "^1.3.114" diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index 69fd9e958b..12b92a0135 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -24,10 +24,10 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | Repository | Name | Version | |------------|------|---------| -| https://github.com/grafana/oncall | oncall(grafana-oncall) | ^1.3.114 | | https://grafana.github.io/helm-charts | grafana(grafana) | ^7.3.9 | | https://grafana.github.io/helm-charts | loki(loki-distributed) | ^0.79.0 | | https://grafana.github.io/helm-charts | mimir(mimir-distributed) | ^5.3.0 | +| https://grafana.github.io/helm-charts | grafana-oncall(oncall) | ^1.3.114 | | https://grafana.github.io/helm-charts | tempo(tempo-distributed) | ^1.9.2 | ## Values From c30a198c584b481f48b46911d70fcef3c764ceb2 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 22 Jun 2024 09:00:54 +0530 Subject: [PATCH 093/152] Add new line at the end in values.yaml Signed-off-by: Sheikh-Abubaker --- charts/lgtm-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lgtm-distributed/values.yaml b/charts/lgtm-distributed/values.yaml index 3a9c349dfc..1bc71d4081 100644 --- a/charts/lgtm-distributed/values.yaml +++ b/charts/lgtm-distributed/values.yaml @@ -109,4 +109,4 @@ tempo: grafana-oncall: # -- Deploy Grafana OnCall if enabled. See [upstream values.yaml](https://github.com/grafana/oncall/blob/dev/helm/oncall/values.yaml) for full values reference. - enabled: false \ No newline at end of file + enabled: false From 860a71961e4875b4ba0a2d614eb37932861c73bc Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Mon, 24 Jun 2024 22:19:17 +0530 Subject: [PATCH 094/152] Bump Version Signed-off-by: Sheikh-Abubaker --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index d412ab048a..f967f34e85 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 3.0.0 -version: 6.16.1 +version: 6.16.2 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index e9cbcb4885..92313ce28d 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.1](https://img.shields.io/badge/Version-6.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.16.2](https://img.shields.io/badge/Version-6.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance From b9f76df6078af1050f1f360a2297bafec8b9b52a Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Sun, 26 May 2024 01:18:21 +0300 Subject: [PATCH 095/152] [tempo-distributed]: add zone aware replication to ingester Signed-off-by: Aviv Guiser --- .../templates/ingester/_helpers-ingester.tpl | 87 +++++++++++++++++++ .../ingester/statefulset-ingester.yaml | 21 +++-- charts/tempo-distributed/values.yaml | 63 ++++++++++++++ 3 files changed, 164 insertions(+), 7 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 78a1692d7e..16624f49fc 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -5,3 +5,90 @@ ingester imagePullSecrets {{- $dict := dict "tempo" .Values.tempo.image "component" .Values.ingester.image "global" .Values.global.image -}} {{- include "tempo.imagePullSecrets" $dict -}} {{- end }} +{{- define "ingester.zoneAwareReplicationMap" -}} +{{- $zonesMap := (dict) -}} +{{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "nodeSelector" .ctx.Values.ingester.nodeSelector "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}} + +{{- if .ctx.Values.ingester.zoneAwareReplication.enabled -}} +{{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} +{{- if lt $numberOfZones 3 -}} +{{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} +{{- end -}} + +{{- $requestedReplicas := .ctx.Values.ingester.replicas -}} +{{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} + +{{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} +{{- $_ := set $zonesMap $rolloutZone.name (dict + "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) + "nodeSelector" ($rolloutZone.nodeSelector | default (dict) ) + "replicas" $replicaPerZone + "storageClass" $rolloutZone.storageClass + ) -}} +{{- end -}} +{{- if .ctx.Values.ingester.zoneAwareReplication.migration.enabled -}} +{{- if .ctx.Values.ingester.zoneAwareReplication.migration.scaleDownDefaultZone -}} +{{- $_ := set $defaultZone "replicas" 0 -}} +{{- end -}} +{{- $_ := set $zonesMap "" $defaultZone -}} +{{- end -}} + +{{- else -}} +{{- $_ := set $zonesMap "" $defaultZone -}} +{{- end -}} +{{- $zonesMap | toYaml }} + +{{- end -}} + +{{/* +Calculate anti-affinity for a zone +Params: + rolloutZoneName = name of the rollout zone + topologyKey = topology key +*/}} +{{- define "ingester.zoneAntiAffinity" -}} +{{- if .topologyKey -}} + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: rollout-group + operator: In + values: + - ingester + - key: zone + operator: NotIn + values: + - {{ .rolloutZoneName }} + topologyKey: {{ .topologyKey | quote }} +{{- else -}} +{} +{{- end -}} +{{- end -}} + +{{/* +Calculate annotations with zone-awareness +Params: + ctx = . context + component = component name + rolloutZoneName = rollout zone name (optional) +*/}} +{{- define "ingester.componentAnnotations" -}} +{{- $componentSection := include "ingester.componentSectionFromName" . | fromYaml -}} +{{- if and (or $componentSection.zoneAwareReplication.enabled $componentSection.zoneAwareReplication.migration.enabled) .rolloutZoneName }} +{{- $map := dict "rollout-max-unavailable" ($componentSection.zoneAwareReplication.maxUnavailable | toString) -}} +{{- toYaml (deepCopy $map | mergeOverwrite $componentSection.annotations) }} +{{- else -}} +{{ toYaml $componentSection.annotations }} +{{- end -}} +{{- end -}} + +{{/* +Resource name template +*/}} +{{- define "ingester.resourceName" -}} +{{- $resourceName := include "tempo.fullname" .ctx -}} +{{- if .component -}}{{- $resourceName = printf "%s-%s" $resourceName .component -}}{{- end -}} +{{- if .rolloutZoneName -}}{{- $resourceName = printf "%s-%s" $resourceName .rolloutZoneName -}}{{- end -}} +{{- $resourceName -}} +{{- end -}} diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 56d3ab5327..2c481cc34a 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -1,8 +1,12 @@ -{{ $dict := dict "ctx" . "component" "ingester" "memberlist" true }} +{{- $dict := dict "ctx" . "component" "ingester" "memberlist" true -}} +{{- $zonesMap := include "ingester.zoneAwareReplicationMap" $dict | fromYaml -}} +{{- range $zoneName, $rolloutZone := $zonesMap -}} +{{- with $ -}} +{{- $_ := set $dict "rolloutZoneName" $zoneName -}} apiVersion: apps/v1 kind: StatefulSet metadata: - name: {{ template "tempo.resourceName" $dict }} + name: {{ template "ingester.resourceName" $dict }} namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" $dict | nindent 4 }} @@ -11,9 +15,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: -{{- if not .Values.ingester.autoscaling.enabled }} - replicas: {{ .Values.ingester.replicas }} -{{- end }} + {{- if not .Values.ingester.autoscaling.enabled }} + replicas: {{ $rolloutZone.replicas }} + {{- end }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6}} @@ -112,11 +116,11 @@ spec: {{- tpl . $ | nindent 8 }} {{- end }} {{- end }} - {{- with .Values.ingester.affinity }} + {{- with $rolloutZone.affinity }} affinity: {{- tpl . $ | nindent 8 }} {{- end }} - {{- with .Values.ingester.nodeSelector }} + {{- with $rolloutZone.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} @@ -169,3 +173,6 @@ spec: requests: storage: {{ .Values.ingester.persistence.size | quote }} {{- end }} +--- +{{ end }} +{{ end }} \ No newline at end of file diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 198e267ae7..b8fdbe57c9 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -224,6 +224,69 @@ ingester: appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" grpc: null + zoneAwareReplication: + # -- Enable zone-aware replication for ingester + enabled: true + # -- Maximum number of ingesters that can be unavailable per zone during rollout + maxUnavailable: 50 + # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. + # E.g.: topologyKey: 'kubernetes.io/hostname' + topologyKey: null + # -- Auxiliary values for migration, see https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-single-zone-with-helm/ + migration: + # -- Indicate if migration is ongoing for multi zone ingester + enabled: false + # -- Exclude default zone on write path + excludeDefaultZone: false + # -- Enable zone-awareness, read path only + readPath: false + # -- Total number of replicas to start in availability zones when migration is enabled + replicas: 0 + # -- Scale default zone ingesters to 0 + scaleDownDefaultZone: false + # -- Enable zone-awareness, write path only + writePath: false + # -- Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. + zones: + # -- Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + - name: zone-a + # -- nodeselector to restrict where pods of this zone can be placed. E.g.: + # nodeSelector: + # topology.kubernetes.io/zone: zone-a + nodeSelector: null + # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) + extraAffinity: {} + # -- Ingester data Persistent Volume Storage Class + # If defined, storageClassName: + # If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning + # If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. + storageClass: null + # -- Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + - name: zone-b + # -- nodeselector to restrict where pods of this zone can be placed. E.g.: + # nodeSelector: + # topology.kubernetes.io/zone: zone-b + nodeSelector: null + # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) + extraAffinity: {} + # -- Ingester data Persistent Volume Storage Class + # If defined, storageClassName: + # If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning + # If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. + storageClass: null + # -- Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + - name: zone-c + # -- nodeselector to restrict where pods of this zone can be placed. E.g.: + # nodeSelector: + # topology.kubernetes.io/zone: zone-c + nodeSelector: null + # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) + extraAffinity: {} + # -- Ingester data Persistent Volume Storage Class + # If defined, storageClassName: + # If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning + # If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. + storageClass: null # Configuration for the metrics-generator metricsGenerator: From 8a3410ce3e9d543ff502abffa9d71417ba273748 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 27 May 2024 23:18:08 +0300 Subject: [PATCH 096/152] added rollout operator dep and adjusted the rest of the chart Signed-off-by: Aviv Guiser --- charts/tempo-distributed/Chart.lock | 7 +- charts/tempo-distributed/Chart.yaml | 5 ++ .../templates/ingester/_helpers-ingester.tpl | 86 +++++++++++++------ .../ingester/statefulset-ingester.yaml | 15 +++- charts/tempo-distributed/values.yaml | 25 ++---- 5 files changed, 90 insertions(+), 48 deletions(-) diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock index 03cf000ca3..4c3ac250e8 100644 --- a/charts/tempo-distributed/Chart.lock +++ b/charts/tempo-distributed/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: grafana-agent-operator repository: https://grafana.github.io/helm-charts version: 0.2.2 -digest: sha256:761a500ff2fd8b8c5a52b70683abcdec8b6ffcae6b81ad26ea4ddeddbaf609f1 -generated: "2023-09-28T13:42:34.486521-07:00" +- name: rollout-operator + repository: https://grafana.github.io/helm-charts + version: 0.15.0 +digest: sha256:7be5c7a4c0d1a71dc6de69b8e99ac5a61c1771d6241e7f9105393cc7117d4f0a +generated: "2024-05-27T19:15:20.601670632+03:00" diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 34d8b8b918..1c68a71fd2 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -31,3 +31,8 @@ dependencies: version: 0.2.2 repository: https://grafana.github.io/helm-charts condition: metaMonitoring.grafanaAgent.installOperator + - name: rollout-operator + alias: rollout_operator + repository: https://grafana.github.io/helm-charts + version: 0.15.0 + condition: rollout_operator.enabled diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 16624f49fc..6ca7ee1dc9 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -1,6 +1,3 @@ -{{/* -ingester imagePullSecrets -*/}} {{- define "tempo.ingesterImagePullSecrets" -}} {{- $dict := dict "tempo" .Values.tempo.image "component" .Values.ingester.image "global" .Values.global.image -}} {{- include "tempo.imagePullSecrets" $dict -}} @@ -8,16 +5,13 @@ ingester imagePullSecrets {{- define "ingester.zoneAwareReplicationMap" -}} {{- $zonesMap := (dict) -}} {{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "nodeSelector" .ctx.Values.ingester.nodeSelector "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}} - {{- if .ctx.Values.ingester.zoneAwareReplication.enabled -}} {{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} {{- if lt $numberOfZones 3 -}} {{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} {{- end -}} - {{- $requestedReplicas := .ctx.Values.ingester.replicas -}} {{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} - {{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} {{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) @@ -26,20 +20,9 @@ ingester imagePullSecrets "storageClass" $rolloutZone.storageClass ) -}} {{- end -}} -{{- if .ctx.Values.ingester.zoneAwareReplication.migration.enabled -}} -{{- if .ctx.Values.ingester.zoneAwareReplication.migration.scaleDownDefaultZone -}} -{{- $_ := set $defaultZone "replicas" 0 -}} -{{- end -}} -{{- $_ := set $zonesMap "" $defaultZone -}} -{{- end -}} - -{{- else -}} -{{- $_ := set $zonesMap "" $defaultZone -}} -{{- end -}} {{- $zonesMap | toYaml }} - {{- end -}} - +{{- end -}} {{/* Calculate anti-affinity for a zone Params: @@ -48,7 +31,7 @@ Params: */}} {{- define "ingester.zoneAntiAffinity" -}} {{- if .topologyKey -}} - podAntiAffinity: + podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: @@ -73,16 +56,38 @@ Params: component = component name rolloutZoneName = rollout zone name (optional) */}} -{{- define "ingester.componentAnnotations" -}} -{{- $componentSection := include "ingester.componentSectionFromName" . | fromYaml -}} -{{- if and (or $componentSection.zoneAwareReplication.enabled $componentSection.zoneAwareReplication.migration.enabled) .rolloutZoneName }} -{{- $map := dict "rollout-max-unavailable" ($componentSection.zoneAwareReplication.maxUnavailable | toString) -}} -{{- toYaml (deepCopy $map | mergeOverwrite $componentSection.annotations) }} +{{- define "ingester.Annotations" -}} +{{- if and .ctx.Values.ingester.zoneAwareReplication.maxUnavailable .rolloutZoneName }} +{{- $map := dict "rollout-max-unavailable" (.ctx.Values.ingester.zoneAwareReplication.maxUnavailable | toString) -}} +{{- toYaml (deepCopy $map | mergeOverwrite .ctx.Values.ingester.annotations) }} {{- else -}} -{{ toYaml $componentSection.annotations }} +{{ toYaml .ctx.Values.ingester.annotations }} {{- end -}} {{- end -}} +{{/* +ingester labels +*/}} +{{- define "ingester.labels" -}} +{{- if and .ctx.Values.ingester.zoneAwareReplication.enabled .rolloutZoneName }} +name: {{ printf "%s-%s" .component .rolloutZoneName }} +rollout-group: {{ .component }} +zone: {{ .rolloutZoneName }} +{{- end }} +helm.sh/chart: {{ include "tempo.chart" .ctx }} +app.kubernetes.io/name: {{ include "tempo.name" .ctx }} +app.kubernetes.io/instance: {{ .ctx.Release.Name }} +{{- if .component }} +app.kubernetes.io/component: {{ .component }} +{{- end }} +{{- if .memberlist }} +app.kubernetes.io/part-of: memberlist +{{- end }} +{{- if .ctx.Chart.AppVersion }} +app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .ctx.Release.Service }} +{{- end -}} {{/* Resource name template */}} @@ -92,3 +97,34 @@ Resource name template {{- if .rolloutZoneName -}}{{- $resourceName = printf "%s-%s" $resourceName .rolloutZoneName -}}{{- end -}} {{- $resourceName -}} {{- end -}} + + +{{/* +ingester selector labels +Params: + ctx = . context + component = name of the component + rolloutZoneName = rollout zone name (optional) +*/}} +{{- define "ingester.selectorLabels" -}} +{{- if .ctx.Values.enterprise.legacyLabels }} +{{- if .component -}} +app: {{ include "tempo.name" .ctx }}-{{ .component }} +{{- end }} +release: {{ .ctx.Release.Name }} +{{- else -}} +app.kubernetes.io/name: {{ include "tempo.name" .ctx }} +app.kubernetes.io/instance: {{ .ctx.Release.Name }} +{{- if .component }} +app.kubernetes.io/component: {{ .component }} +{{- end }} +{{- end -}} +{{- if .rolloutZoneName }} +{{- if not .component }} +{{- printf "Component name cannot be empty if rolloutZoneName (%s) is set" .rolloutZoneName | fail }} +{{- end }} +rollout-group: {{ .component }} +zone: {{ .rolloutZoneName }} +{{- end }} +{{- end -}} + diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 2c481cc34a..3c384430e5 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -9,23 +9,32 @@ metadata: name: {{ template "ingester.resourceName" $dict }} namespace: {{ .Release.Namespace }} labels: - {{- include "tempo.labels" $dict | nindent 4 }} + {{- include "ingester.labels" $dict | indent 4 }} + {{- if .Values.ingester.zoneAwareReplication.enabled }} + annotations: + {{- include "ingester.Annotations" $dict | nindent 4}} + {{- else }} {{- with .Values.ingester.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} + {{- end }} spec: {{- if not .Values.ingester.autoscaling.enabled }} replicas: {{ $rolloutZone.replicas }} {{- end }} selector: matchLabels: - {{- include "tempo.selectorLabels" $dict | nindent 6}} + {{- include "ingester.selectorLabels" $dict | nindent 6}} serviceName: ingester podManagementPolicy: Parallel updateStrategy: + {{- if .Values.ingester.zoneAwareReplication.enabled }} + type: OnDelete + {{- else }} rollingUpdate: partition: 0 + {{- end }} template: metadata: labels: @@ -118,7 +127,7 @@ spec: {{- end }} {{- with $rolloutZone.affinity }} affinity: - {{- tpl . $ | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} {{- with $rolloutZone.nodeSelector }} nodeSelector: diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b8fdbe57c9..fd2ed6a01b 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -231,21 +231,7 @@ ingester: maxUnavailable: 50 # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. # E.g.: topologyKey: 'kubernetes.io/hostname' - topologyKey: null - # -- Auxiliary values for migration, see https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-single-zone-with-helm/ - migration: - # -- Indicate if migration is ongoing for multi zone ingester - enabled: false - # -- Exclude default zone on write path - excludeDefaultZone: false - # -- Enable zone-awareness, read path only - readPath: false - # -- Total number of replicas to start in availability zones when migration is enabled - replicas: 0 - # -- Scale default zone ingesters to 0 - scaleDownDefaultZone: false - # -- Enable zone-awareness, write path only - writePath: false + topologyKey: 'kubernetes.io/hostname' # -- Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. zones: # -- Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ @@ -253,7 +239,8 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-a - nodeSelector: null + nodeSelector: + topology.kubernetes.io/zone: zone-a # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class @@ -266,7 +253,8 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-b - nodeSelector: null + nodeSelector: + topology.kubernetes.io/zone: zone-b # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class @@ -279,7 +267,8 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-c - nodeSelector: null + nodeSelector: + topology.kubernetes.io/zone: zone-c # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class From 252c34eb50304342c5c890b8af9068a26db8738f Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 27 May 2024 23:25:20 +0300 Subject: [PATCH 097/152] add zone_awareness_enabled in cofig file Signed-off-by: Aviv Guiser --- charts/tempo-distributed/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index fd2ed6a01b..e824c3caca 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1276,6 +1276,9 @@ config: | lifecycler: ring: replication_factor: {{ .Values.ingester.config.replication_factor }} + {{- if .Values.ingester.zoneAwareReplication.enabled }} + zone_awareness_enabled: true + {{- end }} kvstore: store: memberlist tokens_file_path: /var/tempo/tokens.json From 0cb33d9f1cb67bb6014a180165c6709a681cf33c Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 27 May 2024 23:31:34 +0300 Subject: [PATCH 098/152] bump chart versio and update docs Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index c3877ac6e6..3160125a08 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -14,6 +14,7 @@ Grafana Tempo in MicroService mode |------------|------|---------| | https://charts.min.io/ | minio(minio) | 4.0.12 | | https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.2.2 | +| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.15.0 | ## Chart Repo @@ -519,6 +520,22 @@ The memcached default args are removed and should be provided manually. The sett | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | +| ingester.zoneAwareReplication.enabled | bool | `true` | Enable zone-aware replication for ingester | +| ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | +| ingester.zoneAwareReplication.topologyKey | string | `"kubernetes.io/hostname"` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | +| ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":{"topology.kubernetes.io/zone":"zone-a"},"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":{"topology.kubernetes.io/zone":"zone-b"},"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":{"topology.kubernetes.io/zone":"zone-c"},"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | +| ingester.zoneAwareReplication.zones[0] | object | `{"extraAffinity":{},"name":"zone-a","nodeSelector":{"topology.kubernetes.io/zone":"zone-a"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.zones[0].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | +| ingester.zoneAwareReplication.zones[0].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-a"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-a | +| ingester.zoneAwareReplication.zones[0].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | +| ingester.zoneAwareReplication.zones[1] | object | `{"extraAffinity":{},"name":"zone-b","nodeSelector":{"topology.kubernetes.io/zone":"zone-b"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.zones[1].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | +| ingester.zoneAwareReplication.zones[1].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-b"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-b | +| ingester.zoneAwareReplication.zones[1].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | +| ingester.zoneAwareReplication.zones[2] | object | `{"extraAffinity":{},"name":"zone-c","nodeSelector":{"topology.kubernetes.io/zone":"zone-c"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.zones[2].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | +| ingester.zoneAwareReplication.zones[2].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-c"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-c | +| ingester.zoneAwareReplication.zones[2].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | | license.contents | string | `"NOTAVALIDLICENSE"` | | | license.external | bool | `false` | | | license.secretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"license\") }}"` | | From 5cc29fe6de361c5405dd59ae25ceadfbc3db25ec Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 27 May 2024 23:53:16 +0300 Subject: [PATCH 099/152] revert default values in values file for zone aware replication Signed-off-by: Aviv Guiser --- charts/tempo-distributed/values.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index e824c3caca..f515b6e09b 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -231,7 +231,7 @@ ingester: maxUnavailable: 50 # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. # E.g.: topologyKey: 'kubernetes.io/hostname' - topologyKey: 'kubernetes.io/hostname' + topologyKey: null # -- Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. zones: # -- Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ @@ -239,8 +239,7 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-a - nodeSelector: - topology.kubernetes.io/zone: zone-a + nodeSelector: null # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class @@ -253,8 +252,7 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-b - nodeSelector: - topology.kubernetes.io/zone: zone-b + nodeSelector: null # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class @@ -267,8 +265,7 @@ ingester: # -- nodeselector to restrict where pods of this zone can be placed. E.g.: # nodeSelector: # topology.kubernetes.io/zone: zone-c - nodeSelector: - topology.kubernetes.io/zone: zone-c + nodeSelector: null # -- extraAffinity adds user defined custom affinity rules (merged with generated rules) extraAffinity: {} # -- Ingester data Persistent Volume Storage Class From 5bb00c6a0b7e49160fe37b489b292cb7d4d90a17 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Tue, 28 May 2024 00:02:16 +0300 Subject: [PATCH 100/152] ran helm docs again and fixed selector Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 16 +++--- .../templates/ingester/_helpers-ingester.tpl | 50 +++++++++++++++++++ .../ingester/statefulset-ingester.yaml | 2 +- 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 3160125a08..838cdff8de 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -522,19 +522,19 @@ The memcached default args are removed and should be provided manually. The sett | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | | ingester.zoneAwareReplication.enabled | bool | `true` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | -| ingester.zoneAwareReplication.topologyKey | string | `"kubernetes.io/hostname"` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | -| ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":{"topology.kubernetes.io/zone":"zone-a"},"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":{"topology.kubernetes.io/zone":"zone-b"},"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":{"topology.kubernetes.io/zone":"zone-c"},"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | -| ingester.zoneAwareReplication.zones[0] | object | `{"extraAffinity":{},"name":"zone-a","nodeSelector":{"topology.kubernetes.io/zone":"zone-a"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | +| ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | +| ingester.zoneAwareReplication.zones[0] | object | `{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | | ingester.zoneAwareReplication.zones[0].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | -| ingester.zoneAwareReplication.zones[0].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-a"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-a | +| ingester.zoneAwareReplication.zones[0].nodeSelector | string | `nil` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-a | | ingester.zoneAwareReplication.zones[0].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | -| ingester.zoneAwareReplication.zones[1] | object | `{"extraAffinity":{},"name":"zone-b","nodeSelector":{"topology.kubernetes.io/zone":"zone-b"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.zones[1] | object | `{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | | ingester.zoneAwareReplication.zones[1].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | -| ingester.zoneAwareReplication.zones[1].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-b"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-b | +| ingester.zoneAwareReplication.zones[1].nodeSelector | string | `nil` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-b | | ingester.zoneAwareReplication.zones[1].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | -| ingester.zoneAwareReplication.zones[2] | object | `{"extraAffinity":{},"name":"zone-c","nodeSelector":{"topology.kubernetes.io/zone":"zone-c"},"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | +| ingester.zoneAwareReplication.zones[2] | object | `{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}` | Name of the zone, used in labels and selectors. Must follow Kubernetes naming restrictions: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ | | ingester.zoneAwareReplication.zones[2].extraAffinity | object | `{}` | extraAffinity adds user defined custom affinity rules (merged with generated rules) | -| ingester.zoneAwareReplication.zones[2].nodeSelector | object | `{"topology.kubernetes.io/zone":"zone-c"}` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-c | +| ingester.zoneAwareReplication.zones[2].nodeSelector | string | `nil` | nodeselector to restrict where pods of this zone can be placed. E.g.: nodeSelector: topology.kubernetes.io/zone: zone-c | | ingester.zoneAwareReplication.zones[2].storageClass | string | `nil` | Ingester data Persistent Volume Storage Class If defined, storageClassName: If set to "-", then use `storageClassName: ""`, which disables dynamic provisioning If undefined or set to null (the default), then fall back to the value of `ingester.persistentVolume.storageClass`. | | license.contents | string | `"NOTAVALIDLICENSE"` | | | license.external | bool | `false` | | diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 6ca7ee1dc9..20c6a00f4c 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -128,3 +128,53 @@ zone: {{ .rolloutZoneName }} {{- end }} {{- end -}} +{{/* +ingester POD labels +Params: + ctx = . context + component = name of the component + memberlist = true if part of memberlist gossip ring + rolloutZoneName = rollout zone name (optional) +*/}} +{{- define "ingester.podLabels" -}} +{{ with .ctx.Values.global.podLabels -}} +{{ toYaml . }} +{{ end }} +{{- if .ctx.Values.enterprise.legacyLabels }} +{{- if .component -}} +app: {{ include "tempo.name" .ctx }}-{{ .component }} +{{- if not .rolloutZoneName }} +name: {{ .component }} +{{- end }} +{{- end }} +{{- if .memberlist }} +gossip_ring_member: "true" +{{- end -}} +{{- if .component }} +target: {{ .component }} +release: {{ .ctx.Release.Name }} +{{- end }} +{{- else -}} +helm.sh/chart: {{ include "tempo.chart" .ctx }} +app.kubernetes.io/name: {{ include "tempo.name" .ctx }} +app.kubernetes.io/instance: {{ .ctx.Release.Name }} +app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }} +app.kubernetes.io/managed-by: {{ .ctx.Release.Service }} +{{- if .component }} +app.kubernetes.io/component: {{ .component }} +{{- end }} +{{- if .memberlist }} +app.kubernetes.io/part-of: memberlist +{{- end }} +{{- end }} +{{- with .ctx.Values.ingester.podLabels }} +{{ toYaml . }} +{{- end }} +{{- if .rolloutZoneName }} +{{- if not .component }} +{{- printf "Component name cannot be empty if rolloutZoneName (%s) is set" .rolloutZoneName | fail }} +{{- end }} +rollout-group: ingester +zone: {{ .rolloutZoneName }} +{{- end }} +{{- end -}} \ No newline at end of file diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 3c384430e5..a88117bcbb 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -38,7 +38,7 @@ spec: template: metadata: labels: - {{- include "tempo.podLabels" $dict | nindent 8 }} + {{- include "ingester.podLabels" $dict | nindent 8 }} {{- with .Values.tempo.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} From c253a3cca2bbbe93a0955bb0a6081566fb03ee92 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Fri, 7 Jun 2024 21:36:13 +0300 Subject: [PATCH 101/152] changed default value of zone aware replication to false Signed-off-by: Aviv Guiser --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f515b6e09b..fc3a62a9f4 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -226,7 +226,7 @@ ingester: grpc: null zoneAwareReplication: # -- Enable zone-aware replication for ingester - enabled: true + enabled: false # -- Maximum number of ingesters that can be unavailable per zone during rollout maxUnavailable: 50 # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. From ed486442c6b3434bdd5a16c5b14dd6008520a03b Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Fri, 7 Jun 2024 22:03:45 +0300 Subject: [PATCH 102/152] bump chart version Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 838cdff8de..83d2f3222b 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -520,7 +520,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | -| ingester.zoneAwareReplication.enabled | bool | `true` | Enable zone-aware replication for ingester | +| ingester.zoneAwareReplication.enabled | bool | `false` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | | ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | | ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | From f21a110c33602ac159c2070e4b0f24f452fcb97b Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 10 Jun 2024 22:30:39 +0300 Subject: [PATCH 103/152] fix indention and yaml error Signed-off-by: Aviv Guiser --- .../templates/ingester/_helpers-ingester.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 20c6a00f4c..91242d36da 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -35,15 +35,15 @@ Params: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: rollout-group + - key: rollout-group operator: In values: - - ingester - - key: zone + - ingester + - key: zone operator: NotIn values: - - {{ .rolloutZoneName }} - topologyKey: {{ .topologyKey | quote }} + - {{ .rolloutZoneName }} + topologyKey: {{ .topologyKey | quote }} {{- else -}} {} {{- end -}} From 07118e10aa3d02fe827f361cd2ed0290cbce705f Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 24 Jun 2024 23:01:46 +0300 Subject: [PATCH 104/152] add to readme Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 9 +++++++-- charts/tempo-distributed/README.md.gotmpl | 5 +++++ charts/tempo-distributed/values.yaml | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 83d2f3222b..02be9f47cb 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -46,6 +46,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### from Chart versions < 1.11.0 + +Zone Aware Replication has been added to the ingester statefulset. +Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` + ### From Chart versions < 1.8.0 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. @@ -514,13 +519,13 @@ The memcached default args are removed and should be provided manually. The sett | ingester.podAnnotations | object | `{}` | Annotations for ingester pods | | ingester.podLabels | object | `{}` | Labels for ingester pods | | ingester.priorityClassName | string | `nil` | The name of the PriorityClass for ingester pods | -| ingester.replicas | int | `3` | Number of replicas for the ingester | +| ingester.replicas | int | `12` | Number of replicas for the ingester | | ingester.resources | object | `{}` | Resource requests and limits for the ingester | | ingester.service.annotations | object | `{}` | Annotations for ingester service | | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | -| ingester.zoneAwareReplication.enabled | bool | `false` | Enable zone-aware replication for ingester | +| ingester.zoneAwareReplication.enabled | bool | `true` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | | ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | | ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 446c654362..b9faf810a0 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,6 +39,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### from Chart versions < 1.11.0 + +Zone Aware Replication has been added to the ingester statefulset. +Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` + ### From Chart versions < 1.8.0 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index fc3a62a9f4..9f0acc8ff4 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -106,7 +106,7 @@ ingester: # -- Annotations for the ingester StatefulSet annotations: {} # -- Number of replicas for the ingester - replicas: 3 + replicas: 12 # -- hostAliases to add hostAliases: [] # - ip: 1.2.3.4 @@ -226,7 +226,7 @@ ingester: grpc: null zoneAwareReplication: # -- Enable zone-aware replication for ingester - enabled: false + enabled: true # -- Maximum number of ingesters that can be unavailable per zone during rollout maxUnavailable: 50 # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. From d9e70f3f5ec2286c9315bc1865b9d019a1fd45d5 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 24 Jun 2024 23:30:40 +0300 Subject: [PATCH 105/152] set zone aware replcation to false Signed-off-by: Aviv Guiser --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 9f0acc8ff4..fdd824bd3d 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -226,7 +226,7 @@ ingester: grpc: null zoneAwareReplication: # -- Enable zone-aware replication for ingester - enabled: true + enabled: false # -- Maximum number of ingesters that can be unavailable per zone during rollout maxUnavailable: 50 # -- topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. From fe8ee3b8d7a2e79edf0cafb5e8809ad0a99c4d67 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Mon, 24 Jun 2024 23:35:05 +0300 Subject: [PATCH 106/152] bump version Signed-off-by: Aviv Guiser --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 1c68a71fd2..e2e81e30a9 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.12.0 +version: 1.13.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 02be9f47cb..afef8e10f7 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -525,7 +525,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | -| ingester.zoneAwareReplication.enabled | bool | `true` | Enable zone-aware replication for ingester | +| ingester.zoneAwareReplication.enabled | bool | `false` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | | ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | | ingester.zoneAwareReplication.zones | list | `[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]` | Zone definitions for ingester zones. Note: you have to redefine the whole list to change parts as YAML does not allow to modify parts of a list. | From bf136fa38ee39d5131cdb93363a83c0210d21a2b Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Tue, 25 Jun 2024 21:04:14 +0300 Subject: [PATCH 107/152] updated docs Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 3 ++- charts/tempo-distributed/README.md.gotmpl | 2 +- charts/tempo-distributed/values.yaml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index afef8e10f7..40f0609806 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -48,7 +48,7 @@ A major chart version change indicates that there is an incompatible breaking ch ### from Chart versions < 1.11.0 -Zone Aware Replication has been added to the ingester statefulset. +EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` ### From Chart versions < 1.8.0 @@ -525,6 +525,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | +| ingester.zoneAwareReplication | object | `{"enabled":false,"maxUnavailable":50,"topologyKey":null,"zones":[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]}` | EXPERIMENTAL Feature, disabled by default | | ingester.zoneAwareReplication.enabled | bool | `false` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | | ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index b9faf810a0..446d02f9f7 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -41,7 +41,7 @@ A major chart version change indicates that there is an incompatible breaking ch ### from Chart versions < 1.11.0 -Zone Aware Replication has been added to the ingester statefulset. +EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` ### From Chart versions < 1.8.0 diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index fdd824bd3d..3da525c6f0 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -224,6 +224,7 @@ ingester: appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" grpc: null + # -- EXPERIMENTAL Feature, disabled by default zoneAwareReplication: # -- Enable zone-aware replication for ingester enabled: false From 5c853bf26bf86de814a6db538ec156c2bfa908b2 Mon Sep 17 00:00:00 2001 From: Aviv Guiser Date: Tue, 25 Jun 2024 21:16:28 +0300 Subject: [PATCH 108/152] fix lint Signed-off-by: Aviv Guiser --- charts/tempo-distributed/README.md | 4 ++-- charts/tempo-distributed/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 40f0609806..edb2108b1f 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -519,13 +519,13 @@ The memcached default args are removed and should be provided manually. The sett | ingester.podAnnotations | object | `{}` | Annotations for ingester pods | | ingester.podLabels | object | `{}` | Labels for ingester pods | | ingester.priorityClassName | string | `nil` | The name of the PriorityClass for ingester pods | -| ingester.replicas | int | `12` | Number of replicas for the ingester | +| ingester.replicas | int | `3` | Number of replicas for the ingester | | ingester.resources | object | `{}` | Resource requests and limits for the ingester | | ingester.service.annotations | object | `{}` | Annotations for ingester service | | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | -| ingester.zoneAwareReplication | object | `{"enabled":false,"maxUnavailable":50,"topologyKey":null,"zones":[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]}` | EXPERIMENTAL Feature, disabled by default | +| ingester.zoneAwareReplication | object | `{"enabled":false,"maxUnavailable":50,"topologyKey":null,"zones":[{"extraAffinity":{},"name":"zone-a","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-b","nodeSelector":null,"storageClass":null},{"extraAffinity":{},"name":"zone-c","nodeSelector":null,"storageClass":null}]}` | EXPERIMENTAL Feature, disabled by default | | ingester.zoneAwareReplication.enabled | bool | `false` | Enable zone-aware replication for ingester | | ingester.zoneAwareReplication.maxUnavailable | int | `50` | Maximum number of ingesters that can be unavailable per zone during rollout | | ingester.zoneAwareReplication.topologyKey | string | `nil` | topologyKey to use in pod anti-affinity. If unset, no anti-affinity rules are generated. If set, the generated anti-affinity rule makes sure that pods from different zones do not mix. E.g.: topologyKey: 'kubernetes.io/hostname' | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 3da525c6f0..e973f35e64 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -106,7 +106,7 @@ ingester: # -- Annotations for the ingester StatefulSet annotations: {} # -- Number of replicas for the ingester - replicas: 12 + replicas: 3 # -- hostAliases to add hostAliases: [] # - ip: 1.2.3.4 @@ -224,7 +224,7 @@ ingester: appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" grpc: null - # -- EXPERIMENTAL Feature, disabled by default + # -- EXPERIMENTAL Feature, disabled by default zoneAwareReplication: # -- Enable zone-aware replication for ingester enabled: false From 0ae9beb2712a316b5730cbcb7f9c70799e1a7c6f Mon Sep 17 00:00:00 2001 From: Salim B <9945903+sboulkour@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:35:02 +0200 Subject: [PATCH 109/152] [grafana] Update Grafana to 11.1.0 Signed-off-by: Salim BOULKOUR --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 9590f10b50..30ee9d614f 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.0.2 -appVersion: 11.0.0 +version: 8.0.3 +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 From f7ee43aaeaac1c6247787348fa582bef88e4420a Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 28 Jun 2024 01:30:09 +0530 Subject: [PATCH 110/152] Add Sheikh-Abubaker as maintainer Signed-off-by: Sheikh-Abubaker --- .github/CODEOWNERS | 6 +++--- charts/grafana/Chart.yaml | 2 +- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo/Chart.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b3d10d065f..bdeec2311b 100644 --- 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/ @jkroepke @maorfr @torstenwalter @Xtigyro @zanhsieh +/charts/grafana/ @Sheikh-Abubaker @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/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @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 index c8ca3baa03..646e901143 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.1.1 +version: 8.1.2 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index e2e81e30a9..68200b9b82 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.13.0 +version: 1.13.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 715c5b61d3..ee66a94fe6 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.10.0 +version: 1.10.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.net From f1bf707b49a882f2fbd0e50ddf3fe68b8d264a31 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 28 Jun 2024 01:44:40 +0530 Subject: [PATCH 111/152] Add Sheikh-Abubaker as maintainer Signed-off-by: Sheikh-Abubaker --- .github/CODEOWNERS | 4 ++-- charts/grafana/Chart.yaml | 2 +- charts/tempo-distributed/Chart.yaml | 2 ++ charts/tempo/Chart.yaml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bdeec2311b..eb52641daa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,11 +6,11 @@ # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. * @grafana/helm-charts-admins -/charts/grafana/ @Sheikh-Abubaker @jkroepke @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 @Sheikh-Abubaker @dgzlopes @swartz-k @BitProcessor @faustodavid +/charts/tempo/ @grafana/tempo @dgzlopes @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 diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 646e901143..0797f7fbc9 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.1.2 +version: 8.1.0 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 68200b9b82..b9f3fe1663 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -20,6 +20,8 @@ maintainers: - name: BitProcessor - name: faustodavid - name: zalegrala + - name: Sheikh-Abubaker + email: sheikhabubaker761@gmail.com dependencies: - name: minio alias: minio diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index ee66a94fe6..715c5b61d3 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.10.1 +version: 1.10.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.net From 5167edc0d24e44bf9cb2a73e0dfaff9cfe5aa258 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 28 Jun 2024 01:49:15 +0530 Subject: [PATCH 112/152] Revert grafana chart version to 8.1.1 and fix CI lint Signed-off-by: Sheikh-Abubaker --- charts/grafana/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 0797f7fbc9..c8ca3baa03 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.1.0 +version: 8.1.1 appVersion: 11.0.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index edb2108b1f..a42c841aa6 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.13.1](https://img.shields.io/badge/Version-1.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 47863ea7f34f29bcdac29770f8b8ccd94cf65bf5 Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Fri, 28 Jun 2024 00:37:35 +0200 Subject: [PATCH 113/152] [grafana] add support for dual stack clusters (#3066) Co-authored-by: MH --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 2 ++ charts/grafana/templates/service.yaml | 6 ++++++ charts/grafana/values.yaml | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index c8ca3baa03..fd8af852e7 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.1.1 +version: 8.2.0 appVersion: 11.0.0 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 20076cde44..23d6b67496 100644 --- 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` | diff --git a/charts/grafana/templates/service.yaml b/charts/grafana/templates/service.yaml index e9396a15c6..022328c114 100644 --- 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 }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 52a0864f89..d4e624c750 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -224,6 +224,10 @@ gossipPortName: gossip service: enabled: true type: ClusterIP + # Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services) + ipFamilyPolicy: "" + # Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6. + ipFamilies: [] loadBalancerIP: "" loadBalancerClass: "" loadBalancerSourceRanges: [] From 0f2fed14f6135f73aec3da898ac960ea054714fc Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 29 Jun 2024 13:20:47 +0530 Subject: [PATCH 114/152] Trigger CI lint Signed-off-by: Sheikh-Abubaker From 25df02c0a210837b9df969e4b11d740a676019cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 1 Jul 2024 18:21:12 +0200 Subject: [PATCH 115/152] fix version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 94013e2be0..09ed9079c9 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.2.1 -appVersion: 11.1.1 +version: 8.2.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 From 88de2647f8b51c3f19978a249ef0737dc954918f Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 14:01:04 +0300 Subject: [PATCH 116/152] set rollout_operator to false be default ,fix default zone for upgrade Signed-off-by: AvivGuiser --- charts/tempo-distributed/README.md | 3 +- charts/tempo-distributed/README.md.gotmpl | 6 ++-- .../templates/ingester/_helpers-ingester.tpl | 32 ++++++++++--------- charts/tempo-distributed/values.yaml | 2 ++ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a42c841aa6..de41ce4fac 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -46,7 +46,7 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.11.0 +### from Chart versions < 1.12.0 EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` @@ -766,6 +766,7 @@ The memcached default args are removed and should be provided manually. The sett | rbac.create | bool | `false` | Specifies whether RBAC manifests should be created | | rbac.pspEnabled | bool | `false` | Specifies whether a PodSecurityPolicy should be created | | reportingEnabled | bool | `true` | If true, Tempo will report anonymous usage data about the shape of a deployment to Grafana Labs | +| rollout_operator.enabled | bool | `false` | | | server.grpc_server_max_recv_msg_size | int | `4194304` | Max gRPC message size that can be received | | server.grpc_server_max_send_msg_size | int | `4194304` | Max gRPC message size that can be sent | | server.httpListenPort | int | `3100` | HTTP server listen host | diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 446d02f9f7..3fd2fdc769 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,10 +39,10 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.11.0 +### from Chart versions < 1.12.0 -EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. -Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` +EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. +Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` ### From Chart versions < 1.8.0 diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 91242d36da..40a6e15b10 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -6,20 +6,22 @@ {{- $zonesMap := (dict) -}} {{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "nodeSelector" .ctx.Values.ingester.nodeSelector "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}} {{- if .ctx.Values.ingester.zoneAwareReplication.enabled -}} -{{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} -{{- if lt $numberOfZones 3 -}} -{{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} -{{- end -}} -{{- $requestedReplicas := .ctx.Values.ingester.replicas -}} -{{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} -{{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} -{{- $_ := set $zonesMap $rolloutZone.name (dict - "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) - "nodeSelector" ($rolloutZone.nodeSelector | default (dict) ) - "replicas" $replicaPerZone - "storageClass" $rolloutZone.storageClass - ) -}} -{{- end -}} + {{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} + {{- if lt $numberOfZones 3 -}} + {{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} + {{- end -}} + {{- $requestedReplicas := .ctx.Values.ingester.replicas -}} + {{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} + {{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} + {{- $_ := set $zonesMap $rolloutZone.name (dict + "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) + "nodeSelector" ($rolloutZone.nodeSelector | default (dict) ) + "replicas" $replicaPerZone + "storageClass" $rolloutZone.storageClass + ) -}} + {{- end -}} +{{- else -}} +{{- $_ := set $zonesMap "" $defaultZone -}} {{- $zonesMap | toYaml }} {{- end -}} {{- end -}} @@ -177,4 +179,4 @@ app.kubernetes.io/part-of: memberlist rollout-group: ingester zone: {{ .rolloutZoneName }} {{- end }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index e973f35e64..f6bd900a88 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -992,6 +992,8 @@ enterpriseFederationFrontend: multitenancyEnabled: false +rollout_operator: + enabled: false traces: jaeger: grpc: From 3b82c0fd339e49e2a3432499f9a31bf91e039661 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 14:06:29 +0300 Subject: [PATCH 117/152] fix Signed-off-by: AvivGuiser --- .../tempo-distributed/templates/ingester/_helpers-ingester.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 40a6e15b10..321c92ab32 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -22,8 +22,8 @@ {{- end -}} {{- else -}} {{- $_ := set $zonesMap "" $defaultZone -}} -{{- $zonesMap | toYaml }} {{- end -}} +{{- $zonesMap | toYaml }} {{- end -}} {{/* Calculate anti-affinity for a zone From ff112379c99cf054a62c54b66647cfa37f81a4bf Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 14:51:51 +0300 Subject: [PATCH 118/152] fix affinity Signed-off-by: AvivGuiser --- .../templates/ingester/_helpers-ingester.tpl | 28 +++++++++---------- .../ingester/statefulset-ingester.yaml | 12 ++++++-- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 321c92ab32..fc89667336 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -6,20 +6,20 @@ {{- $zonesMap := (dict) -}} {{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "nodeSelector" .ctx.Values.ingester.nodeSelector "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}} {{- if .ctx.Values.ingester.zoneAwareReplication.enabled -}} - {{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} - {{- if lt $numberOfZones 3 -}} - {{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} - {{- end -}} - {{- $requestedReplicas := .ctx.Values.ingester.replicas -}} - {{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} - {{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} - {{- $_ := set $zonesMap $rolloutZone.name (dict - "affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) - "nodeSelector" ($rolloutZone.nodeSelector | default (dict) ) - "replicas" $replicaPerZone - "storageClass" $rolloutZone.storageClass - ) -}} - {{- end -}} +{{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}} +{{- if lt $numberOfZones 3 -}} +{{- fail "When zone-awareness is enabled, you must have at least 3 zones defined." -}} +{{- end -}} +{{- $requestedReplicas := .ctx.Values.ingester.replicas -}} +{{- $replicaPerZone := div (add $requestedReplicas $numberOfZones -1) $numberOfZones -}} +{{- range $idx, $rolloutZone := .ctx.Values.ingester.zoneAwareReplication.zones -}} +{{- $_ := set $zonesMap $rolloutZone.name (dict +"affinity" (($rolloutZone.extraAffinity | default (dict)) | mergeOverwrite (include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml)) +"nodeSelector" ($rolloutZone.nodeSelector | default (dict) ) +"replicas" $replicaPerZone +"storageClass" $rolloutZone.storageClass +) -}} +{{- end -}} {{- else -}} {{- $_ := set $zonesMap "" $defaultZone -}} {{- end -}} diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index a88117bcbb..2a1e009cf1 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -11,7 +11,7 @@ metadata: labels: {{- include "ingester.labels" $dict | indent 4 }} {{- if .Values.ingester.zoneAwareReplication.enabled }} - annotations: + annotations: {{- include "ingester.Annotations" $dict | nindent 4}} {{- else }} {{- with .Values.ingester.annotations }} @@ -125,10 +125,18 @@ spec: {{- tpl . $ | nindent 8 }} {{- end }} {{- end }} + {{- if eq $zoneName ""}} + {{- with $rolloutZone.affinity }} + affinity: + {{- tpl . $ | nindent 8 }} + {{- end }} + {{- end }} + {{- if ne $zoneName "" }} {{- with $rolloutZone.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- end }} {{- with $rolloutZone.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -184,4 +192,4 @@ spec: {{- end }} --- {{ end }} -{{ end }} \ No newline at end of file +{{ end }} From 1782cd3d9d1f4a82b16c6a1259a513deed5fa8a4 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 15:26:24 +0300 Subject: [PATCH 119/152] add description for rollout_operator Co-authored-by: Ihor Urazov Signed-off-by: AvivGuiser --- charts/tempo-distributed/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f6bd900a88..0ede08c948 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -992,8 +992,10 @@ enterpriseFederationFrontend: multitenancyEnabled: false +# -- Enable rollout-operator. It must be enabled when using Zone Aware Replication. rollout_operator: enabled: false + traces: jaeger: grpc: From b66d2d0aacf5c95f4f243aa49f0f48e209301ab1 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 15:29:46 +0300 Subject: [PATCH 120/152] fix Signed-off-by: AvivGuiser --- charts/tempo-distributed/README.md | 4 ++-- charts/tempo-distributed/README.md.gotmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index de41ce4fac..e95c174d5a 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -46,7 +46,7 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.12.0 +### from Chart versions < 1.13.1 EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` @@ -766,7 +766,7 @@ The memcached default args are removed and should be provided manually. The sett | rbac.create | bool | `false` | Specifies whether RBAC manifests should be created | | rbac.pspEnabled | bool | `false` | Specifies whether a PodSecurityPolicy should be created | | reportingEnabled | bool | `true` | If true, Tempo will report anonymous usage data about the shape of a deployment to Grafana Labs | -| rollout_operator.enabled | bool | `false` | | +| rollout_operator | object | `{"enabled":false}` | Enable rollout-operator. It must be enabled when using Zone Aware Replication. | | server.grpc_server_max_recv_msg_size | int | `4194304` | Max gRPC message size that can be received | | server.grpc_server_max_send_msg_size | int | `4194304` | Max gRPC message size that can be sent | | server.httpListenPort | int | `3100` | HTTP server listen host | diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 3fd2fdc769..36437c56c0 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,7 +39,7 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.12.0 +### from Chart versions < 1.13.1 EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` From 8fe09df8e20c4cd40b09f66a312fc64b079f2124 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 15:32:01 +0300 Subject: [PATCH 121/152] fix trailing whitespace Signed-off-by: AvivGuiser --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0ede08c948..0fe88fd724 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -995,7 +995,7 @@ multitenancyEnabled: false # -- Enable rollout-operator. It must be enabled when using Zone Aware Replication. rollout_operator: enabled: false - + traces: jaeger: grpc: From a852ecb9adb76b0b2eebc9131a8505b168ba139b Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 26 Jun 2024 16:00:54 +0300 Subject: [PATCH 122/152] add default to rollout operator from loki chart Signed-off-by: AvivGuiser --- charts/tempo-distributed/README.md | 10 +++++++++- charts/tempo-distributed/values.yaml | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e95c174d5a..cc6deb4081 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -766,7 +766,15 @@ The memcached default args are removed and should be provided manually. The sett | rbac.create | bool | `false` | Specifies whether RBAC manifests should be created | | rbac.pspEnabled | bool | `false` | Specifies whether a PodSecurityPolicy should be created | | reportingEnabled | bool | `true` | If true, Tempo will report anonymous usage data about the shape of a deployment to Grafana Labs | -| rollout_operator | object | `{"enabled":false}` | Enable rollout-operator. It must be enabled when using Zone Aware Replication. | +| rollout_operator.enabled | bool | `false` | Enable rollout-operator. It must be enabled when using Zone Aware Replication. | +| rollout_operator.podSecurityContext.fsGroup | int | `10001` | | +| rollout_operator.podSecurityContext.runAsGroup | int | `10001` | | +| rollout_operator.podSecurityContext.runAsNonRoot | bool | `true` | | +| rollout_operator.podSecurityContext.runAsUser | int | `10001` | | +| rollout_operator.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| rollout_operator.securityContext.allowPrivilegeEscalation | bool | `false` | | +| rollout_operator.securityContext.capabilities.drop[0] | string | `"ALL"` | | +| rollout_operator.securityContext.readOnlyRootFilesystem | bool | `true` | | | server.grpc_server_max_recv_msg_size | int | `4194304` | Max gRPC message size that can be received | | server.grpc_server_max_send_msg_size | int | `4194304` | Max gRPC message size that can be sent | | server.httpListenPort | int | `3100` | HTTP server listen host | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 0fe88fd724..3f4aea96af 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -992,10 +992,25 @@ enterpriseFederationFrontend: multitenancyEnabled: false -# -- Enable rollout-operator. It must be enabled when using Zone Aware Replication. rollout_operator: +# -- Enable rollout-operator. It must be enabled when using Zone Aware Replication. enabled: false + podSecurityContext: + fsGroup: 10001 + runAsGroup: 10001 + runAsNonRoot: true + runAsUser: 10001 + seccompProfile: + type: RuntimeDefault + + # Set the container security context + securityContext: + readOnlyRootFilesystem: true + capabilities: + drop: [ALL] + allowPrivilegeEscalation: false + traces: jaeger: grpc: From d4943a1e1ebd484f80edef4faf67db995143ae1f Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 2 Jul 2024 13:42:28 +0300 Subject: [PATCH 123/152] fix version bump Signed-off-by: AvivGuiser --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md.gotmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b9f3fe1663..fae4ae8f1d 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.13.1 +version: 1.13.2 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 36437c56c0..2436bb8ab5 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,7 +39,7 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.13.1 +### from Chart versions < 1.13.0 EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` From 55b0f9778b8162ae2bc5a27ee56b7e30eaf70fa6 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 2 Jul 2024 13:46:54 +0300 Subject: [PATCH 124/152] fix docs Signed-off-by: AvivGuiser --- charts/tempo-distributed/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index cc6deb4081..90fedecd67 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.13.1](https://img.shields.io/badge/Version-1.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.13.2](https://img.shields.io/badge/Version-1.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -46,7 +46,7 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.13.1 +### from Chart versions < 1.13.0 EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` From 98ebc85654a29b009454bfc73307b5d72b8d2963 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 2 Jul 2024 21:58:02 -0400 Subject: [PATCH 125/152] bump rollouts and agent deps Signed-off-by: drfaust92 --- charts/tempo-distributed/Chart.lock | 8 ++++---- charts/tempo-distributed/Chart.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock index 4c3ac250e8..eedf785c9e 100644 --- a/charts/tempo-distributed/Chart.lock +++ b/charts/tempo-distributed/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 4.0.12 - name: grafana-agent-operator repository: https://grafana.github.io/helm-charts - version: 0.2.2 + version: 0.4.0 - name: rollout-operator repository: https://grafana.github.io/helm-charts - version: 0.15.0 -digest: sha256:7be5c7a4c0d1a71dc6de69b8e99ac5a61c1771d6241e7f9105393cc7117d4f0a -generated: "2024-05-27T19:15:20.601670632+03:00" + version: 0.16.0 +digest: sha256:504a9bfa69a6d4130c496ed3382add7679b8aed30c1320a418831bdbea4e0ace +generated: "2024-07-02T12:00:59.197303-04:00" diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index fae4ae8f1d..ddbe6d04d4 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -30,11 +30,11 @@ dependencies: condition: minio.enabled - name: grafana-agent-operator alias: grafana-agent-operator - version: 0.2.2 + version: 0.4.0 repository: https://grafana.github.io/helm-charts condition: metaMonitoring.grafanaAgent.installOperator - name: rollout-operator alias: rollout_operator repository: https://grafana.github.io/helm-charts - version: 0.15.0 + version: 0.16.0 condition: rollout_operator.enabled From 4b3beeb40a7187a4474da34b01e7bf25269f56b6 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 2 Jul 2024 21:58:19 -0400 Subject: [PATCH 126/152] bump rollouts and agent deps Signed-off-by: drfaust92 --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index ddbe6d04d4..23547115bf 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.13.2 +version: 1.13.3 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From d12bd2dd7ddd854bc8475362d8ddeb0bbf7488fa Mon Sep 17 00:00:00 2001 From: Bradley <12028233+bradleypettit@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:38:35 +1000 Subject: [PATCH 127/152] [grafana] Add support for extra volumes for Grafana Image Renderer (#3178) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke Co-authored-by: Nikolai Røed Kristiansen Co-authored-by: Ludovic Ortega --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 4 + .../ci/with-image-renderer-values.yaml | 88 +++++++++++++++++++ .../templates/image-renderer-deployment.yaml | 68 ++++++++++++++ charts/grafana/values.yaml | 12 +++ 5 files changed, 173 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 09ed9079c9..1dc54ab254 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.2.2 +version: 8.3.0 appVersion: 11.1.0 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 23d6b67496..8c2a9872c0 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -277,6 +277,10 @@ 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 | `{}` | diff --git a/charts/grafana/ci/with-image-renderer-values.yaml b/charts/grafana/ci/with-image-renderer-values.yaml index 32f3074347..06c0bda13e 100644 --- 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/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml index ea97969c2e..4828aa38aa 100644 --- 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/values.yaml b/charts/grafana/values.yaml index 9c48b43498..075c863076 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -1252,6 +1252,18 @@ imageRenderer: ## # schedulerName: "default-scheduler" + # Extra configmaps to mount in image-renderer pods + extraConfigmapMounts: [] + + # Extra secrets to mount in image-renderer pods + extraSecretMounts: [] + + # Extra volumes to mount in image-renderer pods + extraVolumeMounts: [] + + # Extra volumes for image-renderer pods + extraVolumes: [] + networkPolicy: ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now. ## From 32ad8e1a78724cf1595090857b30d6032880d47a Mon Sep 17 00:00:00 2001 From: Reddysekhar Gaduputi Date: Wed, 3 Jul 2024 12:30:52 +0530 Subject: [PATCH 128/152] [grafana] Add support for envValueFrom in datasources container and fix typo in dashboards container config (#3187) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke Co-authored-by: MH Co-authored-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- .../ci/with-sidecars-envvaluefrom-values.yaml | 38 +++++++++++++++++++ charts/grafana/templates/_pod.tpl | 12 +++++- charts/grafana/values.yaml | 25 ++++++++++++ 4 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 1dc54ab254..32ea4889a1 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.0 +version: 8.3.1 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml b/charts/grafana/ci/with-sidecars-envvaluefrom-values.yaml new file mode 100644 index 0000000000..a6935e56d0 --- /dev/null +++ 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/_pod.tpl b/charts/grafana/templates/_pod.tpl index ed22993c96..93f8da3003 100644 --- 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/values.yaml b/charts/grafana/values.yaml index 075c863076..30aa63e472 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -929,6 +929,19 @@ sidecar: enabled: false # Additional environment variables for the dashboards sidecar env: {} + ## "valueFrom" environment variable references that will be added to deployment pods. Name is templated. + ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core + ## Renders in container spec as: + ## env: + ## ... + ## - name: + ## valueFrom: + ## + envValueFrom: {} + # ENV_NAME: + # configMapKeyRef: + # name: configmap-name + # key: value_key # Do not reprocess already processed unchanged resources on k8s API reconnect. # ignoreAlreadyProcessed: true SCProvider: true @@ -994,7 +1007,19 @@ sidecar: enabled: false # Additional environment variables for the datasourcessidecar env: {} + ## "valueFrom" environment variable references that will be added to deployment pods. Name is templated. + ## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core + ## Renders in container spec as: + ## env: + ## ... + ## - name: + ## valueFrom: + ## envValueFrom: {} + # ENV_NAME: + # configMapKeyRef: + # name: configmap-name + # 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 From 99b63d6a8c54d871abc554c2d1ccdb8e1456cafa Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 1 Jul 2024 14:18:32 -0500 Subject: [PATCH 129/152] fix(promtail): prefer image.tag for app.kubernetes.io/version Signed-off-by: Eric Bailey --- charts/promtail/Chart.yaml | 2 +- charts/promtail/README.md | 4 ++-- charts/promtail/templates/_helpers.tpl | 4 ++-- charts/promtail/values.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index f967f34e85..78ef4ef7a1 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 3.0.0 -version: 6.16.2 +version: 6.16.3 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 92313ce28d..b15b2b4180 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.2](https://img.shields.io/badge/Version-6.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.16.3](https://img.shields.io/badge/Version-6.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance @@ -119,7 +119,7 @@ The new release which will pick up again from the existing `positions.yaml`. | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | image.registry | string | `"docker.io"` | The Docker registry | | image.repository | string | `"grafana/promtail"` | Docker image repository | -| image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion | +| image.tag | string | `""` | Overrides the image tag whose default is the chart's appVersion | | imagePullSecrets | list | `[]` | Image pull secrets for Docker images | | initContainer | list | `[]` | | | livenessProbe | object | `{}` | Liveness probe | diff --git a/charts/promtail/templates/_helpers.tpl b/charts/promtail/templates/_helpers.tpl index 08b85a3719..8892e518c2 100644 --- a/charts/promtail/templates/_helpers.tpl +++ b/charts/promtail/templates/_helpers.tpl @@ -36,8 +36,8 @@ Common labels {{- define "promtail.labels" -}} helm.sh/chart: {{ include "promtail.chart" . }} {{ include "promtail.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- if or .Chart.AppVersion .Values.image.tag }} +app.kubernetes.io/version: {{ mustRegexReplaceAllLiteral "@sha.*" .Values.image.tag "" | default .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index 60714dc784..fb77d81edc 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -100,7 +100,7 @@ image: # -- Docker image repository repository: grafana/promtail # -- Overrides the image tag whose default is the chart's appVersion - tag: null + tag: "" # -- Docker image pull policy pullPolicy: IfNotPresent From 4be61ddf9750e9cb9af99b71808f8c01c5bf49db Mon Sep 17 00:00:00 2001 From: Olivier Michaelis Date: Thu, 4 Jul 2024 13:01:37 +0200 Subject: [PATCH 130/152] [grafana] Clarify documentation for serviceMonitor.enabled Adjust the documentation string to clarify that a ServiceMonitor CustomResource is created and not a CustomResourceDefinition Signed-off-by: Olivier Michaelis --- charts/grafana/Chart.yaml | 2 +- charts/grafana/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 32ea4889a1..e34b31745e 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.1 +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. diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 30aa63e472..0eb4dbb17d 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -242,7 +242,7 @@ service: appProtocol: "" serviceMonitor: - ## If true, a ServiceMonitor CRD is created for a prometheus operator + ## If true, a ServiceMonitor CR is created for a prometheus operator ## https://github.com/coreos/prometheus-operator ## enabled: false From 0375c0c589a8717136857349058835b0aba8c13c Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 6 Jul 2024 01:15:13 +0530 Subject: [PATCH 131/152] Add Sheikh-Abubaker as Maintainer Signed-off-by: Sheikh-Abubaker --- .github/CODEOWNERS | 2 +- charts/tempo/Chart.yaml | 4 +++- charts/tempo/README.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index eb52641daa..65ceb8afee 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,7 +10,7 @@ /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/ @grafana/tempo @Sheikh-Abubaker @dgzlopes @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 diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 715c5b61d3..9a5f1e1629 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.10.0 +version: 1.10.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.net @@ -18,3 +18,5 @@ maintainers: - name: mdisibio - name: dgzlopes - name: mapno + - name: Sheikh-Abubaker + email: sheikhabubaker761@gmail.com diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 040d05c722..18b28c4b10 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.10.1](https://img.shields.io/badge/Version-1.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode From 96e597e40b0e749d2e26544ca0d47ff2608f0a7a Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 5 Jul 2024 18:51:38 -0400 Subject: [PATCH 132/152] Apply suggestions from code review Co-authored-by: Sheikh-Abubaker Signed-off-by: Ilia Lazebnik --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 23547115bf..1aadb495ec 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.13.3 +version: 1.14.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From e2a4bdd45d4b3749160be83c2b4b1be8effb8c62 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Sat, 6 Jul 2024 07:41:26 -0400 Subject: [PATCH 133/152] fix docs Signed-off-by: drfaust92 --- charts/tempo-distributed/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 90fedecd67..8a6cc032e9 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.13.2](https://img.shields.io/badge/Version-1.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -13,8 +13,8 @@ Grafana Tempo in MicroService mode | Repository | Name | Version | |------------|------|---------| | https://charts.min.io/ | minio(minio) | 4.0.12 | -| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.2.2 | -| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.15.0 | +| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.4.0 | +| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.16.0 | ## Chart Repo From 261275ba3c80c8feec8558aad234f17953159f4b Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Sat, 6 Jul 2024 07:44:42 -0400 Subject: [PATCH 134/152] vulture to 2.5.0 Signed-off-by: drfaust92 --- charts/tempo-vulture/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index beb63eea88..59fb60cd0e 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.4.1 -appVersion: 2.2.3 +version: 0.5.0 +appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png From 508d9b48593de13d04ef65c5720ed71d78a11faa Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Sat, 6 Jul 2024 07:45:49 -0400 Subject: [PATCH 135/152] fix docs Signed-off-by: drfaust92 --- charts/tempo-vulture/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 06033f9db8..86b510d5fa 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. From 0361c3a7b623e4fea8412f5176ed749fd914f47a Mon Sep 17 00:00:00 2001 From: Celian GARCIA Date: Thu, 20 Jun 2024 11:38:01 +0200 Subject: [PATCH 136/152] [tempo-distributed] Add externalTrafficPolicy option to service Signed-off-by: Celian GARCIA --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 3 ++- .../templates/distributor/service-distributor.yaml | 3 +++ charts/tempo-distributed/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 charts/tempo-distributed/README.md mode change 100644 => 100755 charts/tempo-distributed/values.yaml diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 1aadb495ec..53108030cc 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.14.0 +version: 1.15.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md old mode 100644 new mode 100755 index 8a6cc032e9..25fd25919e --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.0](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -325,6 +325,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.replicas | int | `1` | Number of replicas for the distributor | | distributor.resources | object | `{}` | Resource requests and limits for the distributor | | distributor.service.annotations | object | `{}` | Annotations for distributor service | +| distributor.service.externalTrafficPolicy | string | `nil` | If type is LoadBalancer you can set it to 'Local' [preserve the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) | | distributor.service.labels | object | `{}` | Labels for distributor service | | distributor.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer | | distributor.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. | diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index 3e5a8121f1..efd7574110 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -90,6 +90,9 @@ spec: {{- if .Values.distributor.service.loadBalancerIP }} loadBalancerIP: {{ .Values.distributor.service.loadBalancerIP }} {{- end }} + {{- with .Values.distributor.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ . }} + {{- end }} {{- with .Values.distributor.service.loadBalancerSourceRanges}} loadBalancerSourceRanges: {{ toYaml . | nindent 4 }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml old mode 100644 new mode 100755 index 3f4aea96af..39f57bb60b --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -465,6 +465,8 @@ distributor: loadBalancerIP: '' # -- If type is LoadBalancer limit incoming traffic from IPs. loadBalancerSourceRanges: [] + # -- If type is LoadBalancer you can set it to 'Local' [preserve the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) + externalTrafficPolicy: null serviceDiscovery: # -- Annotations for distributorDiscovery service annotations: {} From 16ca894282e34ed611831fa72526a397351a607c Mon Sep 17 00:00:00 2001 From: Elliot Courant Date: Thu, 11 Jul 2024 18:59:22 -0500 Subject: [PATCH 137/152] fix(grafana): Fixed image rendered network policy namespace selector The egress network policy for the image rendered expects the namespace of the chart to match `name: ${value}`, this label is not applied to namespaces by default in Kubernetes and would need to be added to the namespace in order for this network policy to work. However the ingress network policy uses `kubernetes.io/metadata.name: ${value}`, this label is applied to namespaces in kubernetes by default and will allow the network policy to work out of the box with reasonable defaults. Without this patch, essentially grafana is able to communicate with the image renderer, but the image renderer is not able to make HTTP requests back to grafana in the same namespace without adding `name: ${namespace name}` to the labels of the namespace grafana is deployed in. Signed-off-by: Elliot Courant --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/image-renderer-network-policy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index e34b31745e..dbb350afcd 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.2 +version: 8.3.3 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/image-renderer-network-policy.yaml b/charts/grafana/templates/image-renderer-network-policy.yaml index d1a0eb313d..bcbd24976c 100644 --- a/charts/grafana/templates/image-renderer-network-policy.yaml +++ b/charts/grafana/templates/image-renderer-network-policy.yaml @@ -69,7 +69,7 @@ spec: to: - namespaceSelector: matchLabels: - name: {{ include "grafana.namespace" . }} + kubernetes.io/metadata.name: {{ include "grafana.namespace" . }} podSelector: matchLabels: {{- include "grafana.selectorLabels" . | nindent 14 }} From 83a73b820b23828db3de913d4784444a714b7106 Mon Sep 17 00:00:00 2001 From: Abderrahmane Benbachir Date: Tue, 2 Jul 2024 18:10:07 -0700 Subject: [PATCH 138/152] [tempo-distributed] use memberlistBindPort instead of hardcoded values Signed-off-by: Abderrahmane Benbachir --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../templates/compactor/deployment-compactor.yaml | 2 +- .../templates/distributor/deployment-distributor.yaml | 2 +- .../templates/gossip-ring/service-gossip-ring.yaml | 4 ++-- .../templates/ingester/statefulset-ingester.yaml | 2 +- .../templates/querier/deployment-querier.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 53108030cc..11135959c8 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.15.0 +version: 1.15.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 25fd25919e..4b0d67ceba 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.15.0](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index e0f397a259..adafe7c9a9 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -68,7 +68,7 @@ spec: ports: - containerPort: 3100 name: http-metrics - - containerPort: 7946 + - containerPort: {{ include "tempo.memberlistBindPort" . }} name: http-memberlist {{- with .Values.compactor.extraEnv }} env: diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index 8ec4c4177f..d03795bbed 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -64,7 +64,7 @@ spec: imagePullPolicy: {{ .Values.tempo.image.pullPolicy }} name: distributor ports: - - containerPort: 7946 + - containerPort: {{ include "tempo.memberlistBindPort" . }} name: http-memberlist protocol: TCP - containerPort: 3100 diff --git a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml index 5f6b8227cc..948a739503 100644 --- a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml +++ b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml @@ -10,9 +10,9 @@ spec: clusterIP: None ports: - name: gossip-ring - port: 7946 + port: {{ include "tempo.memberlistBindPort" . }} protocol: TCP - targetPort: http-memberlist + targetPort: {{ include "tempo.memberlistBindPort" . }} {{- if .Values.tempo.memberlist.appProtocol }} appProtocol: {{ .Values.tempo.memberlist.appProtocol }} {{- end }} diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 2a1e009cf1..debe777b64 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -85,7 +85,7 @@ spec: - name: grpc containerPort: 9095 - name: http-memberlist - containerPort: 7946 + containerPort: {{ include "tempo.memberlistBindPort" . }} - name: http-metrics containerPort: 3100 {{- with .Values.ingester.extraEnv }} diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 480d14fedb..297bc24762 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -68,7 +68,7 @@ spec: imagePullPolicy: {{ .Values.tempo.image.pullPolicy }} name: querier ports: - - containerPort: 7946 + - containerPort: {{ include "tempo.memberlistBindPort" . }} name: http-memberlist protocol: TCP - containerPort: 3100 From 478c732436522404eb46d32cbd1fc0bfe280efe3 Mon Sep 17 00:00:00 2001 From: MH Date: Sat, 13 Jul 2024 09:33:00 +0800 Subject: [PATCH 139/152] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index e34b31745e..d1d99a4699 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.2 +version: 8.3.4 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From bd24d03460ef420cce5c8e671a69870a454610fd Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 14 Jul 2024 00:02:28 +0800 Subject: [PATCH 140/152] Update README.md Signed-off-by: MH Signed-off-by: MH --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 4b0d67ceba..ae2017be5e 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode From b748ad3ca97428d7cc6210dd6afee341c025f14e Mon Sep 17 00:00:00 2001 From: "camillo.rossi@gmail.com" Date: Wed, 10 Jul 2024 14:57:10 +1000 Subject: [PATCH 141/152] Fix Extra Service Labels Signed-off-by: camillo.rossi@gmail.com --- charts/promtail/templates/service-extra.yaml | 4 +-- charts/promtail/values.yaml | 33 ++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/charts/promtail/templates/service-extra.yaml b/charts/promtail/templates/service-extra.yaml index 7257e68944..c3ec3fc3ce 100644 --- a/charts/promtail/templates/service-extra.yaml +++ b/charts/promtail/templates/service-extra.yaml @@ -7,8 +7,8 @@ metadata: namespace: {{ include "promtail.namespaceName" $ }} labels: {{- include "promtail.labels" $ | nindent 4 }} - {{- with .labels }} - {{- toYaml $ | nindent 4 }} + {{- with $values.labels }} + {{- toYaml . | nindent 4 }} {{- end }} {{- with .annotations }} annotations: diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index fb77d81edc..95b2e5484a 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -335,22 +335,23 @@ extraContainers: {} # -- Configure additional ports and services. For each configured port, a corresponding service is created. # See values.yaml for details -extraPorts: {} -# syslog: -# name: tcp-syslog -# annotations: {} -# labels: {} -# containerPort: 1514 -# protocol: TCP -# service: -# type: ClusterIP -# clusterIP: null -# port: 1514 -# externalIPs: [] -# nodePort: null -# loadBalancerIP: null -# loadBalancerSourceRanges: [] -# externalTrafficPolicy: null +extraPorts: + syslog: + name: tcp-syslog + annotations: {} + labels: + pippo: pluto + containerPort: 1514 + protocol: TCP + service: + type: ClusterIP + clusterIP: null + port: 1514 + externalIPs: [] + nodePort: null + loadBalancerIP: null + loadBalancerSourceRanges: [] + externalTrafficPolicy: null # ingress: # # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName # # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress From 4fffaf5f64b206b9fa0bfefeb8d22b8e01737144 Mon Sep 17 00:00:00 2001 From: "camillo.rossi@gmail.com" Date: Wed, 10 Jul 2024 14:57:28 +1000 Subject: [PATCH 142/152] Fix Extra Service Labels Signed-off-by: camillo.rossi@gmail.com --- charts/promtail/values.yaml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/charts/promtail/values.yaml b/charts/promtail/values.yaml index 95b2e5484a..fb77d81edc 100644 --- a/charts/promtail/values.yaml +++ b/charts/promtail/values.yaml @@ -335,23 +335,22 @@ extraContainers: {} # -- Configure additional ports and services. For each configured port, a corresponding service is created. # See values.yaml for details -extraPorts: - syslog: - name: tcp-syslog - annotations: {} - labels: - pippo: pluto - containerPort: 1514 - protocol: TCP - service: - type: ClusterIP - clusterIP: null - port: 1514 - externalIPs: [] - nodePort: null - loadBalancerIP: null - loadBalancerSourceRanges: [] - externalTrafficPolicy: null +extraPorts: {} +# syslog: +# name: tcp-syslog +# annotations: {} +# labels: {} +# containerPort: 1514 +# protocol: TCP +# service: +# type: ClusterIP +# clusterIP: null +# port: 1514 +# externalIPs: [] +# nodePort: null +# loadBalancerIP: null +# loadBalancerSourceRanges: [] +# externalTrafficPolicy: null # ingress: # # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName # # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress From 732786ffea2fce60f62edbcdd6c51e2c70c04959 Mon Sep 17 00:00:00 2001 From: "camillo.rossi@gmail.com" Date: Mon, 15 Jul 2024 08:24:36 +1000 Subject: [PATCH 143/152] Bump Chart to 6.16.4 Signed-off-by: camillo.rossi@gmail.com --- charts/promtail/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 78ef4ef7a1..dc6ca74c86 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 3.0.0 -version: 6.16.3 +version: 6.16.4 home: https://grafana.com/loki sources: - https://github.com/grafana/loki From 733c2148619b90233680d814051b6f259669a2ed Mon Sep 17 00:00:00 2001 From: MH Date: Mon, 15 Jul 2024 10:44:21 +0800 Subject: [PATCH 144/152] Update README.md Signed-off-by: MH Signed-off-by: MH --- charts/promtail/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/promtail/README.md b/charts/promtail/README.md index b15b2b4180..45a4504a80 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.3](https://img.shields.io/badge/Version-6.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.16.4](https://img.shields.io/badge/Version-6.16.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance From 7870c399d96f83ff1cde471d226468578d96c920 Mon Sep 17 00:00:00 2001 From: Nicolas Pais Date: Wed, 17 Jul 2024 11:44:57 -0300 Subject: [PATCH 145/152] [grafana] fix: Add missing version, kind to volumeClaimTemplates (#3037) Co-authored-by: MH --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/statefulset.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index d1d99a4699..a15cb003a9 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.3.4 +version: 8.3.5 appVersion: 11.1.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/statefulset.yaml b/charts/grafana/templates/statefulset.yaml index e6c944a4d3..7546c18876 100644 --- a/charts/grafana/templates/statefulset.yaml +++ b/charts/grafana/templates/statefulset.yaml @@ -39,7 +39,9 @@ spec: {{- include "grafana.pod" . | nindent 6 }} {{- if .Values.persistence.enabled}} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: storage spec: accessModes: {{ .Values.persistence.accessModes }} From 0430a0a3e57b84ce65ac9d201f073bafbbbea187 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Fri, 19 Jul 2024 02:13:43 +0300 Subject: [PATCH 146/152] fix cve Signed-off-by: AvivGuiser --- charts/grafana/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 84bd425dd1..0390f78fdd 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -859,7 +859,7 @@ sidecar: # -- The Docker registry registry: quay.io repository: kiwigrid/k8s-sidecar - tag: 1.26.1 + tag: 1.27.4 sha: "" imagePullPolicy: IfNotPresent resources: {} From 62e40baedd500be628cf13c211e68b8f4e5e9561 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Fri, 19 Jul 2024 02:16:19 +0300 Subject: [PATCH 147/152] bump version and update docs Signed-off-by: AvivGuiser --- charts/grafana/Chart.yaml | 2 +- charts/grafana/README.md | 1139 ++++++++++++------------------------- 2 files changed, 359 insertions(+), 782 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index a15cb003a9..a2ea15a444 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.3.5 -appVersion: 11.1.0 +appVersion: 11.1.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com diff --git a/charts/grafana/README.md b/charts/grafana/README.md index 8c2a9872c0..d927c825e0 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -1,781 +1,358 @@ -# Grafana Helm Chart - -* Installs the web dashboarding system [Grafana](http://grafana.org/) - -## Get Repo Info - -```console -helm repo add grafana https://grafana.github.io/helm-charts -helm repo update -``` - -_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ - -## Installing the Chart - -To install the chart with the release name `my-release`: - -```console -helm install my-release grafana/grafana -``` - -## Uninstalling the Chart - -To uninstall/delete the my-release deployment: - -```console -helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Upgrading an existing Release to a new major version - -A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an -incompatible breaking change needing manual actions. - -### To 4.0.0 (And 3.12.1) - -This version requires Helm >= 2.12.0. - -### To 5.0.0 - -You have to add --force to your helm upgrade command as the labels of the chart have changed. - -### To 6.0.0 - -This version requires Helm >= 3.1.0. - -### To 7.0.0 - -For consistency with other Helm charts, the `global.image.registry` parameter was renamed -to `global.imageRegistry`. If you were not previously setting `global.image.registry`, no action -is required on upgrade. If you were previously setting `global.image.registry`, you will -need to instead set `global.imageRegistry`. - -## Configuration - -| Parameter | Description | Default | -|-------------------------------------------|-----------------------------------------------|---------------------------------------------------------| -| `replicas` | Number of nodes | `1` | -| `podDisruptionBudget.minAvailable` | Pod disruption minimum available | `nil` | -| `podDisruptionBudget.maxUnavailable` | Pod disruption maximum unavailable | `nil` | -| `podDisruptionBudget.apiVersion` | Pod disruption apiVersion | `nil` | -| `deploymentStrategy` | Deployment strategy | `{ "type": "RollingUpdate" }` | -| `livenessProbe` | Liveness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } "initialDelaySeconds": 60, "timeoutSeconds": 30, "failureThreshold": 10 }` | -| `readinessProbe` | Readiness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } }`| -| `securityContext` | Deployment securityContext | `{"runAsUser": 472, "runAsGroup": 472, "fsGroup": 472}` | -| `priorityClassName` | Name of Priority Class to assign pods | `nil` | -| `image.registry` | Image registry | `docker.io` | -| `image.repository` | Image repository | `grafana/grafana` | -| `image.tag` | Overrides the Grafana image tag whose default is the chart appVersion (`Must be >= 5.0.0`) | `` | -| `image.sha` | Image sha (optional) | `` | -| `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` | -| `service.appProtocol` | Adds the appProtocol field to the service | `` | -| `service.targetPort` | Internal service is port | `3000` | -| `service.nodePort` | Kubernetes service nodePort | `nil` | -| `service.annotations` | Service annotations (can be templated) | `{}` | -| `service.labels` | Custom labels | `{}` | -| `service.clusterIP` | internal cluster service IP | `nil` | -| `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `nil` | -| `service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to lb (if supported) | `[]` | -| `service.externalIPs` | service external IP addresses | `[]` | -| `service.externalTrafficPolicy` | change the default externalTrafficPolicy | `nil` | -| `headlessService` | Create a headless service | `false` | -| `extraExposePorts` | Additional service ports for sidecar containers| `[]` | -| `hostAliases` | adds rules to the pod's /etc/hosts | `[]` | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.annotations` | Ingress annotations (values are templated) | `{}` | -| `ingress.labels` | Custom labels | `{}` | -| `ingress.path` | Ingress accepted path | `/` | -| `ingress.pathType` | Ingress type of path | `Prefix` | -| `ingress.hosts` | Ingress accepted hostnames | `["chart-example.local"]` | -| `ingress.extraPaths` | Ingress extra paths to prepend to every host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/guide/ingress/annotations/#actions). Requires `ingress.hosts` to have one or more host entries. | `[]` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `ingress.ingressClassName` | Ingress Class Name. MAY be required for Kubernetes versions >= 1.18 | `""` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | Toleration labels for pod assignment | `[]` | -| `affinity` | Affinity settings for pod assignment | `{}` | -| `extraInitContainers` | Init containers to add to the grafana pod | `{}` | -| `extraContainers` | Sidecar containers to add to the grafana pod | `""` | -| `extraContainerVolumes` | Volumes that can be mounted in sidecar containers | `[]` | -| `extraLabels` | Custom labels for all manifests | `{}` | -| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | -| `persistence.enabled` | Use persistent volume to store data | `false` | -| `persistence.type` | Type of persistence (`pvc` or `statefulset`) | `pvc` | -| `persistence.size` | Size of persistent volume claim | `10Gi` | -| `persistence.existingClaim` | Use an existing PVC to persist data (can be templated) | `nil` | -| `persistence.storageClassName` | Type of persistent volume claim | `nil` | -| `persistence.accessModes` | Persistence access modes | `[ReadWriteOnce]` | -| `persistence.annotations` | PersistentVolumeClaim annotations | `{}` | -| `persistence.finalizers` | PersistentVolumeClaim finalizers | `[ "kubernetes.io/pvc-protection" ]` | -| `persistence.extraPvcLabels` | Extra labels to apply to a PVC. | `{}` | -| `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` | -| `initChownData.image.tag` | init-chown-data container image tag | `1.31.1` | -| `initChownData.image.sha` | init-chown-data container image sha (optional)| `""` | -| `initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent` | -| `initChownData.resources` | init-chown-data pod resource requests & limits | `{}` | -| `schedulerName` | Alternate scheduler name | `nil` | -| `env` | Extra environment variables passed to pods | `{}` | -| `envValueFrom` | Environment variables 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 | `{}` | -| `envFromSecret` | Name of a Kubernetes secret (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `""` | -| `envFromSecrets` | List of Kubernetes secrets (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `[]` | -| `envFromConfigMaps` | List of Kubernetes ConfigMaps (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `[]` | -| `envRenderSecret` | Sensible environment variables passed to pods and stored as secret. (passed through [tpl](https://helm.sh/docs/howto/charts_tips_and_tricks/#using-the-tpl-function)) | `{}` | -| `enableServiceLinks` | Inject Kubernetes services as environment variables. | `true` | -| `extraSecretMounts` | Additional grafana server secret mounts | `[]` | -| `extraVolumeMounts` | Additional grafana server volume mounts | `[]` | -| `extraVolumes` | Additional Grafana server volumes | `[]` | -| `automountServiceAccountToken` | Mounted the service account token on the grafana pod. Mandatory, if sidecars are enabled | `true` | -| `createConfigmap` | Enable creating the grafana configmap | `true` | -| `extraConfigmapMounts` | Additional grafana server configMap volume mounts (values are templated) | `[]` | -| `extraEmptyDirMounts` | Additional grafana server emptyDir volume mounts | `[]` | -| `plugins` | Plugins to be loaded along with Grafana | `[]` | -| `datasources` | Configure grafana datasources (passed through tpl) | `{}` | -| `alerting` | Configure grafana alerting (passed through tpl) | `{}` | -| `notifiers` | Configure grafana notifiers | `{}` | -| `dashboardProviders` | Configure grafana dashboard providers | `{}` | -| `dashboards` | Dashboards to import | `{}` | -| `dashboardsConfigMaps` | ConfigMaps reference that contains dashboards | `{}` | -| `grafana.ini` | Grafana's primary configuration | `{}` | -| `global.imageRegistry` | Global image pull registry for all images. | `null` | -| `global.imagePullSecrets` | Global image pull secrets (can be templated). Allows either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style). | `[]` | -| `ldap.enabled` | Enable LDAP authentication | `false` | -| `ldap.existingSecret` | The name of an existing secret containing the `ldap.toml` file, this must have the key `ldap-toml`. | `""` | -| `ldap.config` | Grafana's LDAP configuration | `""` | -| `annotations` | Deployment annotations | `{}` | -| `labels` | Deployment labels | `{}` | -| `podAnnotations` | Pod annotations | `{}` | -| `podLabels` | Pod labels | `{}` | -| `podPortName` | Name of the grafana port on the pod | `grafana` | -| `lifecycleHooks` | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers) | `{}` | -| `sidecar.image.registry` | Sidecar image registry | `quay.io` | -| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` | -| `sidecar.image.tag` | Sidecar image tag | `1.26.0` | -| `sidecar.image.sha` | Sidecar image sha (optional) | `""` | -| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | -| `sidecar.resources` | Sidecar resources | `{}` | -| `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.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` | -| `sidecar.alerts.reloadURL` | Full url of datasource configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/alerting/reload"` | -| `sidecar.alerts.skipReload` | Enabling this omits defining the REQ_URL and REQ_METHOD environment variables | `false` | -| `sidecar.alerts.initAlerts` | Set to true to deploy the alerts sidecar as an initContainer. This is needed if skipReload is true, to load any alerts defined at startup time. | `false` | -| `sidecar.alerts.extraMounts` | Additional alerts sidecar volume mounts. | `[]` | -| `sidecar.dashboards.enabled` | Enables the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` | -| `sidecar.dashboards.SCProvider` | Enables creation of sidecar provider | `true` | -| `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` | -| `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` | -| `sidecar.dashboards.provider.folder` | Logical folder in which grafana groups dashboards | `""` | -| `sidecar.dashboards.provider.folderUid` | Allows you to specify the static UID for the logical folder above | `""` | -| `sidecar.dashboards.provider.disableDelete` | Activate to avoid the deletion of imported dashboards | `false` | -| `sidecar.dashboards.provider.allowUiUpdates` | Allow updating provisioned dashboards from the UI | `false` | -| `sidecar.dashboards.provider.type` | Provider type | `file` | -| `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.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` | -| `sidecar.dashboards.searchNamespace` | Namespaces list. If specified, the sidecar will search for dashboards 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.dashboards.script` | Absolute path to shell script to execute after a configmap got reloaded. | `nil` | -| `sidecar.dashboards.reloadURL` | Full url of dashboards configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/dashboards/reload"` | -| `sidecar.dashboards.skipReload` | Enabling this omits defining the REQ_USERNAME, REQ_PASSWORD, REQ_URL and REQ_METHOD environment variables | `false` | -| `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.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` | -| `sidecar.datasources.reloadURL` | Full url of datasource configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/datasources/reload"` | -| `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.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` | -| `sidecar.notifiers.reloadURL` | Full url of notifier configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/notifications/reload"` | -| `sidecar.notifiers.skipReload` | Enabling this omits defining the REQ_URL and REQ_METHOD environment variables | `false` | -| `sidecar.notifiers.initNotifiers` | Set to true to deploy the notifier sidecar as an initContainer in addition to a container. This is needed if skipReload is true, to load any notifiers defined at startup time. | `false` | -| `smtp.existingSecret` | The name of an existing secret containing the SMTP credentials. | `""` | -| `smtp.userKey` | The key in the existing SMTP secret containing the username. | `"user"` | -| `smtp.passwordKey` | The key in the existing SMTP secret containing the password. | `"password"` | -| `admin.existingSecret` | The name of an existing secret containing the admin credentials (can be templated). | `""` | -| `admin.userKey` | The key in the existing admin secret containing the username. | `"admin-user"` | -| `admin.passwordKey` | The key in the existing admin secret containing the password. | `"admin-password"` | -| `serviceAccount.automountServiceAccountToken` | Automount the service account token on all pods where is service account is used | `false` | -| `serviceAccount.annotations` | ServiceAccount annotations | | -| `serviceAccount.create` | Create service account | `true` | -| `serviceAccount.labels` | ServiceAccount labels | `{}` | -| `serviceAccount.name` | Service account name to use, when empty will be set to created account if `serviceAccount.create` is set else to `default` | `` | -| `serviceAccount.nameTest` | Service account name to use for test, when empty will be set to created account if `serviceAccount.create` is set else to `default` | `nil` | -| `rbac.create` | Create and use RBAC resources | `true` | -| `rbac.namespaced` | Creates Role and Rolebinding instead of the default ClusterRole and ClusteRoleBindings for the grafana instance | `false` | -| `rbac.useExistingRole` | Set to a rolename to use existing role - skipping role creating - but still doing serviceaccount and rolebinding to the rolename set here. | `nil` | -| `rbac.pspEnabled` | Create PodSecurityPolicy (with `rbac.create`, grant roles permissions as well) | `false` | -| `rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires `rbac.pspEnabled`) | `false` | -| `rbac.extraRoleRules` | Additional rules to add to the Role | [] | -| `rbac.extraClusterRoleRules` | Additional rules to add to the ClusterRole | [] | -| `command` | Define command to be executed by grafana container at startup | `nil` | -| `args` | Define additional args if command is used | `nil` | -| `testFramework.enabled` | Whether to create test-related resources | `true` | -| `testFramework.image.registry` | `test-framework` image registry. | `docker.io` | -| `testFramework.image.repository` | `test-framework` image repository. | `bats/bats` | -| `testFramework.image.tag` | `test-framework` image tag. | `v1.4.1` | -| `testFramework.imagePullPolicy` | `test-framework` image pull policy. | `IfNotPresent` | -| `testFramework.securityContext` | `test-framework` securityContext | `{}` | -| `downloadDashboards.env` | Environment variables to be passed to the `download-dashboards` container | `{}` | -| `downloadDashboards.envFromSecret` | Name of a Kubernetes secret (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `""` | -| `downloadDashboards.resources` | Resources of `download-dashboards` container | `{}` | -| `downloadDashboardsImage.registry` | Curl docker image registry | `docker.io` | -| `downloadDashboardsImage.repository` | Curl docker image repository | `curlimages/curl` | -| `downloadDashboardsImage.tag` | Curl docker image tag | `7.73.0` | -| `downloadDashboardsImage.sha` | Curl docker image sha (optional) | `""` | -| `downloadDashboardsImage.pullPolicy` | Curl docker image pull policy | `IfNotPresent` | -| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) | -| `serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `serviceMonitor.namespace` | Namespace this servicemonitor is installed in | | -| `serviceMonitor.interval` | How frequently Prometheus should scrape | `1m` | -| `serviceMonitor.path` | Path to scrape | `/metrics` | -| `serviceMonitor.scheme` | Scheme to use for metrics scraping | `http` | -| `serviceMonitor.tlsConfig` | TLS configuration block for the endpoint | `{}` | -| `serviceMonitor.labels` | Labels for the servicemonitor passed to Prometheus Operator | `{}` | -| `serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `30s` | -| `serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping. | `[]` | -| `serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | `[]` | -| `revisionHistoryLimit` | Number of old ReplicaSets to retain | `10` | -| `imageRenderer.enabled` | Enable the image-renderer deployment & service | `false` | -| `imageRenderer.image.registry` | image-renderer Image registry | `docker.io` | -| `imageRenderer.image.repository` | image-renderer Image repository | `grafana/grafana-image-renderer` | -| `imageRenderer.image.tag` | image-renderer Image tag | `latest` | -| `imageRenderer.image.sha` | image-renderer Image sha (optional) | `""` | -| `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.hostAliases` | image-renderer deployment Host Aliases | `[]` | -| `imageRenderer.priorityClassName` | image-renderer deployment priority class | `''` | -| `imageRenderer.service.enabled` | Enable the image-renderer service | `true` | -| `imageRenderer.service.portName` | image-renderer service port name | `http` | -| `imageRenderer.service.port` | image-renderer port used by deployment | `8081` | -| `imageRenderer.service.targetPort` | image-renderer service port used by service | `8081` | -| `imageRenderer.appProtocol` | Adds the appProtocol field to the service | `` | -| `imageRenderer.grafanaSubPath` | Grafana sub path to use for image renderer callback url | `''` | -| `imageRenderer.podPortName` | name of the image-renderer port on the pod | `http` | -| `imageRenderer.revisionHistoryLimit` | number of image-renderer replica sets to keep | `10` | -| `imageRenderer.networkPolicy.limitIngress` | Enable a NetworkPolicy to limit inbound traffic from only the created grafana pods | `true` | -| `imageRenderer.networkPolicy.limitEgress` | Enable a NetworkPolicy to limit outbound traffic to only the created grafana pods | `false` | -| `imageRenderer.resources` | Set resource limits for image-renderer pods | `{}` | -| `imageRenderer.nodeSelector` | Node labels for pod assignment | `{}` | -| `imageRenderer.tolerations` | Toleration labels for pod assignment | `[]` | -| `imageRenderer.affinity` | Affinity settings for pod assignment | `{}` | -| `networkPolicy.enabled` | Enable creation of NetworkPolicy resources. | `false` | -| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | -| `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed | `{}` | -| `networkPolicy.ingress` | Enable the creation of an ingress network policy | `true` | -| `networkPolicy.egress.enabled` | Enable the creation of an egress network policy | `false` | -| `networkPolicy.egress.ports` | An array of ports to allow for the egress | `[]` | -| `enableKubeBackwardCompatibility` | Enable backward compatibility of kubernetes where pod's defintion version below 1.13 doesn't have the enableServiceLinks option | `false` | - -### Example ingress with path - -With grafana 6.3 and above - -```yaml -grafana.ini: - server: - domain: monitoring.example.com - root_url: "%(protocol)s://%(domain)s/grafana" - serve_from_sub_path: true -ingress: - enabled: true - hosts: - - "monitoring.example.com" - path: "/grafana" -``` - -### Example of extraVolumeMounts and extraVolumes - -Configure additional volumes with `extraVolumes` and volume mounts with `extraVolumeMounts`. - -Example for `extraVolumeMounts` and corresponding `extraVolumes`: - -```yaml -extraVolumeMounts: - - name: plugins - mountPath: /var/lib/grafana/plugins - subPath: configs/grafana/plugins - readOnly: false - - name: dashboards - mountPath: /var/lib/grafana/dashboards - hostPath: /usr/shared/grafana/dashboards - readOnly: false - -extraVolumes: - - name: plugins - existingClaim: existing-grafana-claim - - name: dashboards - hostPath: /usr/shared/grafana/dashboards -``` - -Volumes default to `emptyDir`. Set to `persistentVolumeClaim`, -`hostPath`, `csi`, or `configMap` for other types. For a -`persistentVolumeClaim`, specify an existing claim name with -`existingClaim`. - -## Import dashboards - -There are a few methods to import dashboards to Grafana. Below are some examples and explanations as to how to use each method: - -```yaml -dashboards: - default: - some-dashboard: - json: | - { - "annotations": - - ... - # Complete json file here - ... - - "title": "Some Dashboard", - "uid": "abcd1234", - "version": 1 - } - custom-dashboard: - # This is a path to a file inside the dashboards directory inside the chart directory - file: dashboards/custom-dashboard.json - prometheus-stats: - # Ref: https://grafana.com/dashboards/2 - gnetId: 2 - revision: 2 - datasource: Prometheus - loki-dashboard-quick-search: - gnetId: 12019 - revision: 2 - datasource: - - name: DS_PROMETHEUS - value: Prometheus - - name: DS_LOKI - value: Loki - local-dashboard: - url: https://raw.githubusercontent.com/user/repository/master/dashboards/dashboard.json -``` - -## BASE64 dashboards - -Dashboards could be stored on a server that does not return JSON directly and instead of it returns a Base64 encoded file (e.g. Gerrit) -A new parameter has been added to the url use case so if you specify a b64content value equals to true after the url entry a Base64 decoding is applied before save the file to disk. -If this entry is not set or is equals to false not decoding is applied to the file before saving it to disk. - -### Gerrit use case - -Gerrit API for download files has the following schema: where {project-name} and -{file-id} usually has '/' in their values and so they MUST be replaced by %2F so if project-name is user/repo, branch-id is master and file-id is equals to dir1/dir2/dashboard -the url value is - -## Sidecar for dashboards - -If the parameter `sidecar.dashboards.enabled` is set, a sidecar container is deployed in the grafana -pod. This container watches all configmaps (or secrets) in the cluster and filters out the ones with -a label as defined in `sidecar.dashboards.label`. The files defined in those configmaps are written -to a folder and accessed by grafana. Changes to the configmaps are monitored and the imported -dashboards are deleted/updated. - -A recommendation is to use one configmap per dashboard, as a reduction of multiple dashboards inside -one configmap is currently not properly mirrored in grafana. - -Example dashboard config: - -```yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: sample-grafana-dashboard - labels: - grafana_dashboard: "1" -data: - k8s-dashboard.json: |- - [...] -``` - -## Sidecar for datasources - -If the parameter `sidecar.datasources.enabled` is set, an init container is deployed in the grafana -pod. This container lists all secrets (or configmaps, though not recommended) in the cluster and -filters out the ones with a label as defined in `sidecar.datasources.label`. The files defined in -those secrets are written to a folder and accessed by grafana on startup. Using these yaml files, -the data sources in grafana can be imported. - -Should you aim for reloading datasources in Grafana each time the config is changed, set `sidecar.datasources.skipReload: false` and adjust `sidecar.datasources.reloadURL` to `http://..svc.cluster.local/api/admin/provisioning/datasources/reload`. - -Secrets are recommended over configmaps for this usecase because datasources usually contain private -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 -metadata: - name: grafana-datasources - labels: - grafana_datasource: 'true' # default value for: sidecar.datasources.label -stringData: - pg-db.yaml: |- - apiVersion: 1 - datasources: - - name: My pg db datasource - type: postgres - url: my-postgresql-db:5432 - user: db-readonly-user - secureJsonData: - password: 'SUperSEcretPa$$word' - jsonData: - database: my_datase - sslmode: 'disable' # disable/require/verify-ca/verify-full - maxOpenConns: 0 # Grafana v5.4+ - maxIdleConns: 2 # Grafana v5.4+ - connMaxLifetime: 14400 # Grafana v5.4+ - postgresVersion: 1000 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10 - timescaledb: false - # allow users to edit datasources from the UI. - editable: false -``` - -Example values to add a datasource adapted from [Grafana](http://docs.grafana.org/administration/provisioning/#example-datasource-config-file): - -```yaml -datasources: - datasources.yaml: - apiVersion: 1 - datasources: - # name of the datasource. Required - - name: Graphite - # datasource type. Required - type: graphite - # access mode. proxy or direct (Server or Browser in the UI). Required - access: proxy - # org id. will default to orgId 1 if not specified - orgId: 1 - # url - url: http://localhost:8080 - # database password, if used - password: - # database user, if used - user: - # database name, if used - database: - # enable/disable basic auth - basicAuth: - # basic auth username - basicAuthUser: - # basic auth password - basicAuthPassword: - # enable/disable with credentials headers - withCredentials: - # mark as default datasource. Max one per org - isDefault: - # fields that will be converted to json and stored in json_data - jsonData: - graphiteVersion: "1.1" - tlsAuth: true - tlsAuthWithCACert: true - # json object of data that will be encrypted. - secureJsonData: - tlsCACert: "..." - tlsClientCert: "..." - tlsClientKey: "..." - version: 1 - # allow users to edit datasources from the UI. - editable: false -``` - -## Sidecar for notifiers - -If the parameter `sidecar.notifiers.enabled` is set, an init container is deployed in the grafana -pod. This container lists all secrets (or configmaps, though not recommended) in the cluster and -filters out the ones with a label as defined in `sidecar.notifiers.label`. The files defined in -those secrets are written to a folder and accessed by grafana on startup. Using these yaml files, -the notification channels in grafana can be imported. The secrets must be created before -`helm install` so that the notifiers init container can list the secrets. - -Secrets are recommended over configmaps for this usecase because alert notification channels usually contain -private data like SMTP usernames and passwords. Secrets are the more appropriate cluster resource to manage those. - -Example datasource config adapted from [Grafana](https://grafana.com/docs/grafana/latest/administration/provisioning/#alert-notification-channels): - -```yaml -notifiers: - - name: notification-channel-1 - type: slack - uid: notifier1 - # either - org_id: 2 - # or - org_name: Main Org. - is_default: true - send_reminder: true - frequency: 1h - disable_resolve_message: false - # See `Supported Settings` section for settings supporter for each - # alert notification type. - settings: - recipient: 'XXX' - token: 'xoxb' - uploadImage: true - url: https://slack.com - -delete_notifiers: - - name: notification-channel-1 - uid: notifier1 - org_id: 2 - - name: notification-channel-2 - # default org_id: 1 -``` - -## Sidecar for alerting resources - -If the parameter `sidecar.alerts.enabled` is set, a sidecar container is deployed in the grafana -pod. This container watches all configmaps (or secrets) in the cluster (namespace defined by `sidecar.alerts.searchNamespace`) and filters out the ones with -a label as defined in `sidecar.alerts.label` (default is `grafana_alert`). The files defined in those configmaps are written -to a folder and accessed by grafana. Changes to the configmaps are monitored and the imported alerting resources are updated, however, deletions are a little more complicated (see below). - -This sidecar can be used to provision alert rules, contact points, notification policies, notification templates and mute timings as shown in [Grafana Documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/). - -To fetch the alert config which will be provisioned, use the alert provisioning API ([Grafana Documentation](https://grafana.com/docs/grafana/next/developers/http_api/alerting_provisioning/)). -You can use either JSON or YAML format. - -Example config for an alert rule: - -```yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: sample-grafana-alert - labels: - grafana_alert: "1" -data: - k8s-alert.yml: |- - apiVersion: 1 - groups: - - orgId: 1 - name: k8s-alert - [...] -``` - -To delete provisioned alert rules is a two step process, you need to delete the configmap which defined the alert rule -and then create a configuration which deletes the alert rule. - -Example deletion configuration: - -```yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: delete-sample-grafana-alert - namespace: monitoring - labels: - grafana_alert: "1" -data: - delete-k8s-alert.yml: |- - apiVersion: 1 - deleteRules: - - orgId: 1 - uid: 16624780-6564-45dc-825c-8bded4ad92d3 -``` - -## 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. - -There are two methods to statically provision alerting configuration in Grafana. Below are some examples and explanations as to how to use each method: - -```yaml -alerting: - team1-alert-rules.yaml: - file: alerting/team1/rules.yaml - team2-alert-rules.yaml: - file: alerting/team2/rules.yaml - team3-alert-rules.yaml: - file: alerting/team3/rules.yaml - notification-policies.yaml: - file: alerting/shared/notification-policies.yaml - notification-templates.yaml: - file: alerting/shared/notification-templates.yaml - contactpoints.yaml: - apiVersion: 1 - contactPoints: - - orgId: 1 - name: Slack channel - receivers: - - uid: default-receiver - type: slack - settings: - # Webhook URL to be filled in - url: "" - # We need to escape double curly braces for the tpl function. - text: '{{ `{{ template "default.message" . }}` }}' - title: '{{ `{{ template "default.title" . }}` }}' -``` - -The two possibilities for static alerting resource provisioning are: - -* Inlining the file contents as shown for contact points in the above example. -* Importing a file using a relative path starting from the chart root directory as shown for the alert rules in the above example. - -### Important notes on file provisioning - -* The format of the files is defined in the [Grafana documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/) on file provisioning. -* The chart supports importing YAML and JSON files. -* The filename must be unique, otherwise one volume mount will overwrite the other. -* In case of inlining, double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped. -* The number of total files under `alerting:` is not limited. Each file will end up as a volume mount in the corresponding provisioning folder of the deployed Grafana instance. -* The file size for each import is limited by what the function `.Files.Get` can handle, which suffices for most cases. - -## How to serve Grafana with a path prefix (/grafana) - -In order to serve Grafana with a prefix (e.g., ), add the following to your values.yaml. - -```yaml -ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/rewrite-target: /$1 - nginx.ingress.kubernetes.io/use-regex: "true" - - path: /grafana/?(.*) - hosts: - - k8s.example.dev - -grafana.ini: - server: - root_url: http://localhost:3000/grafana # this host can be localhost -``` - -## How to securely reference secrets in grafana.ini - -This example uses Grafana [file providers](https://grafana.com/docs/grafana/latest/administration/configuration/#file-provider) for secret values and the `extraSecretMounts` configuration flag (Additional grafana server secret mounts) to mount the secrets. - -In grafana.ini: - -```yaml -grafana.ini: - [auth.generic_oauth] - enabled = true - client_id = $__file{/etc/secrets/auth_generic_oauth/client_id} - client_secret = $__file{/etc/secrets/auth_generic_oauth/client_secret} -``` - -Existing secret, or created along with helm: - -```yaml ---- -apiVersion: v1 -kind: Secret -metadata: - name: auth-generic-oauth-secret -type: Opaque -stringData: - client_id: - client_secret: -``` - -Include in the `extraSecretMounts` configuration flag: - -```yaml -- extraSecretMounts: - - name: auth-generic-oauth-secret-mount - secretName: auth-generic-oauth-secret - defaultMode: 0440 - mountPath: /etc/secrets/auth_generic_oauth - readOnly: true -``` - -### extraSecretMounts using a Container Storage Interface (CSI) provider - -This example uses a CSI driver e.g. retrieving secrets using [Azure Key Vault Provider](https://github.com/Azure/secrets-store-csi-driver-provider-azure) - -```yaml -- extraSecretMounts: - - name: secrets-store-inline - mountPath: /run/secrets - readOnly: true - csi: - driver: secrets-store.csi.k8s.io - readOnly: true - volumeAttributes: - secretProviderClass: "my-provider" - nodePublishSecretRef: - name: akv-creds -``` - -## Image Renderer Plug-In - -This chart supports enabling [remote image rendering](https://github.com/grafana/grafana-image-renderer/blob/master/README.md#run-in-docker) - -```yaml -imageRenderer: - enabled: true -``` - -### Image Renderer NetworkPolicy - -By default the image-renderer pods will have a network policy which only allows ingress traffic from the created grafana instance - -### High Availability for unified alerting - -If you want to run Grafana in a high availability cluster you need to enable -the headless service by setting `headlessService: true` in your `values.yaml` -file. - -As next step you have to setup the `grafana.ini` in your `values.yaml` in a way -that it will make use of the headless service to obtain all the IPs of the -cluster. You should replace ``{{ Name }}`` with the name of your helm deployment. - -```yaml -grafana.ini: - ... - unified_alerting: - enabled: true - ha_peers: {{ Name }}-headless:9094 - ha_listen_address: ${POD_IP}:9094 - ha_advertise_address: ${POD_IP}:9094 - - alerting: - enabled: false -``` +# grafana + +![Version: 8.3.5](https://img.shields.io/badge/Version-8.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.1.1](https://img.shields.io/badge/AppVersion-11.1.1-informational?style=flat-square) + +The leading tool for querying and visualizing time series and metrics. + +**Homepage:** + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| zanhsieh | | | +| rtluckie | | | +| maorfr | | | +| Xtigyro | | | +| torstenwalter | | | +| jkroepke | | | + +## Source Code + +* +* + +## Requirements + +Kubernetes: `^1.8.0-0` + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| "grafana.ini".analytics.check_for_updates | bool | `true` | | +| "grafana.ini".grafana_net.url | string | `"https://grafana.net"` | | +| "grafana.ini".log.mode | string | `"console"` | | +| "grafana.ini".paths.data | string | `"/var/lib/grafana/"` | | +| "grafana.ini".paths.logs | string | `"/var/log/grafana"` | | +| "grafana.ini".paths.plugins | string | `"/var/lib/grafana/plugins"` | | +| "grafana.ini".paths.provisioning | string | `"/etc/grafana/provisioning"` | | +| "grafana.ini".server.domain | string | `"{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}"` | | +| admin.existingSecret | string | `""` | | +| admin.passwordKey | string | `"admin-password"` | | +| admin.userKey | string | `"admin-user"` | | +| adminUser | string | `"admin"` | | +| affinity | object | `{}` | | +| alerting | object | `{}` | | +| assertNoLeakedSecrets | bool | `true` | | +| automountServiceAccountToken | bool | `true` | | +| autoscaling.behavior | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `5` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPU | string | `"60"` | | +| autoscaling.targetMemory | string | `""` | | +| containerSecurityContext.allowPrivilegeEscalation | bool | `false` | | +| containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | | +| containerSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| createConfigmap | bool | `true` | | +| dashboardProviders | object | `{}` | | +| dashboards | object | `{}` | | +| dashboardsConfigMaps | object | `{}` | | +| datasources | object | `{}` | | +| deploymentStrategy.type | string | `"RollingUpdate"` | | +| dnsConfig | object | `{}` | | +| dnsPolicy | string | `nil` | | +| downloadDashboards.env | object | `{}` | | +| downloadDashboards.envFromSecret | string | `""` | | +| downloadDashboards.envValueFrom | object | `{}` | | +| downloadDashboards.resources | object | `{}` | | +| downloadDashboards.securityContext.allowPrivilegeEscalation | bool | `false` | | +| downloadDashboards.securityContext.capabilities.drop[0] | string | `"ALL"` | | +| downloadDashboards.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| downloadDashboardsImage.pullPolicy | string | `"IfNotPresent"` | | +| downloadDashboardsImage.registry | string | `"docker.io"` | The Docker registry | +| downloadDashboardsImage.repository | string | `"curlimages/curl"` | | +| downloadDashboardsImage.sha | string | `""` | | +| downloadDashboardsImage.tag | string | `"7.85.0"` | | +| enableKubeBackwardCompatibility | bool | `false` | | +| enableServiceLinks | bool | `true` | | +| env | object | `{}` | | +| envFromConfigMaps | list | `[]` | | +| envFromSecret | string | `""` | | +| envFromSecrets | list | `[]` | | +| envRenderSecret | object | `{}` | | +| envValueFrom | object | `{}` | | +| extraConfigmapMounts | list | `[]` | | +| extraContainerVolumes | list | `[]` | | +| extraContainers | string | `""` | | +| extraEmptyDirMounts | list | `[]` | | +| extraExposePorts | list | `[]` | | +| extraInitContainers | list | `[]` | | +| extraLabels | object | `{}` | | +| extraObjects | list | `[]` | | +| extraSecretMounts | list | `[]` | | +| extraVolumeMounts | list | `[]` | | +| extraVolumes | list | `[]` | | +| global.imagePullSecrets | list | `[]` | | +| global.imageRegistry | string | `nil` | Overrides the Docker registry globally for all images | +| gossipPortName | string | `"gossip"` | | +| headlessService | bool | `false` | | +| hostAliases | list | `[]` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.pullSecrets | list | `[]` | | +| image.registry | string | `"docker.io"` | The Docker registry | +| image.repository | string | `"grafana/grafana"` | Docker image repository | +| image.sha | string | `""` | | +| image.tag | string | `""` | | +| imageRenderer.affinity | object | `{}` | | +| imageRenderer.autoscaling.behavior | object | `{}` | | +| imageRenderer.autoscaling.enabled | bool | `false` | | +| imageRenderer.autoscaling.maxReplicas | int | `5` | | +| imageRenderer.autoscaling.minReplicas | int | `1` | | +| imageRenderer.autoscaling.targetCPU | string | `"60"` | | +| imageRenderer.autoscaling.targetMemory | string | `""` | | +| imageRenderer.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | | +| imageRenderer.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | | +| imageRenderer.containerSecurityContext.readOnlyRootFilesystem | bool | `true` | | +| imageRenderer.containerSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| imageRenderer.deploymentStrategy | object | `{}` | | +| imageRenderer.enabled | bool | `false` | | +| imageRenderer.env.HTTP_HOST | string | `"0.0.0.0"` | | +| imageRenderer.envValueFrom | object | `{}` | | +| imageRenderer.extraConfigmapMounts | list | `[]` | | +| imageRenderer.extraSecretMounts | list | `[]` | | +| imageRenderer.extraVolumeMounts | list | `[]` | | +| imageRenderer.extraVolumes | list | `[]` | | +| imageRenderer.grafanaProtocol | string | `"http"` | | +| imageRenderer.grafanaSubPath | string | `""` | | +| imageRenderer.hostAliases | list | `[]` | | +| imageRenderer.image.pullPolicy | string | `"Always"` | | +| imageRenderer.image.registry | string | `"docker.io"` | The Docker registry | +| imageRenderer.image.repository | string | `"grafana/grafana-image-renderer"` | | +| imageRenderer.image.sha | string | `""` | | +| imageRenderer.image.tag | string | `"latest"` | | +| imageRenderer.networkPolicy.extraIngressSelectors | list | `[]` | | +| imageRenderer.networkPolicy.limitEgress | bool | `false` | | +| imageRenderer.networkPolicy.limitIngress | bool | `true` | | +| imageRenderer.nodeSelector | object | `{}` | | +| imageRenderer.podAnnotations | object | `{}` | | +| imageRenderer.podPortName | string | `"http"` | | +| imageRenderer.priorityClassName | string | `""` | | +| imageRenderer.replicas | int | `1` | | +| imageRenderer.resources | object | `{}` | | +| imageRenderer.revisionHistoryLimit | int | `10` | | +| imageRenderer.securityContext | object | `{}` | | +| imageRenderer.service.appProtocol | string | `""` | | +| imageRenderer.service.enabled | bool | `true` | | +| imageRenderer.service.port | int | `8081` | | +| imageRenderer.service.portName | string | `"http"` | | +| imageRenderer.service.targetPort | int | `8081` | | +| imageRenderer.serviceAccountName | string | `""` | | +| imageRenderer.serviceMonitor.enabled | bool | `false` | | +| imageRenderer.serviceMonitor.interval | string | `"1m"` | | +| imageRenderer.serviceMonitor.labels | object | `{}` | | +| imageRenderer.serviceMonitor.path | string | `"/metrics"` | | +| imageRenderer.serviceMonitor.relabelings | list | `[]` | | +| imageRenderer.serviceMonitor.scheme | string | `"http"` | | +| imageRenderer.serviceMonitor.scrapeTimeout | string | `"30s"` | | +| imageRenderer.serviceMonitor.targetLabels | list | `[]` | | +| imageRenderer.serviceMonitor.tlsConfig | object | `{}` | | +| imageRenderer.tolerations | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.enabled | bool | `false` | | +| ingress.extraPaths | list | `[]` | | +| ingress.hosts[0] | string | `"chart-example.local"` | | +| ingress.labels | object | `{}` | | +| ingress.path | string | `"/"` | | +| ingress.pathType | string | `"Prefix"` | | +| ingress.tls | list | `[]` | | +| initChownData.enabled | bool | `true` | | +| initChownData.image.pullPolicy | string | `"IfNotPresent"` | | +| initChownData.image.registry | string | `"docker.io"` | The Docker registry | +| initChownData.image.repository | string | `"library/busybox"` | | +| initChownData.image.sha | string | `""` | | +| initChownData.image.tag | string | `"1.31.1"` | | +| initChownData.resources | object | `{}` | | +| initChownData.securityContext.capabilities.add[0] | string | `"CHOWN"` | | +| initChownData.securityContext.runAsNonRoot | bool | `false` | | +| initChownData.securityContext.runAsUser | int | `0` | | +| initChownData.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| ldap.config | string | `""` | | +| ldap.enabled | bool | `false` | | +| ldap.existingSecret | string | `""` | | +| lifecycleHooks | object | `{}` | | +| livenessProbe.failureThreshold | int | `10` | | +| livenessProbe.httpGet.path | string | `"/api/health"` | | +| livenessProbe.httpGet.port | int | `3000` | | +| livenessProbe.initialDelaySeconds | int | `60` | | +| livenessProbe.timeoutSeconds | int | `30` | | +| namespaceOverride | string | `""` | | +| networkPolicy.allowExternal | bool | `true` | | +| networkPolicy.egress.blockDNSResolution | bool | `false` | | +| networkPolicy.egress.enabled | bool | `false` | | +| networkPolicy.egress.ports | list | `[]` | | +| networkPolicy.egress.to | list | `[]` | | +| networkPolicy.enabled | bool | `false` | | +| networkPolicy.explicitNamespacesSelector | object | `{}` | | +| networkPolicy.ingress | bool | `true` | | +| nodeSelector | object | `{}` | | +| notifiers | object | `{}` | | +| persistence.accessModes[0] | string | `"ReadWriteOnce"` | | +| persistence.disableWarning | bool | `false` | | +| persistence.enabled | bool | `false` | | +| persistence.extraPvcLabels | object | `{}` | | +| persistence.finalizers[0] | string | `"kubernetes.io/pvc-protection"` | | +| persistence.inMemory.enabled | bool | `false` | | +| persistence.lookupVolumeName | bool | `true` | | +| persistence.size | string | `"10Gi"` | | +| persistence.type | string | `"pvc"` | | +| plugins | list | `[]` | | +| podDisruptionBudget | object | `{}` | | +| podPortName | string | `"grafana"` | | +| rbac.create | bool | `true` | | +| rbac.extraClusterRoleRules | list | `[]` | | +| rbac.extraRoleRules | list | `[]` | | +| rbac.namespaced | bool | `false` | | +| rbac.pspEnabled | bool | `false` | | +| rbac.pspUseAppArmor | bool | `false` | | +| readinessProbe.httpGet.path | string | `"/api/health"` | | +| readinessProbe.httpGet.port | int | `3000` | | +| replicas | int | `1` | | +| resources | object | `{}` | | +| revisionHistoryLimit | int | `10` | | +| securityContext.fsGroup | int | `472` | | +| securityContext.runAsGroup | int | `472` | | +| securityContext.runAsNonRoot | bool | `true` | | +| securityContext.runAsUser | int | `472` | | +| service.annotations | object | `{}` | | +| service.appProtocol | string | `""` | | +| service.enabled | bool | `true` | | +| service.ipFamilies | list | `[]` | | +| service.ipFamilyPolicy | string | `""` | | +| service.labels | object | `{}` | | +| service.loadBalancerClass | string | `""` | | +| service.loadBalancerIP | string | `""` | | +| service.loadBalancerSourceRanges | list | `[]` | | +| service.port | int | `80` | | +| service.portName | string | `"service"` | | +| service.targetPort | int | `3000` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.automountServiceAccountToken | bool | `false` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.labels | object | `{}` | | +| serviceAccount.name | string | `nil` | | +| serviceAccount.nameTest | string | `nil` | | +| serviceMonitor.enabled | bool | `false` | | +| serviceMonitor.interval | string | `"30s"` | | +| serviceMonitor.labels | object | `{}` | | +| serviceMonitor.metricRelabelings | list | `[]` | | +| serviceMonitor.path | string | `"/metrics"` | | +| serviceMonitor.relabelings | list | `[]` | | +| serviceMonitor.scheme | string | `"http"` | | +| serviceMonitor.scrapeTimeout | string | `"30s"` | | +| serviceMonitor.targetLabels | list | `[]` | | +| serviceMonitor.tlsConfig | object | `{}` | | +| sidecar.alerts.enabled | bool | `false` | | +| sidecar.alerts.env | object | `{}` | | +| sidecar.alerts.extraMounts | list | `[]` | | +| sidecar.alerts.initAlerts | bool | `false` | | +| sidecar.alerts.label | string | `"grafana_alert"` | | +| sidecar.alerts.labelValue | string | `""` | | +| sidecar.alerts.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/alerting/reload"` | | +| sidecar.alerts.resource | string | `"both"` | | +| sidecar.alerts.script | string | `nil` | | +| sidecar.alerts.searchNamespace | string | `nil` | | +| sidecar.alerts.sizeLimit | object | `{}` | | +| sidecar.alerts.skipReload | bool | `false` | | +| sidecar.alerts.watchMethod | string | `"WATCH"` | | +| sidecar.dashboards.SCProvider | bool | `true` | | +| sidecar.dashboards.defaultFolderName | string | `nil` | | +| sidecar.dashboards.enabled | bool | `false` | | +| sidecar.dashboards.env | object | `{}` | | +| sidecar.dashboards.envValueFrom | object | `{}` | | +| sidecar.dashboards.extraMounts | list | `[]` | | +| sidecar.dashboards.folder | string | `"/tmp/dashboards"` | | +| sidecar.dashboards.folderAnnotation | string | `nil` | | +| sidecar.dashboards.label | string | `"grafana_dashboard"` | | +| sidecar.dashboards.labelValue | string | `""` | | +| sidecar.dashboards.provider.allowUiUpdates | bool | `false` | | +| sidecar.dashboards.provider.disableDelete | bool | `false` | | +| sidecar.dashboards.provider.folder | string | `""` | | +| sidecar.dashboards.provider.folderUid | string | `""` | | +| sidecar.dashboards.provider.foldersFromFilesStructure | bool | `false` | | +| sidecar.dashboards.provider.name | string | `"sidecarProvider"` | | +| sidecar.dashboards.provider.orgid | int | `1` | | +| sidecar.dashboards.provider.type | string | `"file"` | | +| sidecar.dashboards.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/dashboards/reload"` | | +| sidecar.dashboards.resource | string | `"both"` | | +| sidecar.dashboards.script | string | `nil` | | +| sidecar.dashboards.searchNamespace | string | `nil` | | +| sidecar.dashboards.sizeLimit | object | `{}` | | +| sidecar.dashboards.skipReload | bool | `false` | | +| sidecar.dashboards.watchMethod | string | `"WATCH"` | | +| sidecar.datasources.enabled | bool | `false` | | +| sidecar.datasources.env | object | `{}` | | +| sidecar.datasources.envValueFrom | object | `{}` | | +| sidecar.datasources.initDatasources | bool | `false` | | +| sidecar.datasources.label | string | `"grafana_datasource"` | | +| sidecar.datasources.labelValue | string | `""` | | +| sidecar.datasources.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/datasources/reload"` | | +| sidecar.datasources.resource | string | `"both"` | | +| sidecar.datasources.script | string | `nil` | | +| sidecar.datasources.searchNamespace | string | `nil` | | +| sidecar.datasources.sizeLimit | object | `{}` | | +| sidecar.datasources.skipReload | bool | `false` | | +| sidecar.datasources.watchMethod | string | `"WATCH"` | | +| sidecar.enableUniqueFilenames | bool | `false` | | +| sidecar.image.registry | string | `"quay.io"` | The Docker registry | +| sidecar.image.repository | string | `"kiwigrid/k8s-sidecar"` | | +| sidecar.image.sha | string | `""` | | +| sidecar.image.tag | string | `"1.27.4"` | | +| sidecar.imagePullPolicy | string | `"IfNotPresent"` | | +| sidecar.livenessProbe | object | `{}` | | +| sidecar.notifiers.enabled | bool | `false` | | +| sidecar.notifiers.env | object | `{}` | | +| sidecar.notifiers.initNotifiers | bool | `false` | | +| sidecar.notifiers.label | string | `"grafana_notifier"` | | +| sidecar.notifiers.labelValue | string | `""` | | +| sidecar.notifiers.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/notifications/reload"` | | +| sidecar.notifiers.resource | string | `"both"` | | +| sidecar.notifiers.script | string | `nil` | | +| sidecar.notifiers.searchNamespace | string | `nil` | | +| sidecar.notifiers.sizeLimit | object | `{}` | | +| sidecar.notifiers.skipReload | bool | `false` | | +| sidecar.notifiers.watchMethod | string | `"WATCH"` | | +| sidecar.plugins.enabled | bool | `false` | | +| sidecar.plugins.env | object | `{}` | | +| sidecar.plugins.initPlugins | bool | `false` | | +| sidecar.plugins.label | string | `"grafana_plugin"` | | +| sidecar.plugins.labelValue | string | `""` | | +| sidecar.plugins.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/plugins/reload"` | | +| sidecar.plugins.resource | string | `"both"` | | +| sidecar.plugins.script | string | `nil` | | +| sidecar.plugins.searchNamespace | string | `nil` | | +| sidecar.plugins.sizeLimit | object | `{}` | | +| sidecar.plugins.skipReload | bool | `false` | | +| sidecar.plugins.watchMethod | string | `"WATCH"` | | +| sidecar.readinessProbe | object | `{}` | | +| sidecar.resources | object | `{}` | | +| sidecar.securityContext.allowPrivilegeEscalation | bool | `false` | | +| sidecar.securityContext.capabilities.drop[0] | string | `"ALL"` | | +| sidecar.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | +| smtp.existingSecret | string | `""` | | +| smtp.passwordKey | string | `"password"` | | +| smtp.userKey | string | `"user"` | | +| testFramework.enabled | bool | `true` | | +| testFramework.image.registry | string | `"docker.io"` | The Docker registry | +| testFramework.image.repository | string | `"bats/bats"` | | +| testFramework.image.tag | string | `"v1.4.1"` | | +| testFramework.imagePullPolicy | string | `"IfNotPresent"` | | +| testFramework.resources | object | `{}` | | +| testFramework.securityContext | object | `{}` | | +| tolerations | list | `[]` | | +| topologySpreadConstraints | list | `[]` | | +| useStatefulSet | bool | `false` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) From a5df6eaa4a1234c24739913d285ddaa47100cbde Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Fri, 19 Jul 2024 09:13:28 +0300 Subject: [PATCH 148/152] bump chart Signed-off-by: AvivGuiser --- charts/grafana/Chart.yaml | 4 ++-- charts/grafana/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index a2ea15a444..3b3bbdbf9d 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.3.5 -appVersion: 11.1.1 +version: 8.3.6 +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 diff --git a/charts/grafana/README.md b/charts/grafana/README.md index d927c825e0..a64dad8514 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -1,6 +1,6 @@ # grafana -![Version: 8.3.5](https://img.shields.io/badge/Version-8.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.1.1](https://img.shields.io/badge/AppVersion-11.1.1-informational?style=flat-square) +![Version: 8.3.6](https://img.shields.io/badge/Version-8.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.1.0](https://img.shields.io/badge/AppVersion-11.1.0-informational?style=flat-square) The leading tool for querying and visualizing time series and metrics. From 6309d16313f7434a89ddb05d89b5de83b127ff78 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Fri, 19 Jul 2024 09:28:26 +0300 Subject: [PATCH 149/152] fix readme Signed-off-by: AvivGuiser --- charts/grafana/README.md | 1139 ++++++++++++++++++++++++++------------ 1 file changed, 781 insertions(+), 358 deletions(-) diff --git a/charts/grafana/README.md b/charts/grafana/README.md index a64dad8514..8c2a9872c0 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -1,358 +1,781 @@ -# grafana - -![Version: 8.3.6](https://img.shields.io/badge/Version-8.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 11.1.0](https://img.shields.io/badge/AppVersion-11.1.0-informational?style=flat-square) - -The leading tool for querying and visualizing time series and metrics. - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| zanhsieh | | | -| rtluckie | | | -| maorfr | | | -| Xtigyro | | | -| torstenwalter | | | -| jkroepke | | | - -## Source Code - -* -* - -## Requirements - -Kubernetes: `^1.8.0-0` - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| "grafana.ini".analytics.check_for_updates | bool | `true` | | -| "grafana.ini".grafana_net.url | string | `"https://grafana.net"` | | -| "grafana.ini".log.mode | string | `"console"` | | -| "grafana.ini".paths.data | string | `"/var/lib/grafana/"` | | -| "grafana.ini".paths.logs | string | `"/var/log/grafana"` | | -| "grafana.ini".paths.plugins | string | `"/var/lib/grafana/plugins"` | | -| "grafana.ini".paths.provisioning | string | `"/etc/grafana/provisioning"` | | -| "grafana.ini".server.domain | string | `"{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}"` | | -| admin.existingSecret | string | `""` | | -| admin.passwordKey | string | `"admin-password"` | | -| admin.userKey | string | `"admin-user"` | | -| adminUser | string | `"admin"` | | -| affinity | object | `{}` | | -| alerting | object | `{}` | | -| assertNoLeakedSecrets | bool | `true` | | -| automountServiceAccountToken | bool | `true` | | -| autoscaling.behavior | object | `{}` | | -| autoscaling.enabled | bool | `false` | | -| autoscaling.maxReplicas | int | `5` | | -| autoscaling.minReplicas | int | `1` | | -| autoscaling.targetCPU | string | `"60"` | | -| autoscaling.targetMemory | string | `""` | | -| containerSecurityContext.allowPrivilegeEscalation | bool | `false` | | -| containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | | -| containerSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| createConfigmap | bool | `true` | | -| dashboardProviders | object | `{}` | | -| dashboards | object | `{}` | | -| dashboardsConfigMaps | object | `{}` | | -| datasources | object | `{}` | | -| deploymentStrategy.type | string | `"RollingUpdate"` | | -| dnsConfig | object | `{}` | | -| dnsPolicy | string | `nil` | | -| downloadDashboards.env | object | `{}` | | -| downloadDashboards.envFromSecret | string | `""` | | -| downloadDashboards.envValueFrom | object | `{}` | | -| downloadDashboards.resources | object | `{}` | | -| downloadDashboards.securityContext.allowPrivilegeEscalation | bool | `false` | | -| downloadDashboards.securityContext.capabilities.drop[0] | string | `"ALL"` | | -| downloadDashboards.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| downloadDashboardsImage.pullPolicy | string | `"IfNotPresent"` | | -| downloadDashboardsImage.registry | string | `"docker.io"` | The Docker registry | -| downloadDashboardsImage.repository | string | `"curlimages/curl"` | | -| downloadDashboardsImage.sha | string | `""` | | -| downloadDashboardsImage.tag | string | `"7.85.0"` | | -| enableKubeBackwardCompatibility | bool | `false` | | -| enableServiceLinks | bool | `true` | | -| env | object | `{}` | | -| envFromConfigMaps | list | `[]` | | -| envFromSecret | string | `""` | | -| envFromSecrets | list | `[]` | | -| envRenderSecret | object | `{}` | | -| envValueFrom | object | `{}` | | -| extraConfigmapMounts | list | `[]` | | -| extraContainerVolumes | list | `[]` | | -| extraContainers | string | `""` | | -| extraEmptyDirMounts | list | `[]` | | -| extraExposePorts | list | `[]` | | -| extraInitContainers | list | `[]` | | -| extraLabels | object | `{}` | | -| extraObjects | list | `[]` | | -| extraSecretMounts | list | `[]` | | -| extraVolumeMounts | list | `[]` | | -| extraVolumes | list | `[]` | | -| global.imagePullSecrets | list | `[]` | | -| global.imageRegistry | string | `nil` | Overrides the Docker registry globally for all images | -| gossipPortName | string | `"gossip"` | | -| headlessService | bool | `false` | | -| hostAliases | list | `[]` | | -| image.pullPolicy | string | `"IfNotPresent"` | | -| image.pullSecrets | list | `[]` | | -| image.registry | string | `"docker.io"` | The Docker registry | -| image.repository | string | `"grafana/grafana"` | Docker image repository | -| image.sha | string | `""` | | -| image.tag | string | `""` | | -| imageRenderer.affinity | object | `{}` | | -| imageRenderer.autoscaling.behavior | object | `{}` | | -| imageRenderer.autoscaling.enabled | bool | `false` | | -| imageRenderer.autoscaling.maxReplicas | int | `5` | | -| imageRenderer.autoscaling.minReplicas | int | `1` | | -| imageRenderer.autoscaling.targetCPU | string | `"60"` | | -| imageRenderer.autoscaling.targetMemory | string | `""` | | -| imageRenderer.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | | -| imageRenderer.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | | -| imageRenderer.containerSecurityContext.readOnlyRootFilesystem | bool | `true` | | -| imageRenderer.containerSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| imageRenderer.deploymentStrategy | object | `{}` | | -| imageRenderer.enabled | bool | `false` | | -| imageRenderer.env.HTTP_HOST | string | `"0.0.0.0"` | | -| imageRenderer.envValueFrom | object | `{}` | | -| imageRenderer.extraConfigmapMounts | list | `[]` | | -| imageRenderer.extraSecretMounts | list | `[]` | | -| imageRenderer.extraVolumeMounts | list | `[]` | | -| imageRenderer.extraVolumes | list | `[]` | | -| imageRenderer.grafanaProtocol | string | `"http"` | | -| imageRenderer.grafanaSubPath | string | `""` | | -| imageRenderer.hostAliases | list | `[]` | | -| imageRenderer.image.pullPolicy | string | `"Always"` | | -| imageRenderer.image.registry | string | `"docker.io"` | The Docker registry | -| imageRenderer.image.repository | string | `"grafana/grafana-image-renderer"` | | -| imageRenderer.image.sha | string | `""` | | -| imageRenderer.image.tag | string | `"latest"` | | -| imageRenderer.networkPolicy.extraIngressSelectors | list | `[]` | | -| imageRenderer.networkPolicy.limitEgress | bool | `false` | | -| imageRenderer.networkPolicy.limitIngress | bool | `true` | | -| imageRenderer.nodeSelector | object | `{}` | | -| imageRenderer.podAnnotations | object | `{}` | | -| imageRenderer.podPortName | string | `"http"` | | -| imageRenderer.priorityClassName | string | `""` | | -| imageRenderer.replicas | int | `1` | | -| imageRenderer.resources | object | `{}` | | -| imageRenderer.revisionHistoryLimit | int | `10` | | -| imageRenderer.securityContext | object | `{}` | | -| imageRenderer.service.appProtocol | string | `""` | | -| imageRenderer.service.enabled | bool | `true` | | -| imageRenderer.service.port | int | `8081` | | -| imageRenderer.service.portName | string | `"http"` | | -| imageRenderer.service.targetPort | int | `8081` | | -| imageRenderer.serviceAccountName | string | `""` | | -| imageRenderer.serviceMonitor.enabled | bool | `false` | | -| imageRenderer.serviceMonitor.interval | string | `"1m"` | | -| imageRenderer.serviceMonitor.labels | object | `{}` | | -| imageRenderer.serviceMonitor.path | string | `"/metrics"` | | -| imageRenderer.serviceMonitor.relabelings | list | `[]` | | -| imageRenderer.serviceMonitor.scheme | string | `"http"` | | -| imageRenderer.serviceMonitor.scrapeTimeout | string | `"30s"` | | -| imageRenderer.serviceMonitor.targetLabels | list | `[]` | | -| imageRenderer.serviceMonitor.tlsConfig | object | `{}` | | -| imageRenderer.tolerations | list | `[]` | | -| ingress.annotations | object | `{}` | | -| ingress.enabled | bool | `false` | | -| ingress.extraPaths | list | `[]` | | -| ingress.hosts[0] | string | `"chart-example.local"` | | -| ingress.labels | object | `{}` | | -| ingress.path | string | `"/"` | | -| ingress.pathType | string | `"Prefix"` | | -| ingress.tls | list | `[]` | | -| initChownData.enabled | bool | `true` | | -| initChownData.image.pullPolicy | string | `"IfNotPresent"` | | -| initChownData.image.registry | string | `"docker.io"` | The Docker registry | -| initChownData.image.repository | string | `"library/busybox"` | | -| initChownData.image.sha | string | `""` | | -| initChownData.image.tag | string | `"1.31.1"` | | -| initChownData.resources | object | `{}` | | -| initChownData.securityContext.capabilities.add[0] | string | `"CHOWN"` | | -| initChownData.securityContext.runAsNonRoot | bool | `false` | | -| initChownData.securityContext.runAsUser | int | `0` | | -| initChownData.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| ldap.config | string | `""` | | -| ldap.enabled | bool | `false` | | -| ldap.existingSecret | string | `""` | | -| lifecycleHooks | object | `{}` | | -| livenessProbe.failureThreshold | int | `10` | | -| livenessProbe.httpGet.path | string | `"/api/health"` | | -| livenessProbe.httpGet.port | int | `3000` | | -| livenessProbe.initialDelaySeconds | int | `60` | | -| livenessProbe.timeoutSeconds | int | `30` | | -| namespaceOverride | string | `""` | | -| networkPolicy.allowExternal | bool | `true` | | -| networkPolicy.egress.blockDNSResolution | bool | `false` | | -| networkPolicy.egress.enabled | bool | `false` | | -| networkPolicy.egress.ports | list | `[]` | | -| networkPolicy.egress.to | list | `[]` | | -| networkPolicy.enabled | bool | `false` | | -| networkPolicy.explicitNamespacesSelector | object | `{}` | | -| networkPolicy.ingress | bool | `true` | | -| nodeSelector | object | `{}` | | -| notifiers | object | `{}` | | -| persistence.accessModes[0] | string | `"ReadWriteOnce"` | | -| persistence.disableWarning | bool | `false` | | -| persistence.enabled | bool | `false` | | -| persistence.extraPvcLabels | object | `{}` | | -| persistence.finalizers[0] | string | `"kubernetes.io/pvc-protection"` | | -| persistence.inMemory.enabled | bool | `false` | | -| persistence.lookupVolumeName | bool | `true` | | -| persistence.size | string | `"10Gi"` | | -| persistence.type | string | `"pvc"` | | -| plugins | list | `[]` | | -| podDisruptionBudget | object | `{}` | | -| podPortName | string | `"grafana"` | | -| rbac.create | bool | `true` | | -| rbac.extraClusterRoleRules | list | `[]` | | -| rbac.extraRoleRules | list | `[]` | | -| rbac.namespaced | bool | `false` | | -| rbac.pspEnabled | bool | `false` | | -| rbac.pspUseAppArmor | bool | `false` | | -| readinessProbe.httpGet.path | string | `"/api/health"` | | -| readinessProbe.httpGet.port | int | `3000` | | -| replicas | int | `1` | | -| resources | object | `{}` | | -| revisionHistoryLimit | int | `10` | | -| securityContext.fsGroup | int | `472` | | -| securityContext.runAsGroup | int | `472` | | -| securityContext.runAsNonRoot | bool | `true` | | -| securityContext.runAsUser | int | `472` | | -| service.annotations | object | `{}` | | -| service.appProtocol | string | `""` | | -| service.enabled | bool | `true` | | -| service.ipFamilies | list | `[]` | | -| service.ipFamilyPolicy | string | `""` | | -| service.labels | object | `{}` | | -| service.loadBalancerClass | string | `""` | | -| service.loadBalancerIP | string | `""` | | -| service.loadBalancerSourceRanges | list | `[]` | | -| service.port | int | `80` | | -| service.portName | string | `"service"` | | -| service.targetPort | int | `3000` | | -| service.type | string | `"ClusterIP"` | | -| serviceAccount.automountServiceAccountToken | bool | `false` | | -| serviceAccount.create | bool | `true` | | -| serviceAccount.labels | object | `{}` | | -| serviceAccount.name | string | `nil` | | -| serviceAccount.nameTest | string | `nil` | | -| serviceMonitor.enabled | bool | `false` | | -| serviceMonitor.interval | string | `"30s"` | | -| serviceMonitor.labels | object | `{}` | | -| serviceMonitor.metricRelabelings | list | `[]` | | -| serviceMonitor.path | string | `"/metrics"` | | -| serviceMonitor.relabelings | list | `[]` | | -| serviceMonitor.scheme | string | `"http"` | | -| serviceMonitor.scrapeTimeout | string | `"30s"` | | -| serviceMonitor.targetLabels | list | `[]` | | -| serviceMonitor.tlsConfig | object | `{}` | | -| sidecar.alerts.enabled | bool | `false` | | -| sidecar.alerts.env | object | `{}` | | -| sidecar.alerts.extraMounts | list | `[]` | | -| sidecar.alerts.initAlerts | bool | `false` | | -| sidecar.alerts.label | string | `"grafana_alert"` | | -| sidecar.alerts.labelValue | string | `""` | | -| sidecar.alerts.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/alerting/reload"` | | -| sidecar.alerts.resource | string | `"both"` | | -| sidecar.alerts.script | string | `nil` | | -| sidecar.alerts.searchNamespace | string | `nil` | | -| sidecar.alerts.sizeLimit | object | `{}` | | -| sidecar.alerts.skipReload | bool | `false` | | -| sidecar.alerts.watchMethod | string | `"WATCH"` | | -| sidecar.dashboards.SCProvider | bool | `true` | | -| sidecar.dashboards.defaultFolderName | string | `nil` | | -| sidecar.dashboards.enabled | bool | `false` | | -| sidecar.dashboards.env | object | `{}` | | -| sidecar.dashboards.envValueFrom | object | `{}` | | -| sidecar.dashboards.extraMounts | list | `[]` | | -| sidecar.dashboards.folder | string | `"/tmp/dashboards"` | | -| sidecar.dashboards.folderAnnotation | string | `nil` | | -| sidecar.dashboards.label | string | `"grafana_dashboard"` | | -| sidecar.dashboards.labelValue | string | `""` | | -| sidecar.dashboards.provider.allowUiUpdates | bool | `false` | | -| sidecar.dashboards.provider.disableDelete | bool | `false` | | -| sidecar.dashboards.provider.folder | string | `""` | | -| sidecar.dashboards.provider.folderUid | string | `""` | | -| sidecar.dashboards.provider.foldersFromFilesStructure | bool | `false` | | -| sidecar.dashboards.provider.name | string | `"sidecarProvider"` | | -| sidecar.dashboards.provider.orgid | int | `1` | | -| sidecar.dashboards.provider.type | string | `"file"` | | -| sidecar.dashboards.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/dashboards/reload"` | | -| sidecar.dashboards.resource | string | `"both"` | | -| sidecar.dashboards.script | string | `nil` | | -| sidecar.dashboards.searchNamespace | string | `nil` | | -| sidecar.dashboards.sizeLimit | object | `{}` | | -| sidecar.dashboards.skipReload | bool | `false` | | -| sidecar.dashboards.watchMethod | string | `"WATCH"` | | -| sidecar.datasources.enabled | bool | `false` | | -| sidecar.datasources.env | object | `{}` | | -| sidecar.datasources.envValueFrom | object | `{}` | | -| sidecar.datasources.initDatasources | bool | `false` | | -| sidecar.datasources.label | string | `"grafana_datasource"` | | -| sidecar.datasources.labelValue | string | `""` | | -| sidecar.datasources.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/datasources/reload"` | | -| sidecar.datasources.resource | string | `"both"` | | -| sidecar.datasources.script | string | `nil` | | -| sidecar.datasources.searchNamespace | string | `nil` | | -| sidecar.datasources.sizeLimit | object | `{}` | | -| sidecar.datasources.skipReload | bool | `false` | | -| sidecar.datasources.watchMethod | string | `"WATCH"` | | -| sidecar.enableUniqueFilenames | bool | `false` | | -| sidecar.image.registry | string | `"quay.io"` | The Docker registry | -| sidecar.image.repository | string | `"kiwigrid/k8s-sidecar"` | | -| sidecar.image.sha | string | `""` | | -| sidecar.image.tag | string | `"1.27.4"` | | -| sidecar.imagePullPolicy | string | `"IfNotPresent"` | | -| sidecar.livenessProbe | object | `{}` | | -| sidecar.notifiers.enabled | bool | `false` | | -| sidecar.notifiers.env | object | `{}` | | -| sidecar.notifiers.initNotifiers | bool | `false` | | -| sidecar.notifiers.label | string | `"grafana_notifier"` | | -| sidecar.notifiers.labelValue | string | `""` | | -| sidecar.notifiers.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/notifications/reload"` | | -| sidecar.notifiers.resource | string | `"both"` | | -| sidecar.notifiers.script | string | `nil` | | -| sidecar.notifiers.searchNamespace | string | `nil` | | -| sidecar.notifiers.sizeLimit | object | `{}` | | -| sidecar.notifiers.skipReload | bool | `false` | | -| sidecar.notifiers.watchMethod | string | `"WATCH"` | | -| sidecar.plugins.enabled | bool | `false` | | -| sidecar.plugins.env | object | `{}` | | -| sidecar.plugins.initPlugins | bool | `false` | | -| sidecar.plugins.label | string | `"grafana_plugin"` | | -| sidecar.plugins.labelValue | string | `""` | | -| sidecar.plugins.reloadURL | string | `"http://localhost:3000/api/admin/provisioning/plugins/reload"` | | -| sidecar.plugins.resource | string | `"both"` | | -| sidecar.plugins.script | string | `nil` | | -| sidecar.plugins.searchNamespace | string | `nil` | | -| sidecar.plugins.sizeLimit | object | `{}` | | -| sidecar.plugins.skipReload | bool | `false` | | -| sidecar.plugins.watchMethod | string | `"WATCH"` | | -| sidecar.readinessProbe | object | `{}` | | -| sidecar.resources | object | `{}` | | -| sidecar.securityContext.allowPrivilegeEscalation | bool | `false` | | -| sidecar.securityContext.capabilities.drop[0] | string | `"ALL"` | | -| sidecar.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | -| smtp.existingSecret | string | `""` | | -| smtp.passwordKey | string | `"password"` | | -| smtp.userKey | string | `"user"` | | -| testFramework.enabled | bool | `true` | | -| testFramework.image.registry | string | `"docker.io"` | The Docker registry | -| testFramework.image.repository | string | `"bats/bats"` | | -| testFramework.image.tag | string | `"v1.4.1"` | | -| testFramework.imagePullPolicy | string | `"IfNotPresent"` | | -| testFramework.resources | object | `{}` | | -| testFramework.securityContext | object | `{}` | | -| tolerations | list | `[]` | | -| topologySpreadConstraints | list | `[]` | | -| useStatefulSet | bool | `false` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +# Grafana Helm Chart + +* Installs the web dashboarding system [Grafana](http://grafana.org/) + +## Get Repo Info + +```console +helm repo add grafana https://grafana.github.io/helm-charts +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +helm install my-release grafana/grafana +``` + +## Uninstalling the Chart + +To uninstall/delete the my-release deployment: + +```console +helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Upgrading an existing Release to a new major version + +A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an +incompatible breaking change needing manual actions. + +### To 4.0.0 (And 3.12.1) + +This version requires Helm >= 2.12.0. + +### To 5.0.0 + +You have to add --force to your helm upgrade command as the labels of the chart have changed. + +### To 6.0.0 + +This version requires Helm >= 3.1.0. + +### To 7.0.0 + +For consistency with other Helm charts, the `global.image.registry` parameter was renamed +to `global.imageRegistry`. If you were not previously setting `global.image.registry`, no action +is required on upgrade. If you were previously setting `global.image.registry`, you will +need to instead set `global.imageRegistry`. + +## Configuration + +| Parameter | Description | Default | +|-------------------------------------------|-----------------------------------------------|---------------------------------------------------------| +| `replicas` | Number of nodes | `1` | +| `podDisruptionBudget.minAvailable` | Pod disruption minimum available | `nil` | +| `podDisruptionBudget.maxUnavailable` | Pod disruption maximum unavailable | `nil` | +| `podDisruptionBudget.apiVersion` | Pod disruption apiVersion | `nil` | +| `deploymentStrategy` | Deployment strategy | `{ "type": "RollingUpdate" }` | +| `livenessProbe` | Liveness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } "initialDelaySeconds": 60, "timeoutSeconds": 30, "failureThreshold": 10 }` | +| `readinessProbe` | Readiness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } }`| +| `securityContext` | Deployment securityContext | `{"runAsUser": 472, "runAsGroup": 472, "fsGroup": 472}` | +| `priorityClassName` | Name of Priority Class to assign pods | `nil` | +| `image.registry` | Image registry | `docker.io` | +| `image.repository` | Image repository | `grafana/grafana` | +| `image.tag` | Overrides the Grafana image tag whose default is the chart appVersion (`Must be >= 5.0.0`) | `` | +| `image.sha` | Image sha (optional) | `` | +| `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` | +| `service.appProtocol` | Adds the appProtocol field to the service | `` | +| `service.targetPort` | Internal service is port | `3000` | +| `service.nodePort` | Kubernetes service nodePort | `nil` | +| `service.annotations` | Service annotations (can be templated) | `{}` | +| `service.labels` | Custom labels | `{}` | +| `service.clusterIP` | internal cluster service IP | `nil` | +| `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `nil` | +| `service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to lb (if supported) | `[]` | +| `service.externalIPs` | service external IP addresses | `[]` | +| `service.externalTrafficPolicy` | change the default externalTrafficPolicy | `nil` | +| `headlessService` | Create a headless service | `false` | +| `extraExposePorts` | Additional service ports for sidecar containers| `[]` | +| `hostAliases` | adds rules to the pod's /etc/hosts | `[]` | +| `ingress.enabled` | Enables Ingress | `false` | +| `ingress.annotations` | Ingress annotations (values are templated) | `{}` | +| `ingress.labels` | Custom labels | `{}` | +| `ingress.path` | Ingress accepted path | `/` | +| `ingress.pathType` | Ingress type of path | `Prefix` | +| `ingress.hosts` | Ingress accepted hostnames | `["chart-example.local"]` | +| `ingress.extraPaths` | Ingress extra paths to prepend to every host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.6/guide/ingress/annotations/#actions). Requires `ingress.hosts` to have one or more host entries. | `[]` | +| `ingress.tls` | Ingress TLS configuration | `[]` | +| `ingress.ingressClassName` | Ingress Class Name. MAY be required for Kubernetes versions >= 1.18 | `""` | +| `resources` | CPU/Memory resource requests/limits | `{}` | +| `nodeSelector` | Node labels for pod assignment | `{}` | +| `tolerations` | Toleration labels for pod assignment | `[]` | +| `affinity` | Affinity settings for pod assignment | `{}` | +| `extraInitContainers` | Init containers to add to the grafana pod | `{}` | +| `extraContainers` | Sidecar containers to add to the grafana pod | `""` | +| `extraContainerVolumes` | Volumes that can be mounted in sidecar containers | `[]` | +| `extraLabels` | Custom labels for all manifests | `{}` | +| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | +| `persistence.enabled` | Use persistent volume to store data | `false` | +| `persistence.type` | Type of persistence (`pvc` or `statefulset`) | `pvc` | +| `persistence.size` | Size of persistent volume claim | `10Gi` | +| `persistence.existingClaim` | Use an existing PVC to persist data (can be templated) | `nil` | +| `persistence.storageClassName` | Type of persistent volume claim | `nil` | +| `persistence.accessModes` | Persistence access modes | `[ReadWriteOnce]` | +| `persistence.annotations` | PersistentVolumeClaim annotations | `{}` | +| `persistence.finalizers` | PersistentVolumeClaim finalizers | `[ "kubernetes.io/pvc-protection" ]` | +| `persistence.extraPvcLabels` | Extra labels to apply to a PVC. | `{}` | +| `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` | +| `initChownData.image.tag` | init-chown-data container image tag | `1.31.1` | +| `initChownData.image.sha` | init-chown-data container image sha (optional)| `""` | +| `initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent` | +| `initChownData.resources` | init-chown-data pod resource requests & limits | `{}` | +| `schedulerName` | Alternate scheduler name | `nil` | +| `env` | Extra environment variables passed to pods | `{}` | +| `envValueFrom` | Environment variables 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 | `{}` | +| `envFromSecret` | Name of a Kubernetes secret (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `""` | +| `envFromSecrets` | List of Kubernetes secrets (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `[]` | +| `envFromConfigMaps` | List of Kubernetes ConfigMaps (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `[]` | +| `envRenderSecret` | Sensible environment variables passed to pods and stored as secret. (passed through [tpl](https://helm.sh/docs/howto/charts_tips_and_tricks/#using-the-tpl-function)) | `{}` | +| `enableServiceLinks` | Inject Kubernetes services as environment variables. | `true` | +| `extraSecretMounts` | Additional grafana server secret mounts | `[]` | +| `extraVolumeMounts` | Additional grafana server volume mounts | `[]` | +| `extraVolumes` | Additional Grafana server volumes | `[]` | +| `automountServiceAccountToken` | Mounted the service account token on the grafana pod. Mandatory, if sidecars are enabled | `true` | +| `createConfigmap` | Enable creating the grafana configmap | `true` | +| `extraConfigmapMounts` | Additional grafana server configMap volume mounts (values are templated) | `[]` | +| `extraEmptyDirMounts` | Additional grafana server emptyDir volume mounts | `[]` | +| `plugins` | Plugins to be loaded along with Grafana | `[]` | +| `datasources` | Configure grafana datasources (passed through tpl) | `{}` | +| `alerting` | Configure grafana alerting (passed through tpl) | `{}` | +| `notifiers` | Configure grafana notifiers | `{}` | +| `dashboardProviders` | Configure grafana dashboard providers | `{}` | +| `dashboards` | Dashboards to import | `{}` | +| `dashboardsConfigMaps` | ConfigMaps reference that contains dashboards | `{}` | +| `grafana.ini` | Grafana's primary configuration | `{}` | +| `global.imageRegistry` | Global image pull registry for all images. | `null` | +| `global.imagePullSecrets` | Global image pull secrets (can be templated). Allows either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style). | `[]` | +| `ldap.enabled` | Enable LDAP authentication | `false` | +| `ldap.existingSecret` | The name of an existing secret containing the `ldap.toml` file, this must have the key `ldap-toml`. | `""` | +| `ldap.config` | Grafana's LDAP configuration | `""` | +| `annotations` | Deployment annotations | `{}` | +| `labels` | Deployment labels | `{}` | +| `podAnnotations` | Pod annotations | `{}` | +| `podLabels` | Pod labels | `{}` | +| `podPortName` | Name of the grafana port on the pod | `grafana` | +| `lifecycleHooks` | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers) | `{}` | +| `sidecar.image.registry` | Sidecar image registry | `quay.io` | +| `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` | +| `sidecar.image.tag` | Sidecar image tag | `1.26.0` | +| `sidecar.image.sha` | Sidecar image sha (optional) | `""` | +| `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | +| `sidecar.resources` | Sidecar resources | `{}` | +| `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.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` | +| `sidecar.alerts.reloadURL` | Full url of datasource configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/alerting/reload"` | +| `sidecar.alerts.skipReload` | Enabling this omits defining the REQ_URL and REQ_METHOD environment variables | `false` | +| `sidecar.alerts.initAlerts` | Set to true to deploy the alerts sidecar as an initContainer. This is needed if skipReload is true, to load any alerts defined at startup time. | `false` | +| `sidecar.alerts.extraMounts` | Additional alerts sidecar volume mounts. | `[]` | +| `sidecar.dashboards.enabled` | Enables the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` | +| `sidecar.dashboards.SCProvider` | Enables creation of sidecar provider | `true` | +| `sidecar.dashboards.provider.name` | Unique name of the grafana provider | `sidecarProvider` | +| `sidecar.dashboards.provider.orgid` | Id of the organisation, to which the dashboards should be added | `1` | +| `sidecar.dashboards.provider.folder` | Logical folder in which grafana groups dashboards | `""` | +| `sidecar.dashboards.provider.folderUid` | Allows you to specify the static UID for the logical folder above | `""` | +| `sidecar.dashboards.provider.disableDelete` | Activate to avoid the deletion of imported dashboards | `false` | +| `sidecar.dashboards.provider.allowUiUpdates` | Allow updating provisioned dashboards from the UI | `false` | +| `sidecar.dashboards.provider.type` | Provider type | `file` | +| `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.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` | +| `sidecar.dashboards.searchNamespace` | Namespaces list. If specified, the sidecar will search for dashboards 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.dashboards.script` | Absolute path to shell script to execute after a configmap got reloaded. | `nil` | +| `sidecar.dashboards.reloadURL` | Full url of dashboards configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/dashboards/reload"` | +| `sidecar.dashboards.skipReload` | Enabling this omits defining the REQ_USERNAME, REQ_PASSWORD, REQ_URL and REQ_METHOD environment variables | `false` | +| `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.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` | +| `sidecar.datasources.reloadURL` | Full url of datasource configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/datasources/reload"` | +| `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.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` | +| `sidecar.notifiers.reloadURL` | Full url of notifier configuration reload API endpoint, to invoke after a config-map change | `"http://localhost:3000/api/admin/provisioning/notifications/reload"` | +| `sidecar.notifiers.skipReload` | Enabling this omits defining the REQ_URL and REQ_METHOD environment variables | `false` | +| `sidecar.notifiers.initNotifiers` | Set to true to deploy the notifier sidecar as an initContainer in addition to a container. This is needed if skipReload is true, to load any notifiers defined at startup time. | `false` | +| `smtp.existingSecret` | The name of an existing secret containing the SMTP credentials. | `""` | +| `smtp.userKey` | The key in the existing SMTP secret containing the username. | `"user"` | +| `smtp.passwordKey` | The key in the existing SMTP secret containing the password. | `"password"` | +| `admin.existingSecret` | The name of an existing secret containing the admin credentials (can be templated). | `""` | +| `admin.userKey` | The key in the existing admin secret containing the username. | `"admin-user"` | +| `admin.passwordKey` | The key in the existing admin secret containing the password. | `"admin-password"` | +| `serviceAccount.automountServiceAccountToken` | Automount the service account token on all pods where is service account is used | `false` | +| `serviceAccount.annotations` | ServiceAccount annotations | | +| `serviceAccount.create` | Create service account | `true` | +| `serviceAccount.labels` | ServiceAccount labels | `{}` | +| `serviceAccount.name` | Service account name to use, when empty will be set to created account if `serviceAccount.create` is set else to `default` | `` | +| `serviceAccount.nameTest` | Service account name to use for test, when empty will be set to created account if `serviceAccount.create` is set else to `default` | `nil` | +| `rbac.create` | Create and use RBAC resources | `true` | +| `rbac.namespaced` | Creates Role and Rolebinding instead of the default ClusterRole and ClusteRoleBindings for the grafana instance | `false` | +| `rbac.useExistingRole` | Set to a rolename to use existing role - skipping role creating - but still doing serviceaccount and rolebinding to the rolename set here. | `nil` | +| `rbac.pspEnabled` | Create PodSecurityPolicy (with `rbac.create`, grant roles permissions as well) | `false` | +| `rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires `rbac.pspEnabled`) | `false` | +| `rbac.extraRoleRules` | Additional rules to add to the Role | [] | +| `rbac.extraClusterRoleRules` | Additional rules to add to the ClusterRole | [] | +| `command` | Define command to be executed by grafana container at startup | `nil` | +| `args` | Define additional args if command is used | `nil` | +| `testFramework.enabled` | Whether to create test-related resources | `true` | +| `testFramework.image.registry` | `test-framework` image registry. | `docker.io` | +| `testFramework.image.repository` | `test-framework` image repository. | `bats/bats` | +| `testFramework.image.tag` | `test-framework` image tag. | `v1.4.1` | +| `testFramework.imagePullPolicy` | `test-framework` image pull policy. | `IfNotPresent` | +| `testFramework.securityContext` | `test-framework` securityContext | `{}` | +| `downloadDashboards.env` | Environment variables to be passed to the `download-dashboards` container | `{}` | +| `downloadDashboards.envFromSecret` | Name of a Kubernetes secret (must be manually created in the same namespace) containing values to be added to the environment. Can be templated | `""` | +| `downloadDashboards.resources` | Resources of `download-dashboards` container | `{}` | +| `downloadDashboardsImage.registry` | Curl docker image registry | `docker.io` | +| `downloadDashboardsImage.repository` | Curl docker image repository | `curlimages/curl` | +| `downloadDashboardsImage.tag` | Curl docker image tag | `7.73.0` | +| `downloadDashboardsImage.sha` | Curl docker image sha (optional) | `""` | +| `downloadDashboardsImage.pullPolicy` | Curl docker image pull policy | `IfNotPresent` | +| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) | +| `serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | +| `serviceMonitor.namespace` | Namespace this servicemonitor is installed in | | +| `serviceMonitor.interval` | How frequently Prometheus should scrape | `1m` | +| `serviceMonitor.path` | Path to scrape | `/metrics` | +| `serviceMonitor.scheme` | Scheme to use for metrics scraping | `http` | +| `serviceMonitor.tlsConfig` | TLS configuration block for the endpoint | `{}` | +| `serviceMonitor.labels` | Labels for the servicemonitor passed to Prometheus Operator | `{}` | +| `serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `30s` | +| `serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping. | `[]` | +| `serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | `[]` | +| `revisionHistoryLimit` | Number of old ReplicaSets to retain | `10` | +| `imageRenderer.enabled` | Enable the image-renderer deployment & service | `false` | +| `imageRenderer.image.registry` | image-renderer Image registry | `docker.io` | +| `imageRenderer.image.repository` | image-renderer Image repository | `grafana/grafana-image-renderer` | +| `imageRenderer.image.tag` | image-renderer Image tag | `latest` | +| `imageRenderer.image.sha` | image-renderer Image sha (optional) | `""` | +| `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.hostAliases` | image-renderer deployment Host Aliases | `[]` | +| `imageRenderer.priorityClassName` | image-renderer deployment priority class | `''` | +| `imageRenderer.service.enabled` | Enable the image-renderer service | `true` | +| `imageRenderer.service.portName` | image-renderer service port name | `http` | +| `imageRenderer.service.port` | image-renderer port used by deployment | `8081` | +| `imageRenderer.service.targetPort` | image-renderer service port used by service | `8081` | +| `imageRenderer.appProtocol` | Adds the appProtocol field to the service | `` | +| `imageRenderer.grafanaSubPath` | Grafana sub path to use for image renderer callback url | `''` | +| `imageRenderer.podPortName` | name of the image-renderer port on the pod | `http` | +| `imageRenderer.revisionHistoryLimit` | number of image-renderer replica sets to keep | `10` | +| `imageRenderer.networkPolicy.limitIngress` | Enable a NetworkPolicy to limit inbound traffic from only the created grafana pods | `true` | +| `imageRenderer.networkPolicy.limitEgress` | Enable a NetworkPolicy to limit outbound traffic to only the created grafana pods | `false` | +| `imageRenderer.resources` | Set resource limits for image-renderer pods | `{}` | +| `imageRenderer.nodeSelector` | Node labels for pod assignment | `{}` | +| `imageRenderer.tolerations` | Toleration labels for pod assignment | `[]` | +| `imageRenderer.affinity` | Affinity settings for pod assignment | `{}` | +| `networkPolicy.enabled` | Enable creation of NetworkPolicy resources. | `false` | +| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | +| `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed | `{}` | +| `networkPolicy.ingress` | Enable the creation of an ingress network policy | `true` | +| `networkPolicy.egress.enabled` | Enable the creation of an egress network policy | `false` | +| `networkPolicy.egress.ports` | An array of ports to allow for the egress | `[]` | +| `enableKubeBackwardCompatibility` | Enable backward compatibility of kubernetes where pod's defintion version below 1.13 doesn't have the enableServiceLinks option | `false` | + +### Example ingress with path + +With grafana 6.3 and above + +```yaml +grafana.ini: + server: + domain: monitoring.example.com + root_url: "%(protocol)s://%(domain)s/grafana" + serve_from_sub_path: true +ingress: + enabled: true + hosts: + - "monitoring.example.com" + path: "/grafana" +``` + +### Example of extraVolumeMounts and extraVolumes + +Configure additional volumes with `extraVolumes` and volume mounts with `extraVolumeMounts`. + +Example for `extraVolumeMounts` and corresponding `extraVolumes`: + +```yaml +extraVolumeMounts: + - name: plugins + mountPath: /var/lib/grafana/plugins + subPath: configs/grafana/plugins + readOnly: false + - name: dashboards + mountPath: /var/lib/grafana/dashboards + hostPath: /usr/shared/grafana/dashboards + readOnly: false + +extraVolumes: + - name: plugins + existingClaim: existing-grafana-claim + - name: dashboards + hostPath: /usr/shared/grafana/dashboards +``` + +Volumes default to `emptyDir`. Set to `persistentVolumeClaim`, +`hostPath`, `csi`, or `configMap` for other types. For a +`persistentVolumeClaim`, specify an existing claim name with +`existingClaim`. + +## Import dashboards + +There are a few methods to import dashboards to Grafana. Below are some examples and explanations as to how to use each method: + +```yaml +dashboards: + default: + some-dashboard: + json: | + { + "annotations": + + ... + # Complete json file here + ... + + "title": "Some Dashboard", + "uid": "abcd1234", + "version": 1 + } + custom-dashboard: + # This is a path to a file inside the dashboards directory inside the chart directory + file: dashboards/custom-dashboard.json + prometheus-stats: + # Ref: https://grafana.com/dashboards/2 + gnetId: 2 + revision: 2 + datasource: Prometheus + loki-dashboard-quick-search: + gnetId: 12019 + revision: 2 + datasource: + - name: DS_PROMETHEUS + value: Prometheus + - name: DS_LOKI + value: Loki + local-dashboard: + url: https://raw.githubusercontent.com/user/repository/master/dashboards/dashboard.json +``` + +## BASE64 dashboards + +Dashboards could be stored on a server that does not return JSON directly and instead of it returns a Base64 encoded file (e.g. Gerrit) +A new parameter has been added to the url use case so if you specify a b64content value equals to true after the url entry a Base64 decoding is applied before save the file to disk. +If this entry is not set or is equals to false not decoding is applied to the file before saving it to disk. + +### Gerrit use case + +Gerrit API for download files has the following schema: where {project-name} and +{file-id} usually has '/' in their values and so they MUST be replaced by %2F so if project-name is user/repo, branch-id is master and file-id is equals to dir1/dir2/dashboard +the url value is + +## Sidecar for dashboards + +If the parameter `sidecar.dashboards.enabled` is set, a sidecar container is deployed in the grafana +pod. This container watches all configmaps (or secrets) in the cluster and filters out the ones with +a label as defined in `sidecar.dashboards.label`. The files defined in those configmaps are written +to a folder and accessed by grafana. Changes to the configmaps are monitored and the imported +dashboards are deleted/updated. + +A recommendation is to use one configmap per dashboard, as a reduction of multiple dashboards inside +one configmap is currently not properly mirrored in grafana. + +Example dashboard config: + +```yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: sample-grafana-dashboard + labels: + grafana_dashboard: "1" +data: + k8s-dashboard.json: |- + [...] +``` + +## Sidecar for datasources + +If the parameter `sidecar.datasources.enabled` is set, an init container is deployed in the grafana +pod. This container lists all secrets (or configmaps, though not recommended) in the cluster and +filters out the ones with a label as defined in `sidecar.datasources.label`. The files defined in +those secrets are written to a folder and accessed by grafana on startup. Using these yaml files, +the data sources in grafana can be imported. + +Should you aim for reloading datasources in Grafana each time the config is changed, set `sidecar.datasources.skipReload: false` and adjust `sidecar.datasources.reloadURL` to `http://..svc.cluster.local/api/admin/provisioning/datasources/reload`. + +Secrets are recommended over configmaps for this usecase because datasources usually contain private +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 +metadata: + name: grafana-datasources + labels: + grafana_datasource: 'true' # default value for: sidecar.datasources.label +stringData: + pg-db.yaml: |- + apiVersion: 1 + datasources: + - name: My pg db datasource + type: postgres + url: my-postgresql-db:5432 + user: db-readonly-user + secureJsonData: + password: 'SUperSEcretPa$$word' + jsonData: + database: my_datase + sslmode: 'disable' # disable/require/verify-ca/verify-full + maxOpenConns: 0 # Grafana v5.4+ + maxIdleConns: 2 # Grafana v5.4+ + connMaxLifetime: 14400 # Grafana v5.4+ + postgresVersion: 1000 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10 + timescaledb: false + # allow users to edit datasources from the UI. + editable: false +``` + +Example values to add a datasource adapted from [Grafana](http://docs.grafana.org/administration/provisioning/#example-datasource-config-file): + +```yaml +datasources: + datasources.yaml: + apiVersion: 1 + datasources: + # name of the datasource. Required + - name: Graphite + # datasource type. Required + type: graphite + # access mode. proxy or direct (Server or Browser in the UI). Required + access: proxy + # org id. will default to orgId 1 if not specified + orgId: 1 + # url + url: http://localhost:8080 + # database password, if used + password: + # database user, if used + user: + # database name, if used + database: + # enable/disable basic auth + basicAuth: + # basic auth username + basicAuthUser: + # basic auth password + basicAuthPassword: + # enable/disable with credentials headers + withCredentials: + # mark as default datasource. Max one per org + isDefault: + # fields that will be converted to json and stored in json_data + jsonData: + graphiteVersion: "1.1" + tlsAuth: true + tlsAuthWithCACert: true + # json object of data that will be encrypted. + secureJsonData: + tlsCACert: "..." + tlsClientCert: "..." + tlsClientKey: "..." + version: 1 + # allow users to edit datasources from the UI. + editable: false +``` + +## Sidecar for notifiers + +If the parameter `sidecar.notifiers.enabled` is set, an init container is deployed in the grafana +pod. This container lists all secrets (or configmaps, though not recommended) in the cluster and +filters out the ones with a label as defined in `sidecar.notifiers.label`. The files defined in +those secrets are written to a folder and accessed by grafana on startup. Using these yaml files, +the notification channels in grafana can be imported. The secrets must be created before +`helm install` so that the notifiers init container can list the secrets. + +Secrets are recommended over configmaps for this usecase because alert notification channels usually contain +private data like SMTP usernames and passwords. Secrets are the more appropriate cluster resource to manage those. + +Example datasource config adapted from [Grafana](https://grafana.com/docs/grafana/latest/administration/provisioning/#alert-notification-channels): + +```yaml +notifiers: + - name: notification-channel-1 + type: slack + uid: notifier1 + # either + org_id: 2 + # or + org_name: Main Org. + is_default: true + send_reminder: true + frequency: 1h + disable_resolve_message: false + # See `Supported Settings` section for settings supporter for each + # alert notification type. + settings: + recipient: 'XXX' + token: 'xoxb' + uploadImage: true + url: https://slack.com + +delete_notifiers: + - name: notification-channel-1 + uid: notifier1 + org_id: 2 + - name: notification-channel-2 + # default org_id: 1 +``` + +## Sidecar for alerting resources + +If the parameter `sidecar.alerts.enabled` is set, a sidecar container is deployed in the grafana +pod. This container watches all configmaps (or secrets) in the cluster (namespace defined by `sidecar.alerts.searchNamespace`) and filters out the ones with +a label as defined in `sidecar.alerts.label` (default is `grafana_alert`). The files defined in those configmaps are written +to a folder and accessed by grafana. Changes to the configmaps are monitored and the imported alerting resources are updated, however, deletions are a little more complicated (see below). + +This sidecar can be used to provision alert rules, contact points, notification policies, notification templates and mute timings as shown in [Grafana Documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/). + +To fetch the alert config which will be provisioned, use the alert provisioning API ([Grafana Documentation](https://grafana.com/docs/grafana/next/developers/http_api/alerting_provisioning/)). +You can use either JSON or YAML format. + +Example config for an alert rule: + +```yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: sample-grafana-alert + labels: + grafana_alert: "1" +data: + k8s-alert.yml: |- + apiVersion: 1 + groups: + - orgId: 1 + name: k8s-alert + [...] +``` + +To delete provisioned alert rules is a two step process, you need to delete the configmap which defined the alert rule +and then create a configuration which deletes the alert rule. + +Example deletion configuration: + +```yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: delete-sample-grafana-alert + namespace: monitoring + labels: + grafana_alert: "1" +data: + delete-k8s-alert.yml: |- + apiVersion: 1 + deleteRules: + - orgId: 1 + uid: 16624780-6564-45dc-825c-8bded4ad92d3 +``` + +## 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. + +There are two methods to statically provision alerting configuration in Grafana. Below are some examples and explanations as to how to use each method: + +```yaml +alerting: + team1-alert-rules.yaml: + file: alerting/team1/rules.yaml + team2-alert-rules.yaml: + file: alerting/team2/rules.yaml + team3-alert-rules.yaml: + file: alerting/team3/rules.yaml + notification-policies.yaml: + file: alerting/shared/notification-policies.yaml + notification-templates.yaml: + file: alerting/shared/notification-templates.yaml + contactpoints.yaml: + apiVersion: 1 + contactPoints: + - orgId: 1 + name: Slack channel + receivers: + - uid: default-receiver + type: slack + settings: + # Webhook URL to be filled in + url: "" + # We need to escape double curly braces for the tpl function. + text: '{{ `{{ template "default.message" . }}` }}' + title: '{{ `{{ template "default.title" . }}` }}' +``` + +The two possibilities for static alerting resource provisioning are: + +* Inlining the file contents as shown for contact points in the above example. +* Importing a file using a relative path starting from the chart root directory as shown for the alert rules in the above example. + +### Important notes on file provisioning + +* The format of the files is defined in the [Grafana documentation](https://grafana.com/docs/grafana/next/alerting/set-up/provision-alerting-resources/file-provisioning/) on file provisioning. +* The chart supports importing YAML and JSON files. +* The filename must be unique, otherwise one volume mount will overwrite the other. +* In case of inlining, double curly braces that arise from the Grafana configuration format and are not intended as templates for the chart must be escaped. +* The number of total files under `alerting:` is not limited. Each file will end up as a volume mount in the corresponding provisioning folder of the deployed Grafana instance. +* The file size for each import is limited by what the function `.Files.Get` can handle, which suffices for most cases. + +## How to serve Grafana with a path prefix (/grafana) + +In order to serve Grafana with a prefix (e.g., ), add the following to your values.yaml. + +```yaml +ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: "nginx" + nginx.ingress.kubernetes.io/rewrite-target: /$1 + nginx.ingress.kubernetes.io/use-regex: "true" + + path: /grafana/?(.*) + hosts: + - k8s.example.dev + +grafana.ini: + server: + root_url: http://localhost:3000/grafana # this host can be localhost +``` + +## How to securely reference secrets in grafana.ini + +This example uses Grafana [file providers](https://grafana.com/docs/grafana/latest/administration/configuration/#file-provider) for secret values and the `extraSecretMounts` configuration flag (Additional grafana server secret mounts) to mount the secrets. + +In grafana.ini: + +```yaml +grafana.ini: + [auth.generic_oauth] + enabled = true + client_id = $__file{/etc/secrets/auth_generic_oauth/client_id} + client_secret = $__file{/etc/secrets/auth_generic_oauth/client_secret} +``` + +Existing secret, or created along with helm: + +```yaml +--- +apiVersion: v1 +kind: Secret +metadata: + name: auth-generic-oauth-secret +type: Opaque +stringData: + client_id: + client_secret: +``` + +Include in the `extraSecretMounts` configuration flag: + +```yaml +- extraSecretMounts: + - name: auth-generic-oauth-secret-mount + secretName: auth-generic-oauth-secret + defaultMode: 0440 + mountPath: /etc/secrets/auth_generic_oauth + readOnly: true +``` + +### extraSecretMounts using a Container Storage Interface (CSI) provider + +This example uses a CSI driver e.g. retrieving secrets using [Azure Key Vault Provider](https://github.com/Azure/secrets-store-csi-driver-provider-azure) + +```yaml +- extraSecretMounts: + - name: secrets-store-inline + mountPath: /run/secrets + readOnly: true + csi: + driver: secrets-store.csi.k8s.io + readOnly: true + volumeAttributes: + secretProviderClass: "my-provider" + nodePublishSecretRef: + name: akv-creds +``` + +## Image Renderer Plug-In + +This chart supports enabling [remote image rendering](https://github.com/grafana/grafana-image-renderer/blob/master/README.md#run-in-docker) + +```yaml +imageRenderer: + enabled: true +``` + +### Image Renderer NetworkPolicy + +By default the image-renderer pods will have a network policy which only allows ingress traffic from the created grafana instance + +### High Availability for unified alerting + +If you want to run Grafana in a high availability cluster you need to enable +the headless service by setting `headlessService: true` in your `values.yaml` +file. + +As next step you have to setup the `grafana.ini` in your `values.yaml` in a way +that it will make use of the headless service to obtain all the IPs of the +cluster. You should replace ``{{ Name }}`` with the name of your helm deployment. + +```yaml +grafana.ini: + ... + unified_alerting: + enabled: true + ha_peers: {{ Name }}-headless:9094 + ha_listen_address: ${POD_IP}:9094 + ha_advertise_address: ${POD_IP}:9094 + + alerting: + enabled: false +``` From 254fef679e60de7d8840b6750f4fcc3668c589c8 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 23 Jul 2024 13:46:46 +0200 Subject: [PATCH 150/152] [tempo-distributed] New overrides format bugfix Signed-off-by: Mario Docs Update readme Signed-off-by: Mario --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 14 +++++++------- charts/tempo-distributed/templates/_helpers.tpl | 3 ++- charts/tempo-distributed/values.yaml | 3 +-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 11135959c8..d3420ba9f9 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.15.1 +version: 1.15.2 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ae2017be5e..044ba75b80 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.15.2](https://img.shields.io/badge/Version-1.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -46,14 +46,14 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.13.0 +### From Chart versions < 1.15.2 -EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. -Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` +Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. -### From Chart versions < 1.8.0 +### From Chart versions < 1.13.0 -Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. +EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. +Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` ### From Chart versions < 1.6.0 @@ -661,7 +661,7 @@ The memcached default args are removed and should be provided manually. The sett | minio.rootPassword | string | `"supersecret"` | | | minio.rootUser | string | `"grafana-tempo"` | | | multitenancyEnabled | bool | `false` | | -| overrides | string | `"overrides: {}\n"` | | +| overrides | object | `{}` | | | prometheusRule.annotations | object | `{}` | PrometheusRule annotations | | prometheusRule.enabled | bool | `false` | If enabled, a PrometheusRule resource for Prometheus Operator is created | | prometheusRule.groups | list | `[]` | Contents of Prometheus rules file | diff --git a/charts/tempo-distributed/templates/_helpers.tpl b/charts/tempo-distributed/templates/_helpers.tpl index cabad97584..81e08f6f0e 100644 --- a/charts/tempo-distributed/templates/_helpers.tpl +++ b/charts/tempo-distributed/templates/_helpers.tpl @@ -188,7 +188,8 @@ Calculate the config from structured and unstructured text input Renders the overrides config */}} {{- define "tempo.overridesConfig" -}} -{{ tpl .Values.overrides . }} +overrides: +{{ toYaml .Values.overrides | indent 2 }} {{- end -}} {{/* diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 39f57bb60b..f370f40988 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1436,8 +1436,7 @@ global_overrides: per_tenant_override_config: /runtime-config/overrides.yaml # Per tenants overrides -overrides: | - overrides: {} +overrides: {} # memcached is for all of the Tempo pieces to coordinate with each other. # you can use your self memcacherd by set enable: false and host + service From 103a05dea4a784ee3fe3d3267ad7c4bb12641478 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 23 Jul 2024 14:43:31 +0200 Subject: [PATCH 151/152] Fix docs Signed-off-by: Mario --- charts/tempo-distributed/README.md.gotmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 2436bb8ab5..6bb2718e0d 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,14 +39,14 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. -### from Chart versions < 1.13.0 +### From Chart versions < 1.15.2 -EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. -Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` +Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. -### From Chart versions < 1.8.0 +### From Chart versions < 1.13.0 -Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. +EXPERIMENTAL: Zone Aware Replication has been added to the ingester statefulset. +Attention, the calculation of the pods per AZ is as follows ```(.values.ingester.replicas + numberOfZones -1)/numberOfZones``` ### From Chart versions < 1.6.0 From 7dee9a243f48984efaa570a1c39d14d30edcec7d Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Wed, 24 Jul 2024 12:32:46 +0100 Subject: [PATCH 152/152] Update Agent Operator chart to Agent 0.42.0 Signed-off-by: Paulin Todev --- charts/agent-operator/Chart.yaml | 10 +++++----- charts/agent-operator/README.md | 6 +++--- charts/agent-operator/values.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 390eee327a..0ef56dad25 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.4.0 -appVersion: "0.41.1" -home: https://grafana.com/docs/agent/v0.41/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png +version: 0.4.1 +appVersion: "0.42.0" +home: https://grafana.com/docs/agent/v0.42/ +icon: https://raw.githubusercontent.com/grafana/agent/v0.42.0/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.41.1/pkg/operator + - https://github.com/grafana/agent/tree/v0.42.0/static/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 72a5419cc1..c64a68beb3 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.1](https://img.shields.io/badge/AppVersion-0.41.1-informational?style=flat-square) +![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.42.0](https://img.shields.io/badge/AppVersion-0.42.0-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.41.1"` | Image tag | +| image.tag | string | `"v0.42.0"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index d4660a7a12..d2112f90a9 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.41.1 + tag: v0.42.0 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets