From d48e722ee854376aace5184df74aa3fb842de18a Mon Sep 17 00:00:00 2001 From: Costis Date: Tue, 17 Sep 2024 13:59:26 +0300 Subject: [PATCH 01/62] LoadBalancer cannot simultaneously support TCP and UDP protocols Signed-off-by: Costis --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 7 ++- charts/tempo/templates/_ports.tpl | 88 +++++++++++++++++++++++++++++ charts/tempo/templates/service.yaml | 65 +++++---------------- charts/tempo/values.yaml | 6 ++ 5 files changed, 115 insertions(+), 53 deletions(-) create mode 100644 charts/tempo/templates/_ports.tpl diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 352a07e83e..969a8112d9 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.3 +version: 1.10.4 appVersion: 2.5.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index e34b011ff1..f8913e0363 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.10.3](https://img.shields.io/badge/Version-1.10.3-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.4](https://img.shields.io/badge/Version-1.10.4-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 @@ -41,6 +41,9 @@ Grafana Tempo Single Binary Mode | service.labels | object | `{}` | | | service.targetPort | string | `""` | | | service.type | string | `"ClusterIP"` | | +| service.clusterIP | string | `""` | | +| service.loadBalancerIP | string | `""` | | +| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can be "UDP", "TCP" or "UDP,TCP" | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.automountServiceAccountToken | bool | `true` | | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | @@ -148,4 +151,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra 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 -old folder to the new. \ No newline at end of file +old folder to the new. diff --git a/charts/tempo/templates/_ports.tpl b/charts/tempo/templates/_ports.tpl new file mode 100644 index 0000000000..e65378489d --- /dev/null +++ b/charts/tempo/templates/_ports.tpl @@ -0,0 +1,88 @@ +{{/* ~=~=~ Partial Templates of exposed Ports ~=~=~ */}} + +{{/* UDP sockets */}} +{{- define "tempo.udp"}} +{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_compact }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: tempo-jaeger-thrift-compact + port: {{ $port }} + protocol: UDP + targetPort: 6831 +{{- end }} +{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_binary }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: tempo-jaeger-thrift-binary + port: {{ $port }} + protocol: UDP + targetPort: 6832 +{{- end }} +{{- /* end of define */}} +{{- end }} + +{{/* TCP sockets */}} +{{- define "tempo.tcp"}} +- name: tempo-prom-metrics + port: 3100 + protocol: TCP + targetPort: 3100 +{{- if .Values.tempoQuery.enabled }} +- name: jaeger-metrics + port: 16687 + protocol: TCP + targetPort: 16687 +- name: tempo-query-jaeger-ui + port: {{ .Values.tempoQuery.service.port }} + targetPort: {{ .Values.tempoQuery.service.port }} +{{- end }} +{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.thrift_http }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: tempo-jaeger-thrift-http + port: {{ $port }} + protocol: TCP + targetPort: 14268 +{{- end }} +{{- $endpoint := .Values.tempo.receivers.jaeger.protocols.grpc }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: grpc-tempo-jaeger + port: {{ $port }} + protocol: TCP + targetPort: 14250 +{{- end }} +- name: tempo-zipkin + port: 9411 + protocol: TCP + targetPort: 9411 +- name: tempo-otlp-legacy + port: 55680 + protocol: TCP + targetPort: 55680 +- name: tempo-otlp-http-legacy + port: 55681 + protocol: TCP + targetPort: 55681 +{{- $endpoint := .Values.tempo.receivers.otlp.protocols.grpc }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: grpc-tempo-otlp + port: {{ $port }} + protocol: TCP + targetPort: 4317 +{{- end }} +{{- $endpoint := .Values.tempo.receivers.otlp.protocols.http }} +{{- with $endpoint.endpoint }} +{{- $port := regexSplit ":" . -1 | last }} +- name: tempo-otlp-http + port: {{ $port }} + protocol: TCP + targetPort: 4318 +{{- end }} +- name: tempo-opencensus + port: 55678 + protocol: TCP + targetPort: 55678 +{{- /* end of define */}} +{{- end }} \ No newline at end of file diff --git a/charts/tempo/templates/service.yaml b/charts/tempo/templates/service.yaml index 4e23e336d4..9c607d9354 100644 --- a/charts/tempo/templates/service.yaml +++ b/charts/tempo/templates/service.yaml @@ -1,3 +1,4 @@ + apiVersion: v1 kind: Service metadata: @@ -32,56 +33,20 @@ spec: {{- end }} {{- end }} ports: - - name: tempo-prom-metrics - port: 3100 - targetPort: 3100 - {{- if .Values.tempoQuery.enabled }} - - name: jaeger-metrics - port: 16687 - targetPort: 16687 - - name: tempo-query-jaeger-ui - port: {{ .Values.tempoQuery.service.port }} - targetPort: {{ .Values.tempoQuery.service.port }} + {{- if (eq .Values.service.type "LoadBalancer") }} + {{- $protocol := .Values.service.protocol | default "TCP" }} + {{- if contains "UDP" $protocol }} + {{- include "tempo.udp" . | indent 2 }} + {{- end }} + {{- if contains "TCP" $protocol }} + {{- include "tempo.tcp" . | indent 2 }} + {{- end }} + {{- else }} + {{- include "tempo.udp" . | indent 2 }} + {{- include "tempo.tcp" . | indent 2 }} {{- end }} - - name: tempo-jaeger-thrift-compact - port: 6831 - protocol: UDP - targetPort: 6831 - - name: tempo-jaeger-thrift-binary - port: 6832 - protocol: UDP - targetPort: 6832 - - name: tempo-jaeger-thrift-http - port: 14268 - protocol: TCP - targetPort: 14268 - - name: grpc-tempo-jaeger - port: 14250 - protocol: TCP - targetPort: 14250 - - name: tempo-zipkin - port: 9411 - protocol: TCP - targetPort: 9411 - - name: tempo-otlp-legacy - port: 55680 - protocol: TCP - targetPort: 55680 - - name: tempo-otlp-http-legacy - port: 55681 - protocol: TCP - targetPort: 4318 - - name: grpc-tempo-otlp - port: 4317 - protocol: TCP - targetPort: 4317 - - name: tempo-otlp-http - port: 4318 - protocol: TCP - targetPort: 4318 - - name: tempo-opencensus - port: 55678 - protocol: TCP - targetPort: 55678 selector: {{- include "tempo.selectorLabels" . | nindent 4 }} + + + diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 91bebb1685..c828b24f2b 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -257,6 +257,12 @@ serviceAccount: service: type: ClusterIP + # type: LoadBalancer + # clusterIP: "" + # loadBalancerIP: "" + # -- If service type is LoadBalancer, the exposed protocol can either be UDP or TCP + # protocol: "TCP" + annotations: {} labels: {} targetPort: "" From 8c379b0eae42d34850aa6fe9c08a292efa0ee022 Mon Sep 17 00:00:00 2001 From: Costis Date: Sun, 22 Sep 2024 15:38:41 +0300 Subject: [PATCH 02/62] README.md should be generated by helm-docs Signed-off-by: Costis --- charts/tempo/README.md | 8 ++++---- charts/tempo/values.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index f8913e0363..ff5c75772e 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -38,12 +38,12 @@ Grafana Tempo Single Binary Mode | replicas | int | `1` | Define the amount of instances | | securityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsNonRoot":true,"runAsUser":10001}` | securityContext for container | | service.annotations | object | `{}` | | +| service.clusterIP | string | `""` | | | service.labels | object | `{}` | | +| service.loadBalancerIP | string | `nil` | IP address, in case of 'type: LoadBalancer' | +| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be 'UDP', 'TCP' or 'UDP,TCP' | | service.targetPort | string | `""` | | | service.type | string | `"ClusterIP"` | | -| service.clusterIP | string | `""` | | -| service.loadBalancerIP | string | `""` | | -| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can be "UDP", "TCP" or "UDP,TCP" | | serviceAccount.annotations | object | `{}` | Annotations for the service account | | serviceAccount.automountServiceAccountToken | bool | `true` | | | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount should be created | @@ -151,4 +151,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra 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 -old folder to the new. +old folder to the new. \ No newline at end of file diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index c828b24f2b..41724a7565 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -257,11 +257,11 @@ serviceAccount: service: type: ClusterIP - # type: LoadBalancer - # clusterIP: "" - # loadBalancerIP: "" - # -- If service type is LoadBalancer, the exposed protocol can either be UDP or TCP - # protocol: "TCP" + clusterIP: "" + # -- (string) IP address, in case of 'type: LoadBalancer' + loadBalancerIP: + # -- If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP" + protocol: "TCP" annotations: {} labels: {} From dc0a375a0ec52073974c86c76c584ce945cc7122 Mon Sep 17 00:00:00 2001 From: Costis Date: Wed, 2 Oct 2024 22:26:42 +0300 Subject: [PATCH 03/62] README.md should be generated by helm-docs Signed-off-by: Costis --- charts/tempo/README.md | 2 +- charts/tempo/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index ff5c75772e..2830fe8ba8 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -41,7 +41,7 @@ Grafana Tempo Single Binary Mode | service.clusterIP | string | `""` | | | service.labels | object | `{}` | | | service.loadBalancerIP | string | `nil` | IP address, in case of 'type: LoadBalancer' | -| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be 'UDP', 'TCP' or 'UDP,TCP' | +| service.protocol | string | `"TCP"` | If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP" | | service.targetPort | string | `""` | | | service.type | string | `"ClusterIP"` | | | serviceAccount.annotations | object | `{}` | Annotations for the service account | diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 41724a7565..30d5b758f8 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -259,7 +259,7 @@ service: type: ClusterIP clusterIP: "" # -- (string) IP address, in case of 'type: LoadBalancer' - loadBalancerIP: + loadBalancerIP: # -- If service type is LoadBalancer, the exposed protocol can either be "UDP", "TCP" or "UDP,TCP" protocol: "TCP" From 8e55a91183cb81186de5237c88295eb0b80e31d7 Mon Sep 17 00:00:00 2001 From: Martin Balint Date: Thu, 7 Nov 2024 12:40:49 +0100 Subject: [PATCH 04/62] [tempo-distributed] Added option persistentVolumeClaimRetentionPolicy to StatefulSet Signed-off-by: Martin Balint --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 5 ++++- .../templates/ingester/statefulset-ingester.yaml | 5 +++++ charts/tempo-distributed/values.yaml | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 674faac075..b46aa73790 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.21.0 +version: 1.22.0 appVersion: 2.6.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 b2952c2d5b..9e444990f1 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.21.0](https://img.shields.io/badge/Version-1.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.22.0](https://img.shields.io/badge/Version-1.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -542,6 +542,9 @@ The memcached default args are removed and should be provided manually. The sett | ingester.persistence.inMemory | bool | `false` | use emptyDir with ramdisk instead of PVC. **Please note that all data in ingester will be lost on pod restart** | | ingester.persistence.size | string | `"10Gi"` | Size of persistent or memory disk | | ingester.persistence.storageClass | string | `nil` | Storage class to be used. If defined, storageClassName: . If set to "-", storageClassName: "", which disables dynamic provisioning. If empty or set to null, no storageClassName spec is set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). | +| ingester.persistentVolumeClaimRetentionPolicy.enabled | bool | `false` | Enable Persistent volume retention policy for Statefulset | +| ingester.persistentVolumeClaimRetentionPolicy.whenDeleted | string | `"Retain"` | Volume retention behavior that applies when the StatefulSet is deleted | +| ingester.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | Volume retention behavior when the replica count of the StatefulSet is reduced | | 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 | diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index f7254deb89..f0c3eb0a45 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -179,6 +179,11 @@ spec: sizeLimit: {{ .Values.ingester.persistence.size }} {{- end }} {{- else }} + {{- if .Values.ingester.persistentVolumeClaimRetentionPolicy.enabled }} + persistentVolumeClaimRetentionPolicy: + whenDeleted: {{ .Values.ingester.persistentVolumeClaimRetentionPolicy.whenDeleted }} + whenScaled: {{ .Values.ingester.persistentVolumeClaimRetentionPolicy.whenScaled }} + {{- end }} volumeClaimTemplates: - apiVersion: v1 kind: PersistentVolumeClaim diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b887a35f3f..45088face4 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -207,6 +207,13 @@ ingester: storageClass: null # -- Annotations for ingester's persist volume claim annotations: {} + persistentVolumeClaimRetentionPolicy: + # -- Enable Persistent volume retention policy for Statefulset + enabled: false + # -- Volume retention behavior when the replica count of the StatefulSet is reduced + whenScaled: Retain + # -- Volume retention behavior that applies when the StatefulSet is deleted + whenDeleted: Retain config: # -- Number of copies of spans to store in the ingester ring replication_factor: 3 From 8b2e85d32b955260206d384e8419936318efa74e Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 10 Jul 2024 18:01:59 +0300 Subject: [PATCH 05/62] add option to deploy podmonitor and add option to remove svc Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 14 ++++++-- .../tempo-vulture/templates/podmonitor.yaml | 36 +++++++++++++++++++ charts/tempo-vulture/templates/service.yaml | 2 ++ charts/tempo-vulture/values.yaml | 23 ++++++++++-- 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 charts/tempo-vulture/templates/podmonitor.yaml diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index def08a3b5d..00a4e0453b 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -64,9 +64,17 @@ tempoAddress: | nodeSelector | object | `{}` | Node selector for vulture pods | | podAnnotations | object | `{}` | Common annotations for all pods | | podLabels | object | `{}` | Common labels for all pods | +| podMonitor.annotations | object | `{}` | PodMonitor annotations | +| podMonitor.enabled | bool | `false` | If enabled, PodMonitor resources for Prometheus Operator are created | +| podMonitor.interval | string | `nil` | PodMonitor scrape interval | +| podMonitor.labels | object | `{}` | Additional PodMonitor labels | +| podMonitor.namespace | string | `nil` | Alternative namespace for PodMonitor resources | +| podMonitor.namespaceSelector | object | `{}` | Namespace selector for PodMonitor resources | +| podMonitor.scrapeTimeout | string | `nil` | PodMonitor scrape timeout in Go duration format (e.g. 15s) | | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | +| service.enabled | bool | `true` | | | 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 | @@ -78,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | -| tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file +| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tolerations | list | `[]` | Tolerations for vulture pods | diff --git a/charts/tempo-vulture/templates/podmonitor.yaml b/charts/tempo-vulture/templates/podmonitor.yaml new file mode 100644 index 0000000000..96bca1c2c8 --- /dev/null +++ b/charts/tempo-vulture/templates/podmonitor.yaml @@ -0,0 +1,36 @@ +{{- with .Values.podMonitor}} +{{- if .enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PodMonitor +metadata: + name: {{ include "tempo-vulture.fullname" $ }} + {{- with .namespace }} + namespace: {{ . }} + {{- end }} + {{- with .annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + labels: + {{- include "tempo-vulture.labels" $ | nindent 4 }} + {{- with .labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .namespaceSelector }} + namespaceSelector: + {{- toYaml . | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }} + podMetricsEndpoints: + - port: prom-metrics + {{- with .interval }} + interval: {{ . }} + {{- end }} + {{- with .scrapeTimeout }} + scrapeTimeout: {{ . }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml index 706ca0b8be..e481f0a600 100644 --- a/charts/tempo-vulture/templates/service.yaml +++ b/charts/tempo-vulture/templates/service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.service.enabled }} apiVersion: v1 kind: Service metadata: @@ -17,3 +18,4 @@ spec: name: prom-metrics selector: {{- include "tempo-vulture.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index def34f9d1c..5fb0d63f52 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -46,6 +46,8 @@ nodeSelector: {} # -- Tolerations for vulture pods tolerations: [] +service: + enabled: true serviceAccount: # -- Specifies whether a ServiceAccount should be created @@ -75,8 +77,25 @@ serviceMonitor: # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) scrapeTimeout: null +# ServiceMonitor configuration +podMonitor: + # -- If enabled, PodMonitor resources for Prometheus Operator are created + enabled: false + # -- Alternative namespace for PodMonitor resources + namespace: null + # -- Namespace selector for PodMonitor resources + namespaceSelector: {} + # -- PodMonitor annotations + annotations: {} + # -- Additional PodMonitor labels + labels: {} + # -- PodMonitor scrape interval + interval: null + # -- PodMonitor scrape timeout in Go duration format (e.g. 15s) + scrapeTimeout: null + tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: + push: "loo" # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: + query: ";ll" From 740f78636f29b7cf3b52dd39175105bd56ce3fe2 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 20:43:58 +0300 Subject: [PATCH 06/62] fix values.yaml Signed-off-by: AvivGuiser --- charts/tempo-vulture/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 5fb0d63f52..0e0a26b0f0 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -96,6 +96,6 @@ podMonitor: tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: "loo" + push: "" # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: ";ll" + query: "" From eaa51fe669e333c98c4d28bfe94ca5a025bd84a6 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 20:46:07 +0300 Subject: [PATCH 07/62] fix docs Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 00a4e0453b..b0c5a825ee 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -86,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | From d649384b8d5df273c2d414b890180d7cca307eef Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 21:09:48 +0300 Subject: [PATCH 08/62] fix docs and values Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 6 +++--- charts/tempo-vulture/values.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index b0c5a825ee..fdb428f5b8 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -74,7 +74,7 @@ tempoAddress: | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | -| service.enabled | bool | `true` | | +| service.enabled | bool | `true` | Specifies whether a Service should be created | | 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 | @@ -86,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 0e0a26b0f0..4838d14198 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -46,7 +46,9 @@ nodeSelector: {} # -- Tolerations for vulture pods tolerations: [] + service: + # -- Specifies whether a Service should be created enabled: true serviceAccount: @@ -96,6 +98,6 @@ podMonitor: tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: "" + push: # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: "" + query: From 49749fd73787729f3e941eeaf5210ca95e628a36 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Sun, 14 Jul 2024 09:50:22 +0300 Subject: [PATCH 09/62] fix values.yaml Signed-off-by: AvivGuiser --- charts/tempo-vulture/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 4838d14198..3a38f4187d 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -79,7 +79,7 @@ serviceMonitor: # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) scrapeTimeout: null -# ServiceMonitor configuration +# PodMonitor configuration podMonitor: # -- If enabled, PodMonitor resources for Prometheus Operator are created enabled: false From e705438eb87484087b39b4e331432b7b2ee9071c Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 11 Nov 2024 19:37:55 +0200 Subject: [PATCH 10/62] bump chart version Signed-off-by: AvivGuiser --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index d17e98aa08..b63938015d 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.7.0 +version: 0.7.1 appVersion: 2.6.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index fdb428f5b8..484c0ba454 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) +![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. @@ -88,4 +88,4 @@ tempoAddress: | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | -| tolerations | list | `[]` | Tolerations for vulture pods | +| tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file From 5a38e72bbbf973e3bf150288b4bf277ae9d3837a Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Tue, 12 Nov 2024 10:58:03 -0600 Subject: [PATCH 11/62] Updated pod labels to include all labels Signed-off-by: Jimmy Bourque --- charts/grafana/templates/deployment.yaml | 2 +- charts/grafana/templates/statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/templates/deployment.yaml b/charts/grafana/templates/deployment.yaml index d309a7e5ff..7bf7521550 100644 --- a/charts/grafana/templates/deployment.yaml +++ b/charts/grafana/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: template: metadata: labels: - {{- include "grafana.selectorLabels" . | nindent 8 }} + {{- include "grafana.labels" . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/grafana/templates/statefulset.yaml b/charts/grafana/templates/statefulset.yaml index 7546c18876..896f8107f7 100644 --- a/charts/grafana/templates/statefulset.yaml +++ b/charts/grafana/templates/statefulset.yaml @@ -20,7 +20,7 @@ spec: template: metadata: labels: - {{- include "grafana.selectorLabels" . | nindent 8 }} + {{- include "grafana.labels" . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} From 8562a6c90334dbc2f4dae98425b3383a06a8913f Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Wed, 13 Nov 2024 06:22:00 -0600 Subject: [PATCH 12/62] bumped charted version Signed-off-by: Jimmy Bourque --- 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 2e3260979a..1acd70e631 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.0 +version: 8.6.1 appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From bd5511a86f1d48a431c1ad4a1cfffcc5314c890a Mon Sep 17 00:00:00 2001 From: Tobias Amft Date: Wed, 20 Nov 2024 09:05:20 +0100 Subject: [PATCH 13/62] Update Grafana version to 11.3.1 Signed-off-by: Tobias Amft --- 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 2e3260979a..38016558ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.6.0 -appVersion: 11.3.0 +version: 8.6.1 +appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 696626307136228d4631b30b134abbfe97469363 Mon Sep 17 00:00:00 2001 From: Heds Simons Date: Wed, 20 Nov 2024 14:45:22 -0800 Subject: [PATCH 14/62] [tempo-distributed] Updated GET enterprise image tag to latest 2.6.1. Signed-off-by: Heds Simons --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 4 ++-- charts/tempo-distributed/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 72e1e2b51e..33f58d970c 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.22.1 +version: 1.22.2 appVersion: 2.6.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 b77f4bb829..d500749d7b 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.22.1](https://img.shields.io/badge/Version-1.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.22.2](https://img.shields.io/badge/Version-1.22.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -360,7 +360,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string | | enterprise.enabled | bool | `false` | | | enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' | -| enterprise.image.tag | string | `"v2.4.0"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' | +| enterprise.image.tag | string | `"v2.6.1"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' | | enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string | | enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend | | enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 6aaa6cf350..aaed57b276 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -2042,7 +2042,7 @@ enterprise: # -- Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' repository: grafana/enterprise-traces # -- Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' - tag: v2.4.0 + tag: v2.6.1 # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here # In order to use Grafana Enterprise Traces features, you will need to provide the contents of your Grafana Enterprise Traces From 531e7ef4dbc599e73917376038e275cd05d0b605 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Fri, 22 Nov 2024 06:08:09 -0600 Subject: [PATCH 15/62] Resolving conflict --- 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 1acd70e631..38016558ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.0 +appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From cf5be132835539ac076f680d7e10099bd08978c1 Mon Sep 17 00:00:00 2001 From: Nick Pillitteri Date: Fri, 22 Nov 2024 16:31:38 -0500 Subject: [PATCH 16/62] [rollout-operator] Bump rollout-operator version to 0.20.0 Signed-off-by: Nick Pillitteri --- 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 b5e50b0854..a10b1fda30 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.19.1 -appVersion: v0.19.1 +version: 0.20.0 +appVersion: v0.20.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 037f16c221..ddf1d17235 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.19.1](https://img.shields.io/badge/Version-0.19.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.19.1](https://img.shields.io/badge/AppVersion-v0.19.1-informational?style=flat-square) +![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.20.0](https://img.shields.io/badge/AppVersion-v0.20.0-informational?style=flat-square) Grafana rollout-operator From 512f9a58ea72719de58c851f594b0a4faff6b057 Mon Sep 17 00:00:00 2001 From: Farid Mammadov Date: Thu, 21 Nov 2024 21:29:33 +0400 Subject: [PATCH 17/62] add query frontend metrics config to tempo distributed helm chart Signed-off-by: Farid Mammadov --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 10 ++++++++-- charts/tempo-distributed/values.yaml | 26 ++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 33f58d970c..74f2da80ba 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.22.2 +version: 1.22.3 appVersion: 2.6.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 d500749d7b..1b5212612c 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.22.2](https://img.shields.io/badge/Version-1.22.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.22.3](https://img.shields.io/badge/Version-1.22.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -752,7 +752,13 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage for the query-frontend | | queryFrontend.config.max_outstanding_per_tenant | int | `2000` | Maximum number of outstanding requests per tenant per frontend; requests beyond this error with HTTP 429. | | queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier | -| queryFrontend.config.metrics.max_duration | string | `"3h"` | | +| queryFrontend.config.metrics.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when querying the backend. | +| queryFrontend.config.metrics.duration_slo | string | `"0s"` | If set to a non-zero value, it's value will be used to decide if query is within SLO or not. Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. NOTE: `duration_slo` and `throughput_bytes_slo` both must be configured for it to work | +| queryFrontend.config.metrics.interval | string | `"5m"` | The target length of time for each job to handle when querying the backend. | +| queryFrontend.config.metrics.max_duration | string | `"3h"` | The maximum allowed time range for a metrics query. 0 disables this limit. | +| queryFrontend.config.metrics.query_backend_after | string | `"30m"` | query_backend_after controls where the query-frontend searches for traces. Time ranges older than query_backend_after will be searched in the backend/object storage only. Time ranges between query_backend_after and now will be queried from the metrics-generators. | +| queryFrontend.config.metrics.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when querying the backend. | +| queryFrontend.config.metrics.throughput_bytes_slo | int | `0` | If set to a non-zero value, it's value will be used to decide if query is within SLO or not. Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. | | 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 | `{"query_shards":50}` | Trace by ID lookup configuration | diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index aaed57b276..1ce5324bea 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -837,9 +837,26 @@ queryFrontend: # -- The number of shards to split a trace by id query into. query_shards: 50 metrics: - # The maximum allowed time range for a metrics query. + # -- The number of concurrent jobs to execute when querying the backend. + concurrent_jobs: 1000 + # -- The target number of bytes for each job to handle when querying the backend. + target_bytes_per_job: 104857600 + # -- The maximum allowed time range for a metrics query. # 0 disables this limit. max_duration: 3h + # -- query_backend_after controls where the query-frontend searches for traces. + # Time ranges older than query_backend_after will be searched in the backend/object storage only. + # Time ranges between query_backend_after and now will be queried from the metrics-generators. + query_backend_after: 30m + # -- The target length of time for each job to handle when querying the backend. + interval: 5m + # -- If set to a non-zero value, it's value will be used to decide if query is within SLO or not. + # Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. + # NOTE: `duration_slo` and `throughput_bytes_slo` both must be configured for it to work + duration_slo: 0s + # -- If set to a non-zero value, it's value will be used to decide if query is within SLO or not. + # Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. + throughput_bytes_slo: 0 autoscaling: # -- Enable autoscaling for the query-frontend enabled: false @@ -1359,8 +1376,13 @@ config: | trace_by_id: query_shards: {{ .Values.queryFrontend.config.trace_by_id.query_shards }} metrics: + concurrent_jobs: {{ .Values.queryFrontend.config.metrics.concurrent_jobs }} + target_bytes_per_job: {{ .Values.queryFrontend.config.metrics.target_bytes_per_job }} max_duration: {{ .Values.queryFrontend.config.metrics.max_duration }} - + query_backend_after: {{ .Values.queryFrontend.config.metrics.query_backend_after }} + interval: {{ .Values.queryFrontend.config.metrics.interval }} + duration_slo: {{ .Values.queryFrontend.config.metrics.duration_slo }} + throughput_bytes_slo: {{ .Values.queryFrontend.config.metrics.throughput_bytes_slo }} ingester: lifecycler: ring: From a05f038d298aef08d5d6e524a9cb233a4f2e39e6 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Sat, 23 Nov 2024 07:46:34 -0600 Subject: [PATCH 18/62] Revert "Resolving conflict" This reverts commit 531e7ef4dbc599e73917376038e275cd05d0b605. --- 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 38016558ea..1acd70e631 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.1 +appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From d8c69fc8de9964eb86f1aa8e5ccce4b35a2b5608 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Sat, 23 Nov 2024 07:48:20 -0600 Subject: [PATCH 19/62] Resolving conflict Signed-off-by: Jimmy Bourque --- 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 1acd70e631..38016558ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.0 +appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 5627d2307ea2b4659e2e254afdfbc7c309619da3 Mon Sep 17 00:00:00 2001 From: Michael Ruigrok Date: Mon, 25 Nov 2024 18:33:52 +1000 Subject: [PATCH 20/62] values.yaml: update alerting examples and ref add missing configuration sections from grafana alerting block Signed-off-by: Michael Ruigrok --- charts/grafana/values.yaml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 6467c4cc61..21ff94d3b7 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -673,9 +673,15 @@ datasources: {} # - name: Prometheus ## Configure grafana alerting (can be templated) -## ref: http://docs.grafana.org/administration/provisioning/#alerting +## ref: https://docs.grafana.com/alerting/set-up/provision-alerting-resources/file-provisioning/ ## alerting: {} + # policies.yaml: + # apiVersion: 1 + # policies: + # - orgId: 1 + # receiver: first_uid + # # rules.yaml: # apiVersion: 1 # groups: @@ -720,6 +726,7 @@ alerting: {} # some_key: some_value # labels: # team: sre_team_1 + # # contactpoints.yaml: # secret: # apiVersion: 1 @@ -737,6 +744,26 @@ alerting: {} # group: app-stack # summary: | # {{ `{{ include "default.message" . }}` }} + # + # templates.yaml: + # apiVersion: 1 + # templates: + # - orgId: 1 + # name: my_first_template + # template: | + # {{ ` + # {{ define "my_first_template" }} + # Custom notification message + # {{ end }} + # ` }} + # + # mutetimes.yaml + # apiVersion: 1 + # muteTimes: + # - orgId: 1 + # name: mti_1 + # # refer to https://prometheus.io/docs/alerting/latest/configuration/#time_interval-0 + # time_intervals: {} ## Configure notifiers ## ref: http://docs.grafana.org/administration/provisioning/#alert-notification-channels From 2801dcef0bb6080f2ae9d67dde32ec456b900e85 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 26 Nov 2024 15:10:15 +0800 Subject: [PATCH 21/62] Update Chart.yaml Signed-off-by: MH 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 38016558ea..09ee77aa31 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.1 +version: 8.6.2 appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 2677d397b6e232ee7d0348ae0b25ca32c1dda263 Mon Sep 17 00:00:00 2001 From: Cees Bos Date: Tue, 26 Nov 2024 15:04:20 +0100 Subject: [PATCH 22/62] Add configuration options for the number of retries done by the sidecar. During startup phase some more time might be needed to complete the actions. Signed-off-by: Cees Bos --- charts/grafana/templates/_pod.tpl | 60 +++++++++++++++++++++ charts/grafana/values.yaml | 86 +++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+) diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl index 24ee005276..bf55e43ba7 100644 --- a/charts/grafana/templates/_pod.tpl +++ b/charts/grafana/templates/_pod.tpl @@ -402,6 +402,18 @@ containers: - name: WATCH_CLIENT_TIMEOUT value: "{{ .Values.sidecar.alerts.watchClientTimeout }}" {{- end }} + {{- if .Values.sidecar.alerts.maxTotalRetries }} + - name: REQ_RETRY_TOTAL + value: "{{ .Values.sidecar.alerts.maxTotalRetries }}" + {{- end }} + {{- if .Values.sidecar.alerts.maxConnectRetries }} + - name: REQ_RETRY_CONNECT + value: "{{ .Values.sidecar.alerts.maxConnectRetries }}" + {{- end }} + {{- if .Values.sidecar.alerts.maxReadRetries }} + - name: REQ_RETRY_READ + value: "{{ .Values.sidecar.alerts.maxReadRetries }}" + {{- end }} {{- with .Values.sidecar.livenessProbe }} livenessProbe: {{- toYaml . | nindent 6 }} @@ -518,6 +530,18 @@ containers: - name: WATCH_CLIENT_TIMEOUT value: {{ .Values.sidecar.dashboards.watchClientTimeout | quote }} {{- end }} + {{- if .Values.sidecar.dashboards.maxTotalRetries }} + - name: REQ_RETRY_TOTAL + value: "{{ .Values.sidecar.dashboards.maxTotalRetries }}" + {{- end }} + {{- if .Values.sidecar.dashboards.maxConnectRetries }} + - name: REQ_RETRY_CONNECT + value: "{{ .Values.sidecar.dashboards.maxConnectRetries }}" + {{- end }} + {{- if .Values.sidecar.dashboards.maxReadRetries }} + - name: REQ_RETRY_READ + value: "{{ .Values.sidecar.dashboards.maxReadRetries }}" + {{- end }} {{- with .Values.sidecar.livenessProbe }} livenessProbe: {{- toYaml . | nindent 6 }} @@ -630,6 +654,18 @@ containers: - name: WATCH_CLIENT_TIMEOUT value: "{{ .Values.sidecar.datasources.watchClientTimeout }}" {{- end }} + {{- if .Values.sidecar.datasources.maxTotalRetries }} + - name: REQ_RETRY_TOTAL + value: "{{ .Values.sidecar.datasources.maxTotalRetries }}" + {{- end }} + {{- if .Values.sidecar.datasources.maxConnectRetries }} + - name: REQ_RETRY_CONNECT + value: "{{ .Values.sidecar.datasources.maxConnectRetries }}" + {{- end }} + {{- if .Values.sidecar.datasources.maxReadRetries }} + - name: REQ_RETRY_READ + value: "{{ .Values.sidecar.datasources.maxReadRetries }}" + {{- end }} {{- with .Values.sidecar.livenessProbe }} livenessProbe: {{- toYaml . | nindent 6 }} @@ -737,6 +773,18 @@ containers: - name: WATCH_CLIENT_TIMEOUT value: "{{ .Values.sidecar.notifiers.watchClientTimeout }}" {{- end }} + {{- if .Values.sidecar.notifiers.maxTotalRetries }} + - name: REQ_RETRY_TOTAL + value: "{{ .Values.sidecar.notifiers.maxTotalRetries }}" + {{- end }} + {{- if .Values.sidecar.notifiers.maxConnectRetries }} + - name: REQ_RETRY_CONNECT + value: "{{ .Values.sidecar.notifiers.maxConnectRetries }}" + {{- end }} + {{- if .Values.sidecar.notifiers.maxReadRetries }} + - name: REQ_RETRY_READ + value: "{{ .Values.sidecar.notifiers.maxReadRetries }}" + {{- end }} {{- with .Values.sidecar.livenessProbe }} livenessProbe: {{- toYaml . | nindent 6 }} @@ -844,6 +892,18 @@ containers: - name: WATCH_CLIENT_TIMEOUT value: "{{ .Values.sidecar.plugins.watchClientTimeout }}" {{- end }} + {{- if .Values.sidecar.plugins.maxTotalRetries }} + - name: REQ_RETRY_TOTAL + value: "{{ .Values.sidecar.plugins.maxTotalRetries }}" + {{- end }} + {{- if .Values.sidecar.plugins.maxConnectRetries }} + - name: REQ_RETRY_CONNECT + value: "{{ .Values.sidecar.plugins.maxConnectRetries }}" + {{- end }} + {{- if .Values.sidecar.plugins.maxReadRetries }} + - name: REQ_RETRY_READ + value: "{{ .Values.sidecar.plugins.maxReadRetries }}" + {{- end }} {{- with .Values.sidecar.livenessProbe }} livenessProbe: {{- toYaml . | nindent 6 }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 6467c4cc61..c996dccc54 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -955,6 +955,23 @@ sidecar: # defaults to 66sec (sic!) # watchClientTimeout: 60 # + # maxTotalRetries: Total number of retries to allow for any http request. + # Takes precedence over other counts. Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry. + # maxTotalRetries: 5 + # + # maxConnectRetries: How many connection-related errors to retry on for any http request. + # These are errors raised before the request is sent to the remote server, which we assume has not triggered the server to process the request. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxConnectRetries: 10 + # + # maxReadRetries: How many times to retry on read errors for any http request + # These errors are raised after the request was sent to the server, so the request may have side-effects. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxReadRetries: 5 + # # Endpoint to send request to reload alerts reloadURL: "http://localhost:3000/api/admin/provisioning/alerting/reload" # Absolute path to shell script to execute after a alert got reloaded @@ -1008,6 +1025,24 @@ sidecar: # If specified, the sidecar will look for annotation with this name to create folder and put graph here. # You can use this parameter together with `provider.foldersFromFilesStructure`to annotate configmaps and create folder structure. folderAnnotation: null + # + # maxTotalRetries: Total number of retries to allow for any http request. + # Takes precedence over other counts. Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry. + # maxTotalRetries: 5 + # + # maxConnectRetries: How many connection-related errors to retry on for any http request. + # These are errors raised before the request is sent to the remote server, which we assume has not triggered the server to process the request. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxConnectRetries: 10 + # + # maxReadRetries: How many times to retry on read errors for any http request + # These errors are raised after the request was sent to the server, so the request may have side-effects. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxReadRetries: 5 + # # Endpoint to send request to reload alerts reloadURL: "http://localhost:3000/api/admin/provisioning/dashboards/reload" # Absolute path to shell script to execute after a configmap got reloaded @@ -1088,6 +1123,23 @@ sidecar: # defaults to 66sec (sic!) # watchClientTimeout: 60 # + # maxTotalRetries: Total number of retries to allow for any http request. + # Takes precedence over other counts. Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry. + # maxTotalRetries: 5 + # + # maxConnectRetries: How many connection-related errors to retry on for any http request. + # These are errors raised before the request is sent to the remote server, which we assume has not triggered the server to process the request. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxConnectRetries: 10 + # + # maxReadRetries: How many times to retry on read errors for any http request + # These errors are raised after the request was sent to the server, so the request may have side-effects. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxReadRetries: 5 + # # Endpoint to send request to reload datasources reloadURL: "http://localhost:3000/api/admin/provisioning/datasources/reload" # Absolute path to shell script to execute after a datasource got reloaded @@ -1130,6 +1182,23 @@ sidecar: # defaults to 66sec (sic!) # watchClientTimeout: 60 # + # maxTotalRetries: Total number of retries to allow for any http request. + # Takes precedence over other counts. Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry. + # maxTotalRetries: 5 + # + # maxConnectRetries: How many connection-related errors to retry on for any http request. + # These are errors raised before the request is sent to the remote server, which we assume has not triggered the server to process the request. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxConnectRetries: 10 + # + # maxReadRetries: How many times to retry on read errors for any http request + # These errors are raised after the request was sent to the server, so the request may have side-effects. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxReadRetries: 5 + # # Endpoint to send request to reload plugins reloadURL: "http://localhost:3000/api/admin/provisioning/plugins/reload" # Absolute path to shell script to execute after a plugin got reloaded @@ -1172,6 +1241,23 @@ sidecar: # defaults to 66sec (sic!) # watchClientTimeout: 60 # + # maxTotalRetries: Total number of retries to allow for any http request. + # Takes precedence over other counts. Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry. + # maxTotalRetries: 5 + # + # maxConnectRetries: How many connection-related errors to retry on for any http request. + # These are errors raised before the request is sent to the remote server, which we assume has not triggered the server to process the request. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxConnectRetries: 10 + # + # maxReadRetries: How many times to retry on read errors for any http request + # These errors are raised after the request was sent to the server, so the request may have side-effects. + # Applies to all requests to reloadURL and k8s api requests. + # Set to 0 to fail on the first retry of this type. + # maxReadRetries: 5 + # # Endpoint to send request to reload notifiers reloadURL: "http://localhost:3000/api/admin/provisioning/notifications/reload" # Absolute path to shell script to execute after a notifier got reloaded From cb757f2006bfeb4a035a1cae536739e7156b3585 Mon Sep 17 00:00:00 2001 From: MH Date: Wed, 27 Nov 2024 09:24:49 +0800 Subject: [PATCH 23/62] Update Chart.yaml Signed-off-by: MH 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 09ee77aa31..10b5e02074 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.2 +version: 8.6.3 appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 3b83381dfd67d3ea5ce4739f8b5064aef999898d Mon Sep 17 00:00:00 2001 From: Cees Bos Date: Wed, 27 Nov 2024 08:29:09 +0100 Subject: [PATCH 24/62] Update Chart.yaml, bump version to 8.6.4 Signed-off-by: Cees Bos --- 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 10b5e02074..f8ff539e08 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.3 +version: 8.6.4 appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 5e9d55a99ecfb74aeee0efd955a16d350a509093 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 27 Nov 2024 19:06:03 +0530 Subject: [PATCH 25/62] Update Chart.yaml Signed-off-by: Sheikh-Abubaker --- 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 74f2da80ba..9f429ef908 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.22.3 +version: 1.23.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 4396c579acc008e4810abfdae20b43f3f2ebefb4 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 27 Nov 2024 19:06:58 +0530 Subject: [PATCH 26/62] 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 1b5212612c..2ea6e9973c 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.22.3](https://img.shields.io/badge/Version-1.22.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.23.0](https://img.shields.io/badge/Version-1.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 0b5b5a99fe8aa6cd15ada6a9afb6a1f530e90021 Mon Sep 17 00:00:00 2001 From: Kevin Simons Date: Mon, 25 Nov 2024 13:13:00 -0600 Subject: [PATCH 27/62] Remove duplicated ingester podLabels Signed-off-by: Kevin Simons --- .../templates/ingester/statefulset-ingester.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index f7254deb89..347eadf2fc 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -42,9 +42,6 @@ spec: {{- with .Values.tempo.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.ingester.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.tempo.podAnnotations }} From 22b4f0216a913c89fe21129ac0f8f5a1d34f3e58 Mon Sep 17 00:00:00 2001 From: Kevin Simons Date: Mon, 25 Nov 2024 13:17:58 -0600 Subject: [PATCH 28/62] [tempo-distributed] version bump chart Signed-off-by: Kevin Simons --- 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 9f429ef908..0243393e28 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.23.0 +version: 1.23.1 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 1c6c035930cf7e456300c1c3e2704832186f208f Mon Sep 17 00:00:00 2001 From: Kevin Simons Date: Wed, 27 Nov 2024 14:12:16 -0600 Subject: [PATCH 29/62] Run helm-docs Signed-off-by: Kevin Simons --- 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 2ea6e9973c..ef5fb9f82b 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.23.0](https://img.shields.io/badge/Version-1.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 0ce8eff027c9a7ff88dd3e030e9bb6679ac4623d Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Fri, 29 Nov 2024 15:32:07 +1100 Subject: [PATCH 30/62] Update rollout-operator chart with latest version Signed-off-by: Charles Korn --- 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 a10b1fda30..cca369dbff 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.20.0 -appVersion: v0.20.0 +version: 0.21.0 +appVersion: v0.21.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 ddf1d17235..372e793841 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.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.20.0](https://img.shields.io/badge/AppVersion-v0.20.0-informational?style=flat-square) +![Version: 0.21.0](https://img.shields.io/badge/Version-0.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.21.0](https://img.shields.io/badge/AppVersion-v0.21.0-informational?style=flat-square) Grafana rollout-operator From f2ef7bb52c7fc8abe1675af07e9a55d3c72ac410 Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:17:01 +0100 Subject: [PATCH 31/62] fix multiline template for ingester.zoneAwareReplicationMap helper Signed-off-by: javiermolinar --- .../templates/ingester/_helpers-ingester.tpl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 4d417ada2c..f7018f507c 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -13,12 +13,10 @@ {{- $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 -) -}} +{{- $extraAffinity := $rolloutZone.extraAffinity | default (dict) -}} +{{- $zoneAntiAffinity := include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml -}} +{{- $mergedAffinity := mergeOverwrite $extraAffinity $zoneAntiAffinity -}} +{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "replicas" $replicaPerZone "storageClass" $rolloutZone.storageClass) -}} {{- end -}} {{- else -}} {{- $_ := set $zonesMap "" $defaultZone -}} From 8e1c4ce63a404a3997cd3168c6eee4b70cb0f24e Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:25:59 +0100 Subject: [PATCH 32/62] bump version Signed-off-by: javiermolinar --- 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 72e1e2b51e..af2a1860b6 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.22.1 +version: 1.23.2 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From df7f21053e1e9b51ea56fc38180aa1bd7adaa912 Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:31:28 +0100 Subject: [PATCH 33/62] docs Signed-off-by: javiermolinar --- 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 ef5fb9f82b..9e88500824 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 0855e267a2d74386ff511dd83e4a48bb11768435 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Tue, 3 Dec 2024 17:45:02 +0530 Subject: [PATCH 34/62] Update Chart.yaml Signed-off-by: Sheikh-Abubaker --- 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 af2a1860b6..47af96cb38 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.23.2 +version: 1.24.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From a98880ebef67a387c5249f3a15d99aa2ca41645d Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Tue, 3 Dec 2024 17:46:33 +0530 Subject: [PATCH 35/62] 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 bbba8a0e6c..f4555c04df 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.24.0](https://img.shields.io/badge/Version-1.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From c95bb23bc9725e0db8b0398e2ff1f5d34ab1ccf0 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 3 Dec 2024 15:14:40 +0200 Subject: [PATCH 36/62] remove service Signed-off-by: AvivGuiser --- charts/tempo-vulture/templates/service.yaml | 21 ----------- .../templates/servicemonitor.yaml | 36 ------------------- charts/tempo-vulture/values.yaml | 21 ----------- 3 files changed, 78 deletions(-) delete mode 100644 charts/tempo-vulture/templates/service.yaml delete mode 100644 charts/tempo-vulture/templates/servicemonitor.yaml diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml deleted file mode 100644 index e481f0a600..0000000000 --- a/charts/tempo-vulture/templates/service.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.service.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "tempo-vulture.fullname" . }} - labels: - {{- include "tempo-vulture.labels" . | nindent 4 }} - {{- with .Values.annotations }} - annotations: - {{- toYaml . | indent 4 }} - {{- end }} -spec: - type: ClusterIP - ports: - - port: 8080 - targetPort: prom-metrics - protocol: TCP - name: prom-metrics - selector: - {{- include "tempo-vulture.selectorLabels" . | nindent 4 }} -{{- end }} diff --git a/charts/tempo-vulture/templates/servicemonitor.yaml b/charts/tempo-vulture/templates/servicemonitor.yaml deleted file mode 100644 index 2a4dfe20e7..0000000000 --- a/charts/tempo-vulture/templates/servicemonitor.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- with .Values.serviceMonitor }} -{{- if .enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "tempo-vulture.fullname" $ }} - {{- with .namespace }} - namespace: {{ . }} - {{- end }} - {{- with .annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} - labels: - {{- include "tempo-vulture.labels" $ | nindent 4 }} - {{- with .labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- with .namespaceSelector }} - namespaceSelector: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }} - endpoints: - - port: prom-metrics - {{- with .interval }} - interval: {{ . }} - {{- end }} - {{- with .scrapeTimeout }} - scrapeTimeout: {{ . }} - {{- end }} -{{- end }} -{{- end }} diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 3a38f4187d..cf9904ad9b 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -47,10 +47,6 @@ nodeSelector: {} tolerations: [] -service: - # -- Specifies whether a Service should be created - enabled: true - serviceAccount: # -- Specifies whether a ServiceAccount should be created create: true @@ -62,23 +58,6 @@ serviceAccount: # -- Annotations for the service account annotations: {} -# ServiceMonitor configuration -serviceMonitor: - # -- If enabled, ServiceMonitor resources for Prometheus Operator are created - enabled: false - # -- Alternative namespace for ServiceMonitor resources - namespace: null - # -- Namespace selector for ServiceMonitor resources - namespaceSelector: {} - # -- ServiceMonitor annotations - annotations: {} - # -- Additional ServiceMonitor labels - labels: {} - # -- ServiceMonitor scrape interval - interval: null - # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) - scrapeTimeout: null - # PodMonitor configuration podMonitor: # -- If enabled, PodMonitor resources for Prometheus Operator are created From d37364f2c204c133ab4bf06876b32dcb3bd55955 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 3 Dec 2024 15:17:00 +0200 Subject: [PATCH 37/62] update readme Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 484c0ba454..d685f1eff4 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -74,18 +74,10 @@ tempoAddress: | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | -| service.enabled | bool | `true` | Specifies whether a Service should be created | | 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 | | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | -| serviceMonitor.annotations | object | `{}` | ServiceMonitor annotations | -| serviceMonitor.enabled | bool | `false` | If enabled, ServiceMonitor resources for Prometheus Operator are created | -| serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | -| serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | -| serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | -| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file From 93796ad725b4856433cbb98187936f2d3a10af40 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Mon, 9 Dec 2024 15:46:47 -0500 Subject: [PATCH 38/62] Bump rollout operator to 0.21.0 Signed-off-by: Ilia Lazebnik --- charts/tempo-distributed/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 47af96cb38..89cca23584 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.24.0 +version: 1.25.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ @@ -36,5 +36,5 @@ dependencies: - name: rollout-operator alias: rollout_operator repository: https://grafana.github.io/helm-charts - version: 0.16.0 + version: 0.21.0 condition: rollout_operator.enabled From eb10c1892559e13d5398f4708e8105694cbd3cc7 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Mon, 9 Dec 2024 18:25:39 -0500 Subject: [PATCH 39/62] bump grafana-agent-operator to 0.50 Signed-off-by: drfaust92 --- charts/tempo-distributed/Chart.lock | 8 ++++---- charts/tempo-distributed/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/Chart.lock b/charts/tempo-distributed/Chart.lock index eedf785c9e..9176493196 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.4.0 + version: 0.5.0 - name: rollout-operator repository: https://grafana.github.io/helm-charts - version: 0.16.0 -digest: sha256:504a9bfa69a6d4130c496ed3382add7679b8aed30c1320a418831bdbea4e0ace -generated: "2024-07-02T12:00:59.197303-04:00" + version: 0.21.0 +digest: sha256:fbbce04b39c84d31817f237c52b040f03f757e46076f151e30c207a6f2d31fcd +generated: "2024-12-09T18:25:13.738948-05:00" diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 89cca23584..d96cec9234 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -30,7 +30,7 @@ dependencies: condition: minio.enabled - name: grafana-agent-operator alias: grafana-agent-operator - version: 0.4.0 + version: 0.5.0 repository: https://grafana.github.io/helm-charts condition: metaMonitoring.grafanaAgent.installOperator - name: rollout-operator From be86486abe9e4108d5796532ca67fbef1f3d4902 Mon Sep 17 00:00:00 2001 From: Costis Date: Sat, 7 Dec 2024 21:24:33 +0200 Subject: [PATCH 40/62] README.md update Signed-off-by: Costis --- charts/tempo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 717cf70c24..a8f2596d98 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -158,4 +158,4 @@ and [1.5 -> 2.0 upgrade guide](https://grafana.com/docs/tempo/latest/setup/upgra 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 -old folder to the new. +old folder to the new. \ No newline at end of file From 369ef0108cccf3b2886e708f2794dd6b6b7ec449 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 10 Jul 2024 18:01:59 +0300 Subject: [PATCH 41/62] add option to deploy podmonitor and add option to remove svc Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 14 ++++++-- .../tempo-vulture/templates/podmonitor.yaml | 36 +++++++++++++++++++ charts/tempo-vulture/templates/service.yaml | 2 ++ charts/tempo-vulture/values.yaml | 23 ++++++++++-- 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 charts/tempo-vulture/templates/podmonitor.yaml diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index def08a3b5d..00a4e0453b 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -64,9 +64,17 @@ tempoAddress: | nodeSelector | object | `{}` | Node selector for vulture pods | | podAnnotations | object | `{}` | Common annotations for all pods | | podLabels | object | `{}` | Common labels for all pods | +| podMonitor.annotations | object | `{}` | PodMonitor annotations | +| podMonitor.enabled | bool | `false` | If enabled, PodMonitor resources for Prometheus Operator are created | +| podMonitor.interval | string | `nil` | PodMonitor scrape interval | +| podMonitor.labels | object | `{}` | Additional PodMonitor labels | +| podMonitor.namespace | string | `nil` | Alternative namespace for PodMonitor resources | +| podMonitor.namespaceSelector | object | `{}` | Namespace selector for PodMonitor resources | +| podMonitor.scrapeTimeout | string | `nil` | PodMonitor scrape timeout in Go duration format (e.g. 15s) | | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | +| service.enabled | bool | `true` | | | 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 | @@ -78,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | -| tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file +| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tolerations | list | `[]` | Tolerations for vulture pods | diff --git a/charts/tempo-vulture/templates/podmonitor.yaml b/charts/tempo-vulture/templates/podmonitor.yaml new file mode 100644 index 0000000000..96bca1c2c8 --- /dev/null +++ b/charts/tempo-vulture/templates/podmonitor.yaml @@ -0,0 +1,36 @@ +{{- with .Values.podMonitor}} +{{- if .enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PodMonitor +metadata: + name: {{ include "tempo-vulture.fullname" $ }} + {{- with .namespace }} + namespace: {{ . }} + {{- end }} + {{- with .annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + labels: + {{- include "tempo-vulture.labels" $ | nindent 4 }} + {{- with .labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .namespaceSelector }} + namespaceSelector: + {{- toYaml . | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }} + podMetricsEndpoints: + - port: prom-metrics + {{- with .interval }} + interval: {{ . }} + {{- end }} + {{- with .scrapeTimeout }} + scrapeTimeout: {{ . }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml index 706ca0b8be..e481f0a600 100644 --- a/charts/tempo-vulture/templates/service.yaml +++ b/charts/tempo-vulture/templates/service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.service.enabled }} apiVersion: v1 kind: Service metadata: @@ -17,3 +18,4 @@ spec: name: prom-metrics selector: {{- include "tempo-vulture.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index def34f9d1c..5fb0d63f52 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -46,6 +46,8 @@ nodeSelector: {} # -- Tolerations for vulture pods tolerations: [] +service: + enabled: true serviceAccount: # -- Specifies whether a ServiceAccount should be created @@ -75,8 +77,25 @@ serviceMonitor: # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) scrapeTimeout: null +# ServiceMonitor configuration +podMonitor: + # -- If enabled, PodMonitor resources for Prometheus Operator are created + enabled: false + # -- Alternative namespace for PodMonitor resources + namespace: null + # -- Namespace selector for PodMonitor resources + namespaceSelector: {} + # -- PodMonitor annotations + annotations: {} + # -- Additional PodMonitor labels + labels: {} + # -- PodMonitor scrape interval + interval: null + # -- PodMonitor scrape timeout in Go duration format (e.g. 15s) + scrapeTimeout: null + tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: + push: "loo" # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: + query: ";ll" From 5e7ed2ea61c966ff7df690d4bc91a86790345172 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 20:43:58 +0300 Subject: [PATCH 42/62] fix values.yaml Signed-off-by: AvivGuiser --- charts/tempo-vulture/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 5fb0d63f52..0e0a26b0f0 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -96,6 +96,6 @@ podMonitor: tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: "loo" + push: "" # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: ";ll" + query: "" From 0572e217cf29dcc4e4bf0e17854983521dffa024 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 20:46:07 +0300 Subject: [PATCH 43/62] fix docs Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 00a4e0453b..b0c5a825ee 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -86,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `"loo"` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `";ll"` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | From ba3dd271fb429092b32c0e8e406c4d1b9d464385 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 11 Jul 2024 21:09:48 +0300 Subject: [PATCH 44/62] fix docs and values Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 6 +++--- charts/tempo-vulture/values.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index b0c5a825ee..fdb428f5b8 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -74,7 +74,7 @@ tempoAddress: | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | -| service.enabled | bool | `true` | | +| service.enabled | bool | `true` | Specifies whether a Service should be created | | 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 | @@ -86,6 +86,6 @@ tempoAddress: | serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | | serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | -| tempoAddress.push | string | `""` | the url towards your Tempo distributor, e.g. http://distributor | -| tempoAddress.query | string | `""` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | +| tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | +| tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 0e0a26b0f0..4838d14198 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -46,7 +46,9 @@ nodeSelector: {} # -- Tolerations for vulture pods tolerations: [] + service: + # -- Specifies whether a Service should be created enabled: true serviceAccount: @@ -96,6 +98,6 @@ podMonitor: tempoAddress: # -- the url towards your Tempo distributor, e.g. http://distributor - push: "" + push: # -- the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 - query: "" + query: From efd62534c876350a6cc62626bcdb77da175300d4 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Sun, 14 Jul 2024 09:50:22 +0300 Subject: [PATCH 45/62] fix values.yaml Signed-off-by: AvivGuiser --- charts/tempo-vulture/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 4838d14198..3a38f4187d 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -79,7 +79,7 @@ serviceMonitor: # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) scrapeTimeout: null -# ServiceMonitor configuration +# PodMonitor configuration podMonitor: # -- If enabled, PodMonitor resources for Prometheus Operator are created enabled: false From 09b6f3344bf2a3efaa16e2e7143b8285a1759ffe Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Mon, 11 Nov 2024 19:37:55 +0200 Subject: [PATCH 46/62] bump chart version Signed-off-by: AvivGuiser --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index d17e98aa08..b63938015d 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.7.0 +version: 0.7.1 appVersion: 2.6.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index fdb428f5b8..484c0ba454 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) +![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. @@ -88,4 +88,4 @@ tempoAddress: | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | -| tolerations | list | `[]` | Tolerations for vulture pods | +| tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file From bc26a753da1ca943d6803dbccf3610178b5e3aaa Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 3 Dec 2024 15:14:40 +0200 Subject: [PATCH 47/62] remove service Signed-off-by: AvivGuiser --- charts/tempo-vulture/templates/service.yaml | 21 ----------- .../templates/servicemonitor.yaml | 36 ------------------- charts/tempo-vulture/values.yaml | 21 ----------- 3 files changed, 78 deletions(-) delete mode 100644 charts/tempo-vulture/templates/service.yaml delete mode 100644 charts/tempo-vulture/templates/servicemonitor.yaml diff --git a/charts/tempo-vulture/templates/service.yaml b/charts/tempo-vulture/templates/service.yaml deleted file mode 100644 index e481f0a600..0000000000 --- a/charts/tempo-vulture/templates/service.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.service.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "tempo-vulture.fullname" . }} - labels: - {{- include "tempo-vulture.labels" . | nindent 4 }} - {{- with .Values.annotations }} - annotations: - {{- toYaml . | indent 4 }} - {{- end }} -spec: - type: ClusterIP - ports: - - port: 8080 - targetPort: prom-metrics - protocol: TCP - name: prom-metrics - selector: - {{- include "tempo-vulture.selectorLabels" . | nindent 4 }} -{{- end }} diff --git a/charts/tempo-vulture/templates/servicemonitor.yaml b/charts/tempo-vulture/templates/servicemonitor.yaml deleted file mode 100644 index 2a4dfe20e7..0000000000 --- a/charts/tempo-vulture/templates/servicemonitor.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- with .Values.serviceMonitor }} -{{- if .enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "tempo-vulture.fullname" $ }} - {{- with .namespace }} - namespace: {{ . }} - {{- end }} - {{- with .annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} - labels: - {{- include "tempo-vulture.labels" $ | nindent 4 }} - {{- with .labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- with .namespaceSelector }} - namespaceSelector: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "tempo-vulture.selectorLabels" $ | nindent 6 }} - endpoints: - - port: prom-metrics - {{- with .interval }} - interval: {{ . }} - {{- end }} - {{- with .scrapeTimeout }} - scrapeTimeout: {{ . }} - {{- end }} -{{- end }} -{{- end }} diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index 3a38f4187d..cf9904ad9b 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -47,10 +47,6 @@ nodeSelector: {} tolerations: [] -service: - # -- Specifies whether a Service should be created - enabled: true - serviceAccount: # -- Specifies whether a ServiceAccount should be created create: true @@ -62,23 +58,6 @@ serviceAccount: # -- Annotations for the service account annotations: {} -# ServiceMonitor configuration -serviceMonitor: - # -- If enabled, ServiceMonitor resources for Prometheus Operator are created - enabled: false - # -- Alternative namespace for ServiceMonitor resources - namespace: null - # -- Namespace selector for ServiceMonitor resources - namespaceSelector: {} - # -- ServiceMonitor annotations - annotations: {} - # -- Additional ServiceMonitor labels - labels: {} - # -- ServiceMonitor scrape interval - interval: null - # -- ServiceMonitor scrape timeout in Go duration format (e.g. 15s) - scrapeTimeout: null - # PodMonitor configuration podMonitor: # -- If enabled, PodMonitor resources for Prometheus Operator are created From 169b6cc73e93015684a0356312965d5e876a5dde Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Tue, 3 Dec 2024 15:17:00 +0200 Subject: [PATCH 48/62] update readme Signed-off-by: AvivGuiser --- charts/tempo-vulture/README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 484c0ba454..d685f1eff4 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -74,18 +74,10 @@ tempoAddress: | replicas | int | `1` | Number of replicas of Tempo Vulture | | resources | object | `{}` | Resource requests and limits for the vulture | | revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | -| service.enabled | bool | `true` | Specifies whether a Service should be created | | 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 | | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | -| serviceMonitor.annotations | object | `{}` | ServiceMonitor annotations | -| serviceMonitor.enabled | bool | `false` | If enabled, ServiceMonitor resources for Prometheus Operator are created | -| serviceMonitor.interval | string | `nil` | ServiceMonitor scrape interval | -| serviceMonitor.labels | object | `{}` | Additional ServiceMonitor labels | -| serviceMonitor.namespace | string | `nil` | Alternative namespace for ServiceMonitor resources | -| serviceMonitor.namespaceSelector | object | `{}` | Namespace selector for ServiceMonitor resources | -| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout in Go duration format (e.g. 15s) | | tempoAddress.push | string | `nil` | the url towards your Tempo distributor, e.g. http://distributor | | tempoAddress.query | string | `nil` | the url towards your Tempo query-frontend, e.g. http://query-frontend:3100 | | tolerations | list | `[]` | Tolerations for vulture pods | \ No newline at end of file From c64470b2c01ee5876f31fd1efc7653f7c13342f9 Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:17:01 +0100 Subject: [PATCH 49/62] fix multiline template for ingester.zoneAwareReplicationMap helper Signed-off-by: javiermolinar --- .../templates/ingester/_helpers-ingester.tpl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index 4d417ada2c..f7018f507c 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -13,12 +13,10 @@ {{- $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 -) -}} +{{- $extraAffinity := $rolloutZone.extraAffinity | default (dict) -}} +{{- $zoneAntiAffinity := include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml -}} +{{- $mergedAffinity := mergeOverwrite $extraAffinity $zoneAntiAffinity -}} +{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "replicas" $replicaPerZone "storageClass" $rolloutZone.storageClass) -}} {{- end -}} {{- else -}} {{- $_ := set $zonesMap "" $defaultZone -}} From d469c5d33dd15ecc41feda0204e7687e752a2ed3 Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:25:59 +0100 Subject: [PATCH 50/62] bump version Signed-off-by: javiermolinar --- 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 0243393e28..af2a1860b6 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.23.1 +version: 1.23.2 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 147f2f96b5bd0c856160c0496856c1827dc61467 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Fri, 29 Nov 2024 15:32:07 +1100 Subject: [PATCH 51/62] Update rollout-operator chart with latest version Signed-off-by: Charles Korn --- 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 a10b1fda30..cca369dbff 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.20.0 -appVersion: v0.20.0 +version: 0.21.0 +appVersion: v0.21.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 ddf1d17235..372e793841 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.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.20.0](https://img.shields.io/badge/AppVersion-v0.20.0-informational?style=flat-square) +![Version: 0.21.0](https://img.shields.io/badge/Version-0.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.21.0](https://img.shields.io/badge/AppVersion-v0.21.0-informational?style=flat-square) Grafana rollout-operator From cb2811fac9dda1fbce79bc2a953de46d7879a922 Mon Sep 17 00:00:00 2001 From: javiermolinar Date: Tue, 3 Dec 2024 10:31:28 +0100 Subject: [PATCH 52/62] docs Signed-off-by: javiermolinar --- 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 ef5fb9f82b..9e88500824 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.23.1](https://img.shields.io/badge/Version-1.23.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From f03281406517b15b0ee9e33c5424f0569a4e7629 Mon Sep 17 00:00:00 2001 From: Costis Date: Tue, 10 Dec 2024 01:47:01 +0200 Subject: [PATCH 53/62] bump version in Chart.yaml Signed-off-by: Costis --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index b12a1c9757..6fe3bb9f57 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.14.0 +version: 1.15.0 appVersion: 2.6.1 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index a8f2596d98..5c99822194 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![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.6.1](https://img.shields.io/badge/AppVersion-2.6.1-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.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Single Binary Mode From fd9dc696f35e1caee142c9f97dcfa277be952095 Mon Sep 17 00:00:00 2001 From: Costis Date: Tue, 10 Dec 2024 02:24:09 +0200 Subject: [PATCH 54/62] Resolve version conflict Signed-off-by: Costis --- 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 af2a1860b6..47af96cb38 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.23.2 +version: 1.24.0 appVersion: 2.6.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 9e88500824..d0982791db 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.23.2](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.24.0](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 181e3aaa8543db305d89ac5aa46c8112cfb5be47 Mon Sep 17 00:00:00 2001 From: Costis Date: Tue, 10 Dec 2024 02:30:30 +0200 Subject: [PATCH 55/62] Resolve version conflict Signed-off-by: Costis --- 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 d0982791db..91fc70bc2d 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.24.0](https://img.shields.io/badge/Version-1.23.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.24.0](https://img.shields.io/badge/Version-1.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From 74f225b4c5c7e2a9786de3abbba6961de1a7d867 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Tue, 10 Dec 2024 11:36:15 -0500 Subject: [PATCH 56/62] bump grafana-agent-operator to 0.50 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 f4555c04df..95d92bd07d 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.24.0](https://img.shields.io/badge/Version-1.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.25.0](https://img.shields.io/badge/Version-1.25.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.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.4.0 | -| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.16.0 | +| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 | +| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.21.0 | ## Chart Repo From 6e509f32c455718b0c5f4aa5eea4e571be0b4d98 Mon Sep 17 00:00:00 2001 From: Heds Simons Date: Thu, 5 Dec 2024 13:28:40 -0800 Subject: [PATCH 57/62] [tempo-distributed] Clarifies use of `global_overrides` and `overrides` objects. There's been recent confusion over the use of the `global_overrides` and `overrides` objects. This PR aims to make it clearer. Signed-off-by: Heds Simons --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 16 ++++++++-------- charts/tempo-distributed/README.md.gotmpl | 4 ++-- charts/tempo-distributed/values.yaml | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index d96cec9234..8f3d845214 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.25.0 +version: 1.25.1 appVersion: 2.6.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 95d92bd07d..d79d8b4f6d 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.0](https://img.shields.io/badge/Version-1.25.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.25.1](https://img.shields.io/badge/Version-1.25.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -32,6 +32,8 @@ To install the chart with the release name `my-release`: helm install my-release grafana/tempo-distributed ``` +Refer to the [Get started with Grafana Tempo using the Helm chart](https://grafana.com/docs/helm-charts/tempo-distributed/next/get-started-helm-charts/) documentation for more details. + ## Uninstalling the Chart To uninstall/delete the my-release deployment: @@ -508,7 +510,7 @@ The memcached default args are removed and should be provided manually. The sett | global.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets for all images, excluding enterprise. Names of existing secrets with private container registry credentials. Ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod Example: pullSecrets: [ my-dockerconfigjson-secret ] | | global.image.registry | string | `"docker.io"` | Overrides the Docker registry globally for all images, excluding enterprise. | | global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods | -| global_overrides.per_tenant_override_config | string | `"/runtime-config/overrides.yaml"` | | +| global_overrides | object | `{"per_tenant_override_config":"/runtime-config/overrides.yaml"}` | The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `global_overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details. | | ingester.affinity | string | Soft node and soft zone anti-affinity | Affinity for ingester pods. Passed through `tpl` and, thus, to be configured as string | | ingester.annotations | object | `{}` | Annotations for the ingester StatefulSet | | ingester.appProtocol | object | `{"grpc":null}` | Adds the appProtocol field to the ingester service. This allows ingester to work with istio protocol selection. | @@ -645,9 +647,9 @@ The memcached default args are removed and should be provided manually. The sett | 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_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. | +| 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 `global_overrides.defaults.metrics_generator_processors` value like `[service-graphs, span-metrics]`. | +| metricsGenerator.config.processor.service_graphs.dimensions | list | `[]` | The resource and span attributes to be added to the service graph metrics, if present. | +| metricsGenerator.config.processor.span_metrics.dimensions | list | `[]` | The resource and span attributes to be added to the span metrics, if present. | | metricsGenerator.config.storage.remote_write | list | `[]` | https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write | | metricsGenerator.config.traces_storage | object | `{"path":"/var/tempo/traces"}` | Used by the local blocks processor to store a wal for traces. | | metricsGenerator.enabled | bool | `false` | Specifies whether a metrics-generator should be deployed | @@ -698,7 +700,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 | object | `{}` | | +| overrides | object | `{}` | The runtime overrides to write to the `per_tenant_override_config` file for Tempo (see `global_overrides` and the `per_tenant_override_config` property). This allows overriding the `ingestion` and `global` values on a per-tenant basis. Note that *all* values must be given for each per-tenant configuration block. Refer to [Runtime overrides](https://grafana.com/docs/tempo/latest/configuration/#runtime-overrides) documentation for more details. | | 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 | @@ -996,8 +998,6 @@ config: | abort_if_cluster_join_fails: false join_members: - {{ include "tempo.fullname" . }}-memberlist - overrides: - per_tenant_override_config: /runtime-config/overrides.yaml server: http_listen_port: 3100 storage: diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index c920695412..a05db13257 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -24,6 +24,8 @@ To install the chart with the release name `my-release`: helm install my-release grafana/tempo-distributed ``` +Refer to the [Get started with Grafana Tempo using the Helm chart](https://grafana.com/docs/helm-charts/tempo-distributed/next/get-started-helm-charts/) documentation for more details. + ## Uninstalling the Chart To uninstall/delete the my-release deployment: @@ -330,8 +332,6 @@ config: | abort_if_cluster_join_fails: false join_members: - {{"{{"}} include "tempo.fullname" . {{"}}"}}-memberlist - overrides: - per_tenant_override_config: /runtime-config/overrides.yaml server: http_listen_port: 3100 storage: diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b3b7374d74..4397b533ea 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -410,10 +410,10 @@ metricsGenerator: external_labels: {} stale_duration: 15m processor: - # -- 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] + # -- For processors to be enabled and generate metrics, pass the names of the processors to `global_overrides.defaults.metrics_generator_processors` value like `[service-graphs, span-metrics]`. service_graphs: - # -- Additional dimensions to add to the metrics. Dimensions are searched for in the - # -- resource and span attributes and are added to the metrics if present. + # -- Additional dimensions to add to the metrics along with the default dimensions. + # -- The resource and span attributes to be added to the service graph metrics, if present. dimensions: [] histogram_buckets: [0.1, 0.2, 0.4, 0.8, 1.6, 3.2, 6.4, 12.8] max_items: 10000 @@ -421,7 +421,7 @@ metricsGenerator: workers: 10 span_metrics: # -- Additional dimensions to add to the metrics along with the default dimensions. - # -- Dimensions are searched for in the resource and span attributes and are added to the metrics if present. + # -- The resource and span attributes to be added to the span metrics, if present. 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.10] storage: @@ -1530,11 +1530,11 @@ storage: # -- The supported storage backends are gcs, s3 and azure, as specified in https://grafana.com/docs/enterprise-traces/latest/configure/reference/#admin_client_config backend: filesystem -# Global overrides +# -- The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `global_overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details. global_overrides: per_tenant_override_config: /runtime-config/overrides.yaml -# Per tenants overrides +# -- The runtime overrides to write to the `per_tenant_override_config` file for Tempo (see `global_overrides` and the `per_tenant_override_config` property). This allows overriding the `ingestion` and `global` values on a per-tenant basis. Note that *all* values must be given for each per-tenant configuration block. Refer to [Runtime overrides](https://grafana.com/docs/tempo/latest/configuration/#runtime-overrides) documentation for more details. overrides: {} # memcached is for all of the Tempo pieces to coordinate with each other. From f6f6217411d41ffc91b7e04f32e7738e8cad161e Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 17:36:32 +0330 Subject: [PATCH 58/62] Updated memcached image Signed-off-by: xogoodnow --- 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 4397b533ea..cce582263b 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1550,7 +1550,7 @@ memcached: # -- Memcached Docker image repository repository: memcached # -- Memcached Docker image tag - tag: 1.6.29-alpine + tag: 1.6.33-alpine # -- Memcached Docker image pull policy pullPolicy: IfNotPresent host: memcached From 077e417f072ee6445d36402049852b555cc5bede Mon Sep 17 00:00:00 2001 From: Tero Paloheimo Date: Tue, 10 Dec 2024 21:06:49 +0200 Subject: [PATCH 59/62] [grafana] Update to version 11.4.0 Signed-off-by: Tero Paloheimo --- 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 f8ff539e08..fd4b26b726 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.6.4 -appVersion: 11.3.1 +version: 8.7.0 +appVersion: 11.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 723b39f863818b5a02762fe56b345aadfa9614eb Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 23:02:48 +0330 Subject: [PATCH 60/62] ran helm-docs Signed-off-by: xogoodnow --- 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 8f3d845214..8d621925bb 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.25.1 +version: 1.25.2 appVersion: 2.6.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 d79d8b4f6d..595de261f8 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.1](https://img.shields.io/badge/Version-1.25.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.25.2](https://img.shields.io/badge/Version-1.25.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -592,7 +592,7 @@ The memcached default args are removed and should be provided manually. The sett | memcached.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` | | memcached.image.registry | string | `nil` | The Docker registry for the Memcached image. Overrides `global.image.registry` | | memcached.image.repository | string | `"memcached"` | Memcached Docker image repository | -| memcached.image.tag | string | `"1.6.29-alpine"` | Memcached Docker image tag | +| memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag | | memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | | memcached.podAnnotations | object | `{}` | Annotations for memcached pods | | memcached.podLabels | object | `{}` | Labels for memcached pods | From 4e2824317d2576d2a173ccc3cfdf45a592475145 Mon Sep 17 00:00:00 2001 From: Robert Lankford Date: Wed, 11 Dec 2024 13:58:28 -0800 Subject: [PATCH 61/62] grafana-sampling: bump alloy version (#3481) Signed-off-by: Robbie Lankford --- charts/grafana-sampling/Chart.lock | 8 ++++---- charts/grafana-sampling/Chart.yaml | 8 ++++---- charts/grafana-sampling/README.md | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/grafana-sampling/Chart.lock b/charts/grafana-sampling/Chart.lock index acf12b4b57..6db60675b2 100644 --- a/charts/grafana-sampling/Chart.lock +++ b/charts/grafana-sampling/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: alloy repository: https://grafana.github.io/helm-charts - version: 0.6.0 + version: 0.10.1 - name: alloy repository: https://grafana.github.io/helm-charts - version: 0.6.0 -digest: sha256:e9dbff0d3707c403c1fb645eb33920a2219cc3156358134537e89caf39c588a5 -generated: "2024-08-14T10:41:47.606272-07:00" + version: 0.10.1 +digest: sha256:dc461e633c1504ba6c60e11c21afc3346444e175d4e3b7e0b538240c392c81d0 +generated: "2024-12-11T10:44:32.61011-08:00" diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml index 90dadf2cd6..3b2c88ca6b 100644 --- a/charts/grafana-sampling/Chart.yaml +++ b/charts/grafana-sampling/Chart.yaml @@ -2,17 +2,17 @@ apiVersion: v2 name: grafana-sampling description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. type: application -version: 1.1.0 -appVersion: "v1.3.0" +version: 1.1.1 +appVersion: "v1.5.1" sources: - https://github.com/grafana/alloy - https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/sampling/tail/ dependencies: - name: alloy - version: 0.6.0 + version: 0.10.1 repository: https://grafana.github.io/helm-charts alias: alloy-deployment - name: alloy - version: 0.6.0 + version: 0.10.1 repository: https://grafana.github.io/helm-charts alias: alloy-statefulset diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 24607dddc0..fede95c43a 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square) +![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.5.1](https://img.shields.io/badge/AppVersion-v1.5.1-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. From d45fbeacc1fb74ea85bd7a48fb2b5af963f0fb66 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 11 Dec 2024 21:07:26 +0000 Subject: [PATCH 62/62] [tempo-distributed] Allow IPv6 support Signed-off-by: Zach Leslie --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 4 +++- .../templates/compactor/service-compactor.yaml | 2 ++ .../templates/distributor/service-distributor.yaml | 2 ++ .../templates/gossip-ring/service-gossip-ring.yaml | 2 ++ .../templates/ingester/service-ingester.yaml | 2 ++ .../templates/memcached/service-memcached.yaml | 2 ++ .../metrics-generator/service-metrics-generator.yaml | 2 ++ .../templates/querier/service-querier.yaml | 2 ++ .../templates/query-frontend/service-query-frontend.yaml | 2 ++ charts/tempo-distributed/values.yaml | 9 ++++++++- 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 8d621925bb..8eedcb4b6c 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.25.2 +version: 1.26.0 appVersion: 2.6.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 595de261f8..b0084f4350 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.2](https://img.shields.io/badge/Version-1.25.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.0](https://img.shields.io/badge/Version-1.26.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -859,6 +859,8 @@ The memcached default args are removed and should be provided manually. The sett | tempo.readinessProbe.initialDelaySeconds | int | `30` | | | tempo.readinessProbe.timeoutSeconds | int | `1` | | | tempo.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` | SecurityContext holds container-level security attributes and common container settings | +| tempo.service.ipFamilies | list | `["IPv4"]` | Configure the IP families for all tempo services See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core | +| tempo.service.ipFamilyPolicy | string | `"SingleStack"` | Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack | | tempo.structuredConfig | object | `{}` | Structured tempo configuration | | tokengenJob.annotations | object | `{}` | | | tokengenJob.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | The SecurityContext for tokenjobgen containers | diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml index dcbacc273b..fde2125f1b 100644 --- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml @@ -17,3 +17,5 @@ spec: protocol: TCP selector: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "compactor") | nindent 4 }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index 1f126212e0..15c6317544 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -16,6 +16,8 @@ metadata: spec: internalTrafficPolicy: {{ .Values.distributor.service.internalTrafficPolicy }} type: {{ .Values.distributor.service.type }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 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 98002c2d19..35fd54d1c4 100644 --- a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml +++ b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml @@ -12,6 +12,8 @@ metadata: spec: type: ClusterIP clusterIP: None + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: gossip-ring port: {{ include "tempo.memberlistBindPort" . }} diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index bcabfa2ff9..96867f0dcd 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -17,6 +17,8 @@ metadata: spec: type: {{ .Values.ingester.service.type }} internalTrafficPolicy: {{ .Values.ingester.service.internalTrafficPolicy }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/templates/memcached/service-memcached.yaml b/charts/tempo-distributed/templates/memcached/service-memcached.yaml index 64806afc63..ab9d99d6e8 100644 --- a/charts/tempo-distributed/templates/memcached/service-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/service-memcached.yaml @@ -11,6 +11,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: memcached-client port: 11211 diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml index f0ca27a68e..cc3055e95f 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml @@ -12,6 +12,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: {{- range .Values.metricsGenerator.ports }} {{- if .service }} diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml index b13348b0f8..05dd42c106 100644 --- a/charts/tempo-distributed/templates/querier/service-querier.yaml +++ b/charts/tempo-distributed/templates/querier/service-querier.yaml @@ -10,6 +10,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml index d737e7e52c..ad7c568d70 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -14,6 +14,8 @@ metadata: {{- end }} spec: type: {{ .Values.queryFrontend.service.type }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index cce582263b..68e2157433 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -89,7 +89,14 @@ tempo: service: # -- Sets optional annotations to the service field of the memberlist service. annotations: {} - + service: + # -- Configure the IP families for all tempo services + # See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core + ipFamilies: + - 'IPv4' + # - 'IPv6' + # -- Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack + ipFamilyPolicy: 'SingleStack' serviceAccount: # -- Specifies whether a ServiceAccount should be created create: true