From d48e722ee854376aace5184df74aa3fb842de18a Mon Sep 17 00:00:00 2001 From: Costis Date: Tue, 17 Sep 2024 13:59:26 +0300 Subject: [PATCH 01/95] 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/95] 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/95] 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 83365ca13d40222b636d81b33b2fe703fc970505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Puczyn=CC=81ski?= Date: Fri, 11 Oct 2024 11:00:36 +0200 Subject: [PATCH 04/95] add persistence.enableStatefulSetAutoDeletePVC to tempo chart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mateusz Puczyński --- charts/tempo/templates/statefulset.yaml | 5 +++++ charts/tempo/values.yaml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/charts/tempo/templates/statefulset.yaml b/charts/tempo/templates/statefulset.yaml index 79a6204e35..53c9605fad 100644 --- a/charts/tempo/templates/statefulset.yaml +++ b/charts/tempo/templates/statefulset.yaml @@ -14,6 +14,11 @@ spec: {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} {{- end }} + {{- if and (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) (.Values.persistence.enableStatefulSetAutoDeletePVC) (.Values.persistence.enabled) }} + persistentVolumeClaimRetentionPolicy: + whenDeleted: Delete + whenScaled: Delete + {{- end }} selector: matchLabels: {{- include "tempo.selectorLabels" . | nindent 6 }} diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 91bebb1685..48c9fe7040 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -270,6 +270,8 @@ serviceMonitor: persistence: enabled: false + # -- Enable StatefulSetAutoDeletePVC feature + enableStatefulSetAutoDeletePVC: false # storageClassName: local-path accessModes: - ReadWriteOnce From ea0c4c81739a0d0dbc8fbd81a4622ba0fdd6322e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Puczyn=CC=81ski?= Date: Fri, 11 Oct 2024 19:03:59 +0200 Subject: [PATCH 05/95] bump tempo helm chart and regenerate tempo chart docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mateusz Puczyński --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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..c582e05c9b 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 @@ -30,6 +30,7 @@ Grafana Tempo Single Binary Mode | networkPolicy.ingress | bool | `true` | | | nodeSelector | object | `{}` | Node labels for pod assignment. See: https://kubernetes.io/docs/user-guide/node-selection/ | | persistence.accessModes[0] | string | `"ReadWriteOnce"` | | +| persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | persistence.enabled | bool | `false` | | | persistence.size | string | `"10Gi"` | | | podAnnotations | object | `{}` | Pod Annotations | From 19b9f22de97f0fade4da8e73a3e524ee4cd5b355 Mon Sep 17 00:00:00 2001 From: Lukas Monkevicius Date: Fri, 25 Oct 2024 08:47:37 -0700 Subject: [PATCH 06/95] make relabelings optional for rollout operator Signed-off-by: Lukas Monkevicius --- charts/rollout-operator/Chart.yaml | 2 +- charts/rollout-operator/README.md | 2 +- charts/rollout-operator/templates/servicemonitor.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index c8bf8e01dc..05e8d456d2 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.18.0 +version: 0.18.1 appVersion: v0.19.1 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 e988430065..d11a9b9ab9 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.18.0](https://img.shields.io/badge/Version-0.18.0-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.18.1](https://img.shields.io/badge/Version-0.18.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) Grafana rollout-operator diff --git a/charts/rollout-operator/templates/servicemonitor.yaml b/charts/rollout-operator/templates/servicemonitor.yaml index 7810843403..8fa7c1b23e 100644 --- a/charts/rollout-operator/templates/servicemonitor.yaml +++ b/charts/rollout-operator/templates/servicemonitor.yaml @@ -28,9 +28,9 @@ spec: {{- with .Values.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} + {{- with .Values.serviceMonitor.relabelings }} relabelings: - {{- with .Values.serviceMonitor.relabelings }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- toYaml . | nindent 8 }} + {{- end }} scheme: http {{- end -}} From 6b528e37d91c4bc9fd9952a5710d7b8e90719cc2 Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Wed, 30 Oct 2024 00:48:02 +0100 Subject: [PATCH 07/95] [rollout-operator] Add commonLabels (#3319) Signed-off-by: fabio trigari --- charts/rollout-operator/Chart.yaml | 2 +- charts/rollout-operator/README.md | 3 ++- charts/rollout-operator/templates/_helpers.tpl | 3 +++ charts/rollout-operator/templates/role.yaml | 2 ++ charts/rollout-operator/templates/rolebinding.yaml | 2 ++ charts/rollout-operator/values.yaml | 6 ++++++ 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index c8bf8e01dc..cbec568880 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.18.0 +version: 0.19.0 appVersion: v0.19.1 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 e988430065..4d716ad8cb 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.18.0](https://img.shields.io/badge/Version-0.18.0-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.19.0](https://img.shields.io/badge/Version-0.19.0-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) Grafana rollout-operator @@ -41,6 +41,7 @@ It is not a highly available application and runs as a single pod. |-----|------|---------|-------------| | affinity | object | `{}` | | | fullnameOverride | string | `""` | | +| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. | | hostAliases | list | `[]` | hostAliases to add | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"grafana/rollout-operator"` | | diff --git a/charts/rollout-operator/templates/_helpers.tpl b/charts/rollout-operator/templates/_helpers.tpl index bf3553abfe..68ae702a06 100644 --- a/charts/rollout-operator/templates/_helpers.tpl +++ b/charts/rollout-operator/templates/_helpers.tpl @@ -48,6 +48,9 @@ helm.sh/chart: {{ include "rollout-operator.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.global.commonLabels }} +{{ toYaml . }} +{{- end }} {{- end }} {{/* diff --git a/charts/rollout-operator/templates/role.yaml b/charts/rollout-operator/templates/role.yaml index 210c456d03..7bc2570b4e 100644 --- a/charts/rollout-operator/templates/role.yaml +++ b/charts/rollout-operator/templates/role.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ include "rollout-operator.fullname" . }} + labels: + {{- include "rollout-operator.labels" . | nindent 4 }} rules: - apiGroups: - "" diff --git a/charts/rollout-operator/templates/rolebinding.yaml b/charts/rollout-operator/templates/rolebinding.yaml index 24fcd72663..d1cfe6826c 100644 --- a/charts/rollout-operator/templates/rolebinding.yaml +++ b/charts/rollout-operator/templates/rolebinding.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ include "rollout-operator.fullname" . }} + labels: + {{- include "rollout-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/rollout-operator/values.yaml b/charts/rollout-operator/values.yaml index 66f9486b1a..1711671f7a 100644 --- a/charts/rollout-operator/values.yaml +++ b/charts/rollout-operator/values.yaml @@ -2,6 +2,12 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. + +global: + # -- Common labels for all object directly managed by this chart. + commonLabels: {} + + image: repository: grafana/rollout-operator pullPolicy: IfNotPresent From 74160c292a64bb84869a0e5fdff0d4d171d2f7ff Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Tue, 29 Oct 2024 01:04:21 +0100 Subject: [PATCH 08/95] [tempo-vulture] Add commonLabels (#3319) Signed-off-by: fabio trigari --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 1 + charts/tempo-vulture/templates/_helpers.tpl | 3 +++ charts/tempo-vulture/values.yaml | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 59fb60cd0e..44393355ca 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.5.0 +version: 0.5.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 86b510d5fa..5378a14ab8 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -54,6 +54,7 @@ tempoAddress: | extraEnv | list | `[]` | Environment variables to add to the vulture pods | | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the vulture pods | | fullnameOverride | string | `""` | Overrides the chart's computed fullname | +| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. scope: * | | hostAliases | list | `[]` | hostAliases to add | | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | image.repository | string | `"docker.io/grafana/tempo-vulture"` | Docker image repository | diff --git a/charts/tempo-vulture/templates/_helpers.tpl b/charts/tempo-vulture/templates/_helpers.tpl index d19656be82..f183cfe9fd 100644 --- a/charts/tempo-vulture/templates/_helpers.tpl +++ b/charts/tempo-vulture/templates/_helpers.tpl @@ -40,6 +40,9 @@ helm.sh/chart: {{ include "tempo-vulture.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.global.commonLabels }} +{{ toYaml . }} +{{- end }} {{- end }} {{/* diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index f056143a49..def34f9d1c 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -1,3 +1,8 @@ +global: + # -- Common labels for all object directly managed by this chart. + # scope: * + commonLabels: {} + # -- Overrides the chart's name nameOverride: "" # -- Overrides the chart's computed fullname From 711a08d4d31cf8bb15818ef5b3af3da9616270b3 Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Tue, 29 Oct 2024 01:22:05 +0100 Subject: [PATCH 09/95] [tempo-vulture] Update README and chart version (#3319) Signed-off-by: fabio trigari --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 44393355ca..de91cadb86 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.5.1 +version: 0.6.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 5378a14ab8..032c498ddf 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance. From bd3f7fa41dbd9618f2508a13df04a3d0dc07dc8a Mon Sep 17 00:00:00 2001 From: BlackDex Date: Fri, 1 Nov 2024 15:22:09 +0100 Subject: [PATCH 10/95] Add deployment strategy for synthetic-mon-agent Added a deploymentStrategy for the synthetic-monitoring-agent helm. This allows more controle on how the pods will be deployed. Used the same syntax as other helm charts already do. Signed-off-by: BlackDex --- charts/synthetic-monitoring-agent/Chart.yaml | 2 +- charts/synthetic-monitoring-agent/README.md | 3 ++- charts/synthetic-monitoring-agent/templates/deployment.yaml | 4 ++++ charts/synthetic-monitoring-agent/values.yaml | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index d125cb62ca..da33468b5d 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -15,4 +15,4 @@ name: synthetic-monitoring-agent sources: - https://github.com/grafana/synthetic-monitoring-agent type: application -version: 0.4.0 +version: 0.5.0 diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 6dc8fd4bbc..6dfc8cff94 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -1,6 +1,6 @@ # synthetic-monitoring-agent -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. @@ -37,6 +37,7 @@ Kubernetes: `^1.16.0-0` | autoscaling.minReplicas | int | `1` | Minimum autoscaling replicas | | autoscaling.targetCPUUtilizationPercentage | int | `60` | Target CPU utilisation percentage | | autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage | +| deploymentStrategy | object | `{}` | See `kubectl explain deployment.spec.strategy` for more ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy | | extraObjects | list | `[]` | Add dynamic manifests via values: | | fullnameOverride | string | `""` | Override the fullname of the chart. | | hostAliases | list | `[]` | hostAliases to add | diff --git a/charts/synthetic-monitoring-agent/templates/deployment.yaml b/charts/synthetic-monitoring-agent/templates/deployment.yaml index 23b830b447..e6f1e7bf7b 100644 --- a/charts/synthetic-monitoring-agent/templates/deployment.yaml +++ b/charts/synthetic-monitoring-agent/templates/deployment.yaml @@ -5,6 +5,10 @@ metadata: labels: {{- include "synthetic-monitoring-agent.labels" . | nindent 4 }} spec: + {{- with .Values.deploymentStrategy }} + strategy: + {{- toYaml . | trim | nindent 4 }} + {{- end }} minReadySeconds: 10 {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} diff --git a/charts/synthetic-monitoring-agent/values.yaml b/charts/synthetic-monitoring-agent/values.yaml index a6e534844c..e3d0c15b8d 100644 --- a/charts/synthetic-monitoring-agent/values.yaml +++ b/charts/synthetic-monitoring-agent/values.yaml @@ -152,3 +152,8 @@ extraObjects: [] secret: # -- Reference an existing secret for API token existingSecret: "" + +# -- See `kubectl explain deployment.spec.strategy` for more +# ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy +deploymentStrategy: {} + # type: RollingUpdate From 3d5fc72b6e4f46c4d9a973fed23132961d26b69d Mon Sep 17 00:00:00 2001 From: BlackDex Date: Sun, 3 Nov 2024 17:38:27 +0100 Subject: [PATCH 11/95] Remove trim Signed-off-by: BlackDex --- charts/synthetic-monitoring-agent/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/synthetic-monitoring-agent/templates/deployment.yaml b/charts/synthetic-monitoring-agent/templates/deployment.yaml index e6f1e7bf7b..ea7b387215 100644 --- a/charts/synthetic-monitoring-agent/templates/deployment.yaml +++ b/charts/synthetic-monitoring-agent/templates/deployment.yaml @@ -7,7 +7,7 @@ metadata: spec: {{- with .Values.deploymentStrategy }} strategy: - {{- toYaml . | trim | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} minReadySeconds: 10 {{- if not .Values.autoscaling.enabled }} From e722f634d0b854c08c1790d6cd563b4c9337bdc9 Mon Sep 17 00:00:00 2001 From: Benjamin Leggett Date: Mon, 4 Nov 2024 12:51:55 -0500 Subject: [PATCH 12/95] [grafana] `managed-by` should not be templated Signed-off-by: Benjamin Leggett --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_helpers.tpl | 2 -- charts/grafana/templates/hpa.yaml | 1 - charts/grafana/templates/image-renderer-hpa.yaml | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index b7aa6bf080..94b2f9218a 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.11 +version: 8.5.12 appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 2a68cb6f85..be9c1c5cd1 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -70,7 +70,6 @@ helm.sh/chart: {{ include "grafana.chart" . }} {{- if or .Chart.AppVersion .Values.image.tag }} app.kubernetes.io/version: {{ mustRegexReplaceAllLiteral "@sha.*" .Values.image.tag "" | default .Chart.AppVersion | trunc 63 | trimSuffix "-" | quote }} {{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} {{- with .Values.extraLabels }} {{ toYaml . }} {{- end }} @@ -93,7 +92,6 @@ helm.sh/chart: {{ include "grafana.chart" . }} {{- if or .Chart.AppVersion .Values.image.tag }} app.kubernetes.io/version: {{ mustRegexReplaceAllLiteral "@sha.*" .Values.image.tag "" | default .Chart.AppVersion | trunc 63 | trimSuffix "-" | quote }} {{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} {{/* diff --git a/charts/grafana/templates/hpa.yaml b/charts/grafana/templates/hpa.yaml index 46bbcb49a2..d9624b2a80 100644 --- a/charts/grafana/templates/hpa.yaml +++ b/charts/grafana/templates/hpa.yaml @@ -8,7 +8,6 @@ metadata: labels: app.kubernetes.io/name: {{ include "grafana.name" . }} helm.sh/chart: {{ include "grafana.chart" . }} - app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} spec: scaleTargetRef: diff --git a/charts/grafana/templates/image-renderer-hpa.yaml b/charts/grafana/templates/image-renderer-hpa.yaml index b0f0059b79..d992f62896 100644 --- a/charts/grafana/templates/image-renderer-hpa.yaml +++ b/charts/grafana/templates/image-renderer-hpa.yaml @@ -7,7 +7,6 @@ metadata: labels: app.kubernetes.io/name: {{ include "grafana.name" . }}-image-renderer helm.sh/chart: {{ include "grafana.chart" . }} - app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }} spec: scaleTargetRef: From 961fccf9b1fbd4f4be890442996c04be8d3c67a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 4 Nov 2024 20:49:31 +0100 Subject: [PATCH 13/95] [grafana] Implement Gateway API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .github/workflows/lint-test.yaml | 4 ++ charts/grafana/Chart.yaml | 2 +- charts/grafana/ci/with-nondefault-values.yaml | 26 +++++++++++ charts/grafana/templates/route.yaml | 44 +++++++++++++++++++ charts/grafana/values.yaml | 36 +++++++++++++++ 5 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 charts/grafana/templates/route.yaml diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index b5134a83d4..f6e54f3047 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -72,6 +72,10 @@ jobs: kubectl_version: ${{ inputs.kind_kubectl_version }} node_image: ${{ inputs.kind_node_image }} + - name: Apply Gateway API CRDs + if: steps.list-changed.outputs.changed == 'true' + run: kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd + - name: Run chart-testing (install) run: | changed=$(ct list-changed --config "${CT_CONFIGFILE}") diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index b7aa6bf080..2e3260979a 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.11 +version: 8.6.0 appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/ci/with-nondefault-values.yaml b/charts/grafana/ci/with-nondefault-values.yaml index fb5c179409..48484895d0 100644 --- a/charts/grafana/ci/with-nondefault-values.yaml +++ b/charts/grafana/ci/with-nondefault-values.yaml @@ -4,3 +4,29 @@ ingress: enabled: true hosts: - monitoring-{{ .Values.global.environment }}.example.com + +route: + main: + enabled: true + labels: + app: monitoring-prometheus + hostnames: + - "*.example.com" + - "{{ .Values.global.environment }}.example.com" + filters: + - type: RequestHeaderModifier + requestHeaderModifier: + set: + - name: my-header-name + value: my-new-header-value + additionalRules: + - filters: + - type: RequestHeaderModifier + requestHeaderModifier: + set: + - name: my-header-name + value: my-new-header-value + matches: + - path: + type: PathPrefix + value: /foo/ diff --git a/charts/grafana/templates/route.yaml b/charts/grafana/templates/route.yaml new file mode 100644 index 0000000000..e8c98b3e87 --- /dev/null +++ b/charts/grafana/templates/route.yaml @@ -0,0 +1,44 @@ +{{- range $name, $route := .Values.route }} + {{- if $route.enabled -}} +--- +apiVersion: {{ $route.apiVersion | default "gateway.networking.k8s.io/v1" }} +kind: {{ $route.kind | default "HTTPRoute" }} +metadata: + {{- with $route.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + name: {{ template "grafana.fullname" $ }}{{ if ne $name "main" }}-{{ $name }}{{ end }} + namespace: {{ template "grafana.namespace" $ }} + labels: + app: {{ template "grafana.name" $ }}-prometheus + {{- include "grafana.labels" $ | nindent 4 }} + {{- with $route.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with $route.parentRefs }} + parentRefs: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with $route.hostnames }} + hostnames: + {{- tpl (toYaml .) $ | nindent 4 }} + {{- end }} + rules: + {{- if $route.additionalRules }} + {{- tpl (toYaml $route.additionalRules) $ | nindent 4 }} + {{- end }} + - backendRefs: + - name: {{ include "grafana.fullname" $ }} + port: {{ $.Values.service.port }} + {{- with $route.filters }} + filters: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with $route.matches }} + matches: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 98ebe9ad12..6467c4cc61 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -311,6 +311,42 @@ ingress: # hosts: # - chart-example.local +# -- BETA: Configure the gateway routes for the chart here. +# More routes can be added by adding a dictionary key like the 'main' route. +# Be aware that this is an early beta of this feature, +# kube-prometheus-stack does not guarantee this works and is subject to change. +# Being BETA this can/will change in the future without notice, do not use unless you want to take that risk +# [[ref]](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io%2fv1alpha2) +route: + main: + # -- Enables or disables the route + enabled: false + + # -- Set the route apiVersion, e.g. gateway.networking.k8s.io/v1 or gateway.networking.k8s.io/v1alpha2 + apiVersion: gateway.networking.k8s.io/v1 + # -- Set the route kind + # Valid options are GRPCRoute, HTTPRoute, TCPRoute, TLSRoute, UDPRoute + kind: HTTPRoute + + annotations: {} + labels: {} + + hostnames: [] + # - my-filter.example.com + parentRefs: [] + # - name: acme-gw + + matches: + - path: + type: PathPrefix + value: / + + ## Filters define the filters that are applied to requests that match this rule. + filters: [] + + ## Additional custom rules that can be added to the route + additionalRules: [] + resources: {} # limits: # cpu: 100m From 946a2e32ce6eebd3536418d04160aa5d6d5881dd Mon Sep 17 00:00:00 2001 From: Nadia Santalla Date: Tue, 5 Nov 2024 10:09:43 +0100 Subject: [PATCH 14/95] synthetic-monitoring-agent: bump version to v0.29.3 Signed-off-by: Nadia Santalla --- charts/synthetic-monitoring-agent/Chart.yaml | 4 ++-- charts/synthetic-monitoring-agent/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index da33468b5d..878bd6a6d8 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v0.9.3-0-gcd7aadd +appVersion: v0.29.3 description: Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png @@ -15,4 +15,4 @@ name: synthetic-monitoring-agent sources: - https://github.com/grafana/synthetic-monitoring-agent type: application -version: 0.5.0 +version: 0.6.0 diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 6dfc8cff94..4ba916d266 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -1,6 +1,6 @@ # synthetic-monitoring-agent -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.3](https://img.shields.io/badge/AppVersion-v0.29.3-informational?style=flat-square) Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. From 84d964924b88120d4d603abd73215a07d0ebdbf5 Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:34:38 -0600 Subject: [PATCH 15/95] chore: set unique cluster_label for tempo-distributed memberlist Signed-off-by: Wylie Hobbs --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 18c2188f09..674faac075 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.20.1 +version: 1.21.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b721222e80..b887a35f3f 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1119,6 +1119,7 @@ traces: # -- Memberlist configuration. Please refer to https://grafana.com/docs/tempo/latest/configuration/#memberlist memberlist: node_name: "" + cluster_label: "{{ .Release.Name }}.{{ .Release.Namespace }}" randomize_node_name: true stream_timeout: "10s" retransmit_factor: 2 From 42873daa49865269fd790990c1098269217f617f Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:41:38 -0600 Subject: [PATCH 16/95] update docs Signed-off-by: Wylie Hobbs --- charts/tempo-distributed/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 6007c60b6c..e243313951 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.20.1](https://img.shields.io/badge/Version-1.20.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.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) Grafana Tempo in MicroService mode @@ -566,7 +566,7 @@ The memcached default args are removed and should be provided manually. The sett | license.contents | string | `"NOTAVALIDLICENSE"` | | | license.external | bool | `false` | | | license.secretName | string | `"{{ include \"tempo.resourceName\" (dict \"ctx\" . \"component\" \"license\") }}"` | | -| memberlist | object | `{"abort_if_cluster_join_fails":false,"bind_addr":[],"bind_port":7946,"gossip_interval":"1s","gossip_nodes":2,"gossip_to_dead_nodes_time":"30s","leave_timeout":"5s","left_ingesters_timeout":"5m","max_join_backoff":"1m","max_join_retries":10,"min_join_backoff":"1s","node_name":"","packet_dial_timeout":"5s","packet_write_timeout":"5s","pull_push_interval":"30s","randomize_node_name":true,"rejoin_interval":"0s","retransmit_factor":2,"stream_timeout":"10s"}` | Memberlist configuration. Please refer to https://grafana.com/docs/tempo/latest/configuration/#memberlist | +| memberlist | object | `{"abort_if_cluster_join_fails":false,"bind_addr":[],"bind_port":7946,"cluster_label":"{{ .Release.Name }}.{{ .Release.Namespace }}","gossip_interval":"1s","gossip_nodes":2,"gossip_to_dead_nodes_time":"30s","leave_timeout":"5s","left_ingesters_timeout":"5m","max_join_backoff":"1m","max_join_retries":10,"min_join_backoff":"1s","node_name":"","packet_dial_timeout":"5s","packet_write_timeout":"5s","pull_push_interval":"30s","randomize_node_name":true,"rejoin_interval":"0s","retransmit_factor":2,"stream_timeout":"10s"}` | Memberlist configuration. Please refer to https://grafana.com/docs/tempo/latest/configuration/#memberlist | | memcached.affinity | string | Hard node and soft zone anti-affinity | Affinity for memcached pods. Passed through `tpl` and, thus, to be configured as string | | memcached.enabled | bool | `true` | Specified whether the memcached cachce should be enabled | | memcached.extraArgs | list | `[]` | Additional CLI args for memcached | From ecdf88c47af0f02c6d32ac6d7b56e85f64cb8a0c Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Wed, 6 Nov 2024 13:47:12 -0500 Subject: [PATCH 17/95] readme Signed-off-by: Joe Elliott --- charts/tempo-distributed/README.md | 5 +++++ charts/tempo-distributed/README.md.gotmpl | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e243313951..b2952c2d5b 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -46,6 +46,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.21.0 + +Upgrading to chart 1.21.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.18.0 Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index e6b2e33433..c920695412 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -39,6 +39,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.21.0 + +Upgrading to chart 1.21.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.18.0 Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. From e66f68af81f9eb069c13843dfc0bffdea9027aee Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:39:46 -0600 Subject: [PATCH 18/95] [tempo] set unique cluster_label for tempo memberlist Signed-off-by: Wylie Hobbs --- charts/tempo/Chart.yaml | 2 +- charts/tempo/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index faebfdfb51..5e49b661ee 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.11.0 +version: 1.12.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 48b76f58c2..7aaf93920b 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -126,6 +126,8 @@ tempo: # -- Tempo configuration file contents # @default -- Dynamically generated tempo configmap config: | + memberlist: + cluster_label: "{{ .Release.Name }}.{{ .Release.Namespace }}" multitenancy_enabled: {{ .Values.tempo.multitenancyEnabled }} usage_report: reporting_enabled: {{ .Values.tempo.reportingEnabled }} From f06d6ad1c7dbdc9d969d246aaef5f846191b8829 Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:41:04 -0600 Subject: [PATCH 19/95] update docs Signed-off-by: Wylie Hobbs --- 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 3e3edb9b91..6bc2b281d4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Single Binary Mode From a536dad746a86276b6646d1d011e039c7eae47d4 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Wed, 6 Nov 2024 13:50:47 -0500 Subject: [PATCH 20/95] add warning Signed-off-by: Joe Elliott --- charts/tempo/README.md | 5 +++++ charts/tempo/README.md.gotmpl | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 6bc2b281d4..81629e43f4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -134,6 +134,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.12.0 + +Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.2.0 Please be aware that we've updated the minor version to Tempo 2.1, which includes breaking changes. diff --git a/charts/tempo/README.md.gotmpl b/charts/tempo/README.md.gotmpl index 92a4cefefd..9f466bb2a5 100644 --- a/charts/tempo/README.md.gotmpl +++ b/charts/tempo/README.md.gotmpl @@ -40,6 +40,11 @@ The command removes all the Kubernetes components associated with the chart and A major chart version change indicates that there is an incompatible breaking change needing manual actions. +### From Chart versions < 1.12.0 + +Upgrading to chart 1.12.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. +This will interrupt reads and writes. This config option is set to prevent cross talk between Tempo and other memberlist clusters. + ### From Chart versions < 1.2.0 Please be aware that we've updated the minor version to Tempo 2.1, which includes breaking changes. From 5a10a5aa3c3896ba683e3a278e8c22d5f2651548 Mon Sep 17 00:00:00 2001 From: Ryan Brady Date: Wed, 6 Nov 2024 13:47:23 -0500 Subject: [PATCH 21/95] Adds annotations to gossip-ring service in tempo-distributed In the tempo-distributed the gossip-ring service is the only service in the chart that does not have annotations. This PR adds the annotations based on .Values.tempo.memberlist as used elsewhere in the file. Closes: #3405 Signed-off-by: Ryan Brady --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 6 ++++-- .../templates/gossip-ring/service-gossip-ring.yaml | 4 ++++ charts/tempo-distributed/values.yaml | 4 ++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 674faac075..c4fc9811c5 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.20.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 b2952c2d5b..b1ff71befb 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.20.2](https://img.shields.io/badge/Version-1.20.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 @@ -830,8 +830,10 @@ The memcached default args are removed and should be provided manually. The sett | tempo.image.registry | string | `"docker.io"` | The Docker registry | | tempo.image.repository | string | `"grafana/tempo"` | Docker image repository | | tempo.image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion | -| tempo.memberlist | object | `{"appProtocol":null}` | Memberlist service configuration. | +| tempo.memberlist | object | `{"appProtocol":null,"service":{"annotations":{}}}` | Memberlist service configuration. | | tempo.memberlist.appProtocol | string | `nil` | Adds the appProtocol field to the memberlist service. This allows memberlist to work with istio protocol selection. Set the optional service protocol. Ex: "tcp", "http" or "https". | +| tempo.memberlist.service | object | `{"annotations":{}}` | Adds the service field to the memberlist service | +| tempo.memberlist.service.annotations | object | `{}` | Sets optional annotations to the service field of the memberlist service. | | tempo.podAnnotations | object | `{}` | Common annotations for all pods | | tempo.podLabels | object | `{}` | Global labels for all tempo pods | | tempo.podSecurityContext | object | `{"fsGroup":1000}` | podSecurityContext holds pod-level security attributes and common container settings | 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 948a739503..98002c2d19 100644 --- a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml +++ b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml @@ -5,6 +5,10 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "tempo.labels" (dict "ctx" . "component" "gossip-ring") | nindent 4 }} + annotations: + {{- with .Values.tempo.memberlist.service.annotations | default dict }} + {{- toYaml . | nindent 4}} + {{- end }} spec: type: ClusterIP clusterIP: None diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index b887a35f3f..6d1e894649 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -85,6 +85,10 @@ tempo: memberlist: # -- Adds the appProtocol field to the memberlist service. This allows memberlist to work with istio protocol selection. Set the optional service protocol. Ex: "tcp", "http" or "https". appProtocol: null + # -- Adds the service field to the memberlist service + service: + # -- Sets optional annotations to the service field of the memberlist service. + annotations: {} serviceAccount: # -- Specifies whether a ServiceAccount should be created From 162dafc932770d5f91b08dec0314a596c00fc8f9 Mon Sep 17 00:00:00 2001 From: Ryan Brady Date: Wed, 6 Nov 2024 17:03:16 -0500 Subject: [PATCH 22/95] updates after rebase Signed-off-by: Ryan Brady --- 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 c4fc9811c5..da139d40c6 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.20.2 +version: 1.21.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 b1ff71befb..ed4cc2d7f6 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.20.2](https://img.shields.io/badge/Version-1.20.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.21.1](https://img.shields.io/badge/Version-1.21.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 8e55a91183cb81186de5237c88295eb0b80e31d7 Mon Sep 17 00:00:00 2001 From: Martin Balint Date: Thu, 7 Nov 2024 12:40:49 +0100 Subject: [PATCH 23/95] [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 26f6acaa4c12e01403111a28fca2683aa5203b52 Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Fri, 8 Nov 2024 19:31:59 +0000 Subject: [PATCH 24/95] Update tempo to 2.6.1 Signed-off-by: Vladimir Pouzanov --- charts/tempo/Chart.yaml | 4 ++-- charts/tempo/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 5e49b661ee..b06ddfcf50 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.12.0 -appVersion: 2.5.0 +version: 1.13.0 +appVersion: 2.6.1 engine: gotpl home: https://grafana.net icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 81629e43f4..b49ba60b87 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.12.0](https://img.shields.io/badge/Version-1.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Single Binary Mode From ab15498a18a56db4c09ce41fad84080d47f106b8 Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Fri, 8 Nov 2024 19:32:23 +0000 Subject: [PATCH 25/95] Update tempo-vulture to 2.6.1 Signed-off-by: Vladimir Pouzanov --- charts/tempo-vulture/Chart.yaml | 4 ++-- charts/tempo-vulture/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index de91cadb86..d17e98aa08 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.6.0 -appVersion: 2.5.0 +version: 0.7.0 +appVersion: 2.6.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 032c498ddf..def08a3b5d 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 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) Grafana Tempo Vulture - A tool to monitor Tempo performance. From a854c38f1bce8290befb63e49cc3651dd3e7e5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Puczyn=CC=81ski?= Date: Sat, 9 Nov 2024 22:50:02 +0100 Subject: [PATCH 26/95] bump version in Chart.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mateusz Puczyński --- charts/tempo/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index b06ddfcf50..b12a1c9757 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.13.0 +version: 1.14.0 appVersion: 2.6.1 engine: gotpl home: https://grafana.net From 484bc7b2f25db63c9d09cc4ff2f12d6bc24db044 Mon Sep 17 00:00:00 2001 From: MH Date: Sun, 10 Nov 2024 07:36:13 +0800 Subject: [PATCH 27/95] Update README.md Signed-off-by: MH Signed-off-by: MH --- charts/tempo/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 1cfa9e4ce7..eac9481108 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) +![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Single Binary Mode @@ -155,4 +155,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. From e8d718534cd9e9b27b6fa75454134d331475353a Mon Sep 17 00:00:00 2001 From: Vladimir Varankin Date: Mon, 11 Nov 2024 09:11:55 +0100 Subject: [PATCH 28/95] update-helm-repo: fix oci image push Signed-off-by: Vladimir Varankin --- .github/workflows/update-helm-repo.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index d4bf5eb332..e32453c796 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -94,8 +94,7 @@ jobs: needs: [setup] runs-on: ubuntu-latest permissions: - contents: write # to push chart release, create release, and push tags to github - packages: write # to push package to ghcr + packages: write # allows GITHUB_TOKEN to push package to ghcr env: github_app_id: ${{ secrets.github_app_id }} if: needs.setup.outputs.changed == 'true' @@ -234,7 +233,9 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ env.AUTHTOKEN }} + # GitHub App installation token cannot push package to the org's package registry; + # using GITHUB_TOKEN here instead to avoid using PAT. + password: ${{ secrets.GITHUB_TOKEN }} - name: Push charts to GHCR run: | From 1a0ee068d0218897d1064c27c3c8184ea6c7f339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Puczyn=CC=81ski?= Date: Mon, 11 Nov 2024 09:35:18 +0100 Subject: [PATCH 29/95] rerun README.md generation by using helm-docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mateusz Puczyński --- 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 eac9481108..51460b7de4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -155,4 +155,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 dda0112436c7ef564b2008dd70a54876877b5506 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 11 Nov 2024 15:15:53 +0100 Subject: [PATCH 30/95] CI: only install gateway CRDs if k8s version >= 1.23 (#3420) * CI: only install gateway CRDs if k8s version >= 1.23 Follow-up of XXX The gateway CRDs installed use `x-kubernetes-validations` which is only [available as of 1.23](https://kubernetes .io/docs/reference/generated/kubernetes-api/v1.23/#jsonschemaprops-v1-apiextensions-k8s-io). This breaks CI when the kubectl version is lower than 1.23. We use these CI actions for grafana/mimir-distributed [with 1.20 for example] (https://github.com/grafana/mimir/blob/a7f1e3f79fe0a72f64d2f60c6ce65afa03e2dd8c/.github/workflows/helm-ci.yml#L11-L18) Signed-off-by: Dimitar Dimitrov * Update .github/workflows/lint-test.yaml Signed-off-by: Dimitar Dimitrov --------- Signed-off-by: Dimitar Dimitrov --- .github/workflows/lint-test.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index f6e54f3047..756c6f0b4f 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -72,9 +72,22 @@ jobs: kubectl_version: ${{ inputs.kind_kubectl_version }} node_image: ${{ inputs.kind_node_image }} - - name: Apply Gateway API CRDs + - name: Check Kubernetes version and apply Gateway API CRDs if: steps.list-changed.outputs.changed == 'true' - run: kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd + run: | + # Get Kubernetes version and extract the major.minor version + version=$(kubectl version -o json | jq -r '.serverVersion.major + "." + .serverVersion.minor' | tr -d '+') + major_version=$(echo $version | cut -d. -f1) + minor_version=$(echo $version | cut -d. -f2) + + # Compare version with 1.23. The gateway CRDs use x-kubernetes-validations, which is only supported from 1.23 onwards. + if [ "$major_version" -eq 1 ] && [ "$minor_version" -ge 23 ] || [ "$major_version" -gt 1 ]; then + echo "Kubernetes version $version >= 1.23, applying Gateway API CRDs" + kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd + else + echo "Kubernetes version $version < 1.23, skipping Gateway API CRDs installation" + echo "Please use an older version of Gateway API CRDs or upgrade your Kubernetes version" + fi - name: Run chart-testing (install) run: | From 8b2e85d32b955260206d384e8419936318efa74e Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 10 Jul 2024 18:01:59 +0300 Subject: [PATCH 31/95] 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 32/95] 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 33/95] 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 34/95] 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 35/95] 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 36/95] 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 37/95] 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 8ec3e74cbeabbad1b53c7c64aa1c426292ae464c Mon Sep 17 00:00:00 2001 From: Daniel Kovacs Date: Thu, 10 Oct 2024 16:28:34 +0200 Subject: [PATCH 38/95] feat: Added type setting to ingester service, added internalTrafficPolicy to ingester/distributor services. Signed-off-by: Daniel Kovacs --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 5 ++++- .../templates/distributor/service-distributor.yaml | 1 + .../templates/ingester/service-ingester.yaml | 2 ++ charts/tempo-distributed/values.yaml | 6 ++++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index da139d40c6..c8e070a774 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.1 +version: 1.21.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 ed4cc2d7f6..ca3591caa6 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.21.1](https://img.shields.io/badge/Version-1.21.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.21.2](https://img.shields.io/badge/Version-1.21.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 @@ -348,6 +348,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.resources | object | `{}` | Resource requests and limits for the distributor | | distributor.service.annotations | object | `{}` | Annotations for distributor service | | distributor.service.externalTrafficPolicy | string | `nil` | If type is LoadBalancer you can set it to 'Local' [preserve the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) | +| distributor.service.internalTrafficPolicy | string | `"Cluster"` | https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ | | distributor.service.labels | object | `{}` | Labels for distributor service | | distributor.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer | | distributor.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. | @@ -548,6 +549,8 @@ The memcached default args are removed and should be provided manually. The sett | ingester.replicas | int | `3` | Number of replicas for the ingester | | ingester.resources | object | `{}` | Resource requests and limits for the ingester | | ingester.service.annotations | object | `{}` | Annotations for ingester service | +| ingester.service.internalTrafficPolicy | string | `"Cluster"` | https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ | +| ingester.service.type | string | `"ClusterIP"` | Type of the service: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types | | ingester.terminationGracePeriodSeconds | int | `300` | Grace period to allow the ingester to shutdown before it is killed. Especially for the ingestor, this must be increased. It must be long enough so ingesters can be gracefully shutdown flushing/transferring all data and to successfully leave the member ring on shutdown. | | ingester.tolerations | list | `[]` | Tolerations for ingester pods | | ingester.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for ingester pods. Passed through `tpl` and, thus, to be configured as string | diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index a7174f2a00..1f126212e0 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -14,6 +14,7 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + internalTrafficPolicy: {{ .Values.distributor.service.internalTrafficPolicy }} type: {{ .Values.distributor.service.type }} ports: - name: http-metrics diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index c6a5f21b0a..bcabfa2ff9 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -15,6 +15,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + type: {{ .Values.ingester.service.type }} + internalTrafficPolicy: {{ .Values.ingester.service.internalTrafficPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 6d1e894649..fb890d7036 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -229,6 +229,10 @@ ingester: service: # -- Annotations for ingester service annotations: {} + # -- Type of the service: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: ClusterIP + # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + internalTrafficPolicy: Cluster # -- Adds the appProtocol field to the ingester service. This allows ingester to work with istio protocol selection. appProtocol: # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" @@ -478,6 +482,8 @@ distributor: loadBalancerSourceRanges: [] # -- If type is LoadBalancer you can set it to 'Local' [preserve the client source IP](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip) externalTrafficPolicy: null + # -- https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + internalTrafficPolicy: Cluster serviceDiscovery: # -- Annotations for distributorDiscovery service annotations: {} From 8562a6c90334dbc2f4dae98425b3383a06a8913f Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Wed, 13 Nov 2024 06:22:00 -0600 Subject: [PATCH 39/95] 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 73fd30af9487d7c0a5d0d76975340e6c779a2f06 Mon Sep 17 00:00:00 2001 From: Vladimir Varankin Date: Wed, 13 Nov 2024 13:44:59 +0100 Subject: [PATCH 40/95] workflows: bring back missing permissions Signed-off-by: Vladimir Varankin --- .github/workflows/update-helm-repo.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index e32453c796..b6ebd6412d 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -94,6 +94,7 @@ jobs: needs: [setup] runs-on: ubuntu-latest permissions: + contents: write # allows GITHUB_TOKEN to push chart release, create release, and push tags to github packages: write # allows GITHUB_TOKEN to push package to ghcr env: github_app_id: ${{ secrets.github_app_id }} From 61bac3e5696d218e20620907333c3995ba9bc90b Mon Sep 17 00:00:00 2001 From: Daniel Kovacs Date: Thu, 14 Nov 2024 19:41:51 +0100 Subject: [PATCH 41/95] Update charts/tempo-distributed/Chart.yaml Co-authored-by: Sheikh-Abubaker Signed-off-by: Daniel Kovacs --- 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 c8e070a774..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.2 +version: 1.22.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 3710e9608c2e11c5a966ab323733a80ee4d61f2b Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 15 Nov 2024 04:55:00 +0530 Subject: [PATCH 42/95] 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 ca3591caa6..d9d847dfe6 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.21.2](https://img.shields.io/badge/Version-1.21.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.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 From 7054d810124be9013f86ff3c638b600ae143a4a0 Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:32:13 -0600 Subject: [PATCH 43/95] chore: set unique cluster_label for loki-distributed memberlist Signed-off-by: Wylie Hobbs --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 9425712460..cafe985e8a 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.9.10 -version: 0.79.4 +version: 0.80.0 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index dfef5cc1b3..701878dbee 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -108,6 +108,7 @@ loki: store: memberlist memberlist: + cluster_label: "{{ .Release.Name }}.{{ .Release.Namespace }}" join_members: - {{ include "loki.fullname" . }}-memberlist From 91c495e534f28d4466deefb0f9fb02684f23bf3b Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 3 Apr 2024 09:42:17 -0600 Subject: [PATCH 44/95] update docs Signed-off-by: Wylie Hobbs --- charts/loki-distributed/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 08acf45949..a4e745758a 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.79.4](https://img.shields.io/badge/Version-0.79.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.10](https://img.shields.io/badge/AppVersion-2.9.10-informational?style=flat-square) +![Version: 0.80.0](https://img.shields.io/badge/Version-0.79.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.10](https://img.shields.io/badge/AppVersion-2.9.10-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -24,6 +24,9 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. +### To 0.80.0 +Introduces a default `cluster_label` for the ring memberlist, which will temporarily disrupt ingestion as it rolls out, unless you temporarily set `cluster_label_verification_disabled`. + ### From 0.78.x to 0.79.0 Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. From 76aa5c30d93cfb54e385484d68ce7e218d8391e4 Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Wed, 6 Nov 2024 15:24:59 -0700 Subject: [PATCH 45/95] update doc template Signed-off-by: Wylie Hobbs --- charts/loki-distributed/README.md | 2 +- charts/loki-distributed/README.md.gotmpl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index a4e745758a..fa5b4f0112 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.80.0](https://img.shields.io/badge/Version-0.79.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.10](https://img.shields.io/badge/AppVersion-2.9.10-informational?style=flat-square) +![Version: 0.80.0](https://img.shields.io/badge/Version-0.80.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.10](https://img.shields.io/badge/AppVersion-2.9.10-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl index 23153d19b2..7552cded61 100644 --- a/charts/loki-distributed/README.md.gotmpl +++ b/charts/loki-distributed/README.md.gotmpl @@ -22,6 +22,9 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. +### To 0.80.0 +Introduces a default `cluster_label` for the ring memberlist, which will temporarily disrupt ingestion as it rolls out, unless you temporarily set `cluster_label_verification_disabled`. + ### From 0.78.x to 0.79.0 Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. From da83f37514a2b11d60e236badf15a0d5430bd80d Mon Sep 17 00:00:00 2001 From: Wylie Hobbs Date: Fri, 15 Nov 2024 09:33:43 -0700 Subject: [PATCH 46/95] update docs Signed-off-by: Wylie Hobbs --- charts/loki-distributed/README.md | 3 ++- charts/loki-distributed/README.md.gotmpl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index fa5b4f0112..8ca6f9552f 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -25,7 +25,8 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. ### To 0.80.0 -Introduces a default `cluster_label` for the ring memberlist, which will temporarily disrupt ingestion as it rolls out, unless you temporarily set `cluster_label_verification_disabled`. + +Upgrading to chart 0.80.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. This will interrupt reads and writes. This config option is set to prevent cross talk between Loki and other memberlist clusters. ### From 0.78.x to 0.79.0 Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl index 7552cded61..87d916999e 100644 --- a/charts/loki-distributed/README.md.gotmpl +++ b/charts/loki-distributed/README.md.gotmpl @@ -23,7 +23,8 @@ helm repo add grafana https://grafana.github.io/helm-charts Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions. ### To 0.80.0 -Introduces a default `cluster_label` for the ring memberlist, which will temporarily disrupt ingestion as it rolls out, unless you temporarily set `cluster_label_verification_disabled`. + +Upgrading to chart 0.80.0 will set the memberlist cluster_label config option. During rollout your cluster will temporarilly be split into two memberlist clusters until all components are rolled out. This will interrupt reads and writes. This config option is set to prevent cross talk between Loki and other memberlist clusters. ### From 0.78.x to 0.79.0 Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary. From 5de6fffeb049e94b6de841d9b55d56d7e7d561b9 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 15 Nov 2024 21:09:26 +0000 Subject: [PATCH 47/95] [tempo-distributed] Allow extra configuration of memcached statefulset Signed-off-by: Zach Leslie --- .../memcached/statefulset-memcached.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml b/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml index 6827e6dc2e..6027dfea8b 100644 --- a/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml @@ -81,10 +81,17 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.memcached.extraVolumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.memcachedExporter.enabled }} - args: - --memcached.address=localhost:11211 - --web.listen-address=0.0.0.0:9150 + {{- with .Values.memcachedExporter.extraArgs }} + {{- toYaml . | nindent 12 }} + {{- end }} image: {{ include "tempo.imageReference" (dict "ctx" . "component" "memcached-exporter") }} imagePullPolicy: {{ .Values.memcachedExporter.image.pullPolicy }} name: exporter @@ -98,6 +105,10 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + {{- with .Values.memcached.extraVolumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} {{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }} {{- with .Values.memcached.topologySpreadConstraints }} topologySpreadConstraints: @@ -116,6 +127,10 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.memcached.extraVolumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} updateStrategy: type: RollingUpdate {{- end}} From 4fb84578148f5730460124286e7cd08ae4c6f1f5 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 15 Nov 2024 21:14:13 +0000 Subject: [PATCH 48/95] [tempo-distributed] values Signed-off-by: Zach Leslie --- charts/tempo-distributed/values.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index fb890d7036..6aaa6cf350 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1568,10 +1568,13 @@ memcached: topologyKey: topology.kubernetes.io/zone # -- Pod Disruption Budget maxUnavailable maxUnavailable: 1 + # -- Extra volumes for memcached pods + extraVolumeMounts: [] + # -- Extra volumes for memcached statefulSet + extraVolumes: [] service: # -- Annotations for memcached service annotations: {} - memcachedExporter: # -- Specifies whether the Memcached Exporter should be enabled enabled: false @@ -1593,7 +1596,8 @@ memcachedExporter: pullPolicy: IfNotPresent # -- Memcached Exporter resource requests and limits resources: {} - + # -- Additional CLI args for the memcached exporter + extraArgs: [] metaMonitoring: # ServiceMonitor configuration serviceMonitor: From ed4428583074af2761ec99c6e8abccbe83d7cb1f Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Fri, 15 Nov 2024 21:14:41 +0000 Subject: [PATCH 49/95] [tempo-distributed] Update version and readme Signed-off-by: Zach Leslie --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index b46aa73790..72e1e2b51e 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.0 +version: 1.22.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 d9d847dfe6..b77f4bb829 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![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) +![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) Grafana Tempo in MicroService mode @@ -580,6 +580,8 @@ The memcached default args are removed and should be provided manually. The sett | memcached.extraArgs | list | `[]` | Additional CLI args for memcached | | memcached.extraEnv | list | `[]` | Environment variables to add to memcached pods | | memcached.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to memcached pods | +| memcached.extraVolumeMounts | list | `[]` | Extra volumes for memcached pods | +| memcached.extraVolumes | list | `[]` | Extra volumes for memcached statefulSet | | memcached.host | string | `"memcached"` | | | memcached.image.pullPolicy | string | `"IfNotPresent"` | Memcached Docker image pull policy | | memcached.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` | @@ -595,6 +597,7 @@ The memcached default args are removed and should be provided manually. The sett | memcached.tolerations | list | `[]` | Toleration for memcached pods | | memcached.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string | | memcachedExporter.enabled | bool | `false` | Specifies whether the Memcached Exporter should be enabled | +| memcachedExporter.extraArgs | list | `[]` | Additional CLI args for the memcached exporter | | memcachedExporter.hostAliases | list | `[]` | hostAliases to add | | memcachedExporter.image.pullPolicy | string | `"IfNotPresent"` | Memcached Exporter Docker image pull policy | | memcachedExporter.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` | From bd5511a86f1d48a431c1ad4a1cfffcc5314c890a Mon Sep 17 00:00:00 2001 From: Tobias Amft Date: Wed, 20 Nov 2024 09:05:20 +0100 Subject: [PATCH 50/95] 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 51/95] [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 52/95] 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 53/95] [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 54/95] 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 55/95] 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 56/95] 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 57/95] 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 58/95] 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 59/95] 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 60/95] 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 61/95] 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 62/95] 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 63/95] 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 64/95] 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 65/95] [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 66/95] 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 67/95] 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 68/95] 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 69/95] 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 70/95] 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 71/95] 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 72/95] 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 73/95] 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 74/95] 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 75/95] 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 76/95] 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 77/95] 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 78/95] 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 79/95] 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 80/95] 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 81/95] 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 82/95] 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 83/95] 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 84/95] 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 85/95] 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 86/95] 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 87/95] 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 88/95] 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 89/95] 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 90/95] 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 91/95] 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 92/95] 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 93/95] 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 94/95] [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 4e2824317d2576d2a173ccc3cfdf45a592475145 Mon Sep 17 00:00:00 2001 From: Robert Lankford Date: Wed, 11 Dec 2024 13:58:28 -0800 Subject: [PATCH 95/95] 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.