diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 0ef56dad25..189fa68496 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.4.1 -appVersion: "0.42.0" -home: https://grafana.com/docs/agent/v0.42/ -icon: https://raw.githubusercontent.com/grafana/agent/v0.42.0/docs/sources/assets/logo_and_name.png +version: 0.4.4 +appVersion: "0.43.3" +home: https://grafana.com/docs/agent/v0.43/ +icon: https://raw.githubusercontent.com/grafana/agent/v0.43.3/docs/sources/assets/logo_and_name.png sources: - - https://github.com/grafana/agent/tree/v0.42.0/static/operator + - https://github.com/grafana/agent/tree/v0.43.3/static/operator maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index c64a68beb3..be15167325 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -1,6 +1,6 @@ # grafana-agent-operator -![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.42.0](https://img.shields.io/badge/AppVersion-0.42.0-informational?style=flat-square) +![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.43.3](https://img.shields.io/badge/AppVersion-0.43.3-informational?style=flat-square) A Helm chart for Grafana Agent Operator @@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator ## Source Code -* +* Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | image.pullSecrets | list | `[]` | Image pull secrets | | image.registry | string | `"docker.io"` | Image registry | | image.repository | string | `"grafana/agent-operator"` | Image repo | -| image.tag | string | `"v0.42.0"` | Image tag | +| image.tag | string | `"v0.43.3"` | Image tag | | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets | | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | nodeSelector configuration | diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index d2112f90a9..2852466b03 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -37,7 +37,7 @@ image: # -- Image repo repository: grafana/agent-operator # -- Image tag - tag: v0.42.0 + tag: v0.43.3 # -- Image pull policy pullPolicy: IfNotPresent # -- Image pull secrets diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml index e6e44c81da..90dadf2cd6 100644 --- a/charts/grafana-sampling/Chart.yaml +++ b/charts/grafana-sampling/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-sampling description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. type: application -version: 1.0.1 +version: 1.1.0 appVersion: "v1.3.0" sources: - https://github.com/grafana/alloy diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 81e00e5800..24607dddc0 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square) +![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) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. @@ -139,7 +139,11 @@ A major chart version change indicates that there is an incompatible breaking ch | alloy-statefulset.rbac.create | bool | `false` | | | alloy-statefulset.service.clusterIP | string | `"None"` | | | alloy-statefulset.serviceAccount.create | bool | `false` | | -| metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name"]` | Additional dimensions to add to generated metrics. | +| batch.deployment | object | `{"send_batch_max_size":0,"send_batch_size":8192,"timeout":"200ms"}` | Configure batch processing options. | +| batch.statefulset.send_batch_max_size | int | `0` | | +| batch.statefulset.send_batch_size | int | `8192` | | +| batch.statefulset.timeout | string | `"200ms"` | | +| metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name","k8s.pod.name"]` | Additional dimensions to add to generated metrics. | | metricsGeneration.enabled | bool | `true` | Toggle generation of spanmetrics and servicegraph metrics. | | metricsGeneration.legacy | bool | `true` | Use legacy metric names that match those used by the Tempo metrics generator. | | sampling.decisionWait | string | `"15s"` | Wait time since the first span of a trace before making a sampling decision. | diff --git a/charts/grafana-sampling/templates/_otelcol_processor_batch.alloy.txt b/charts/grafana-sampling/templates/_otelcol_processor_batch.alloy.txt index cc487634e6..23c7d34ca8 100644 --- a/charts/grafana-sampling/templates/_otelcol_processor_batch.alloy.txt +++ b/charts/grafana-sampling/templates/_otelcol_processor_batch.alloy.txt @@ -1,6 +1,10 @@ {{- define "deployment.processor.batch" -}} otelcol.processor.batch "default" { // https://grafana.com/docs/alloy/latest/reference/components/otelcol.processor.batch/ + timeout = {{ .Values.batch.deployment.timeout | quote }} + send_batch_size = {{ .Values.batch.deployment.send_batch_size }} + send_batch_max_size = {{ .Values.batch.deployment.send_batch_max_size }} + output { traces = [otelcol.exporter.loadbalancing.default.input] } @@ -11,6 +15,10 @@ otelcol.processor.batch "default" { {{- define "statefulset.processor.batch" -}} otelcol.processor.batch "default" { // https://grafana.com/docs/alloy/latest/reference/components/otelcol.processor.batch/ + timeout = {{ .Values.batch.statefulset.timeout | quote }} + send_batch_size = {{ .Values.batch.statefulset.send_batch_size }} + send_batch_max_size = {{ .Values.batch.statefulset.send_batch_max_size }} + output { {{ if .Values.metricsGeneration.enabled }} metrics = [otelcol.exporter.prometheus.grafana_cloud_prometheus.input] diff --git a/charts/grafana-sampling/values.yaml b/charts/grafana-sampling/values.yaml index 0644b42d79..23b0d0cac4 100644 --- a/charts/grafana-sampling/values.yaml +++ b/charts/grafana-sampling/values.yaml @@ -9,6 +9,7 @@ metricsGeneration: - service.version - deployment.environment - k8s.cluster.name + - k8s.pod.name sampling: # -- Toggle tail sampling. @@ -49,6 +50,17 @@ sampling: } } +batch: + # -- Configure batch processing options. + deployment: + timeout: 200ms + send_batch_size: 8192 + send_batch_max_size: 0 + statefulset: + timeout: 200ms + send_batch_size: 8192 + send_batch_max_size: 0 + # @ignored Ignore alloy deployment alloy-deployment: # -- Do not change this. diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 4da92579f6..87696c7225 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.5.0 -appVersion: 11.1.5 +version: 8.5.1 +appVersion: 11.2.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com diff --git a/charts/promtail/Chart.yaml b/charts/promtail/Chart.yaml index 66d1c7a757..bd862703f2 100644 --- a/charts/promtail/Chart.yaml +++ b/charts/promtail/Chart.yaml @@ -3,7 +3,7 @@ name: promtail description: Promtail is an agent which ships the contents of local logs to a Loki instance type: application appVersion: 3.0.0 -version: 6.16.5 +version: 6.16.6 home: https://grafana.com/loki sources: - https://github.com/grafana/loki diff --git a/charts/promtail/README.md b/charts/promtail/README.md index 8f1fef3941..ed9aa7abdc 100644 --- a/charts/promtail/README.md +++ b/charts/promtail/README.md @@ -1,6 +1,6 @@ # promtail -![Version: 6.16.5](https://img.shields.io/badge/Version-6.16.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) +![Version: 6.16.6](https://img.shields.io/badge/Version-6.16.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) Promtail is an agent which ships the contents of local logs to a Loki instance diff --git a/charts/promtail/templates/_pod.tpl b/charts/promtail/templates/_pod.tpl index 223923fde1..6c75908bad 100644 --- a/charts/promtail/templates/_pod.tpl +++ b/charts/promtail/templates/_pod.tpl @@ -27,7 +27,7 @@ spec: {{- end }} {{- with .Values.initContainer }} initContainers: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} {{- with .Values.global.imagePullSecrets | default .Values.imagePullSecrets }} imagePullSecrets: @@ -167,6 +167,6 @@ spec: {{- toYaml . | nindent 4 }} {{- end }} {{- with .Values.extraVolumes }} - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} {{- end }} diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index c76032b268..c8bf8e01dc 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.17.0 -appVersion: v0.18.0 +version: 0.18.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 a3ba160691..e988430065 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.17.0](https://img.shields.io/badge/Version-0.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.18.0](https://img.shields.io/badge/AppVersion-v0.18.0-informational?style=flat-square) +![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) Grafana rollout-operator diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6299f150b9..68a6eb7a95 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.17.0 -appVersion: 2.5.0 +version: 1.18.1 +appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index a88d1a48f1..0e46843bb4 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.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.18.1](https://img.shields.io/badge/Version-1.18.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 @@ -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.18.0 + +Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. +We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading. + ### From Chart versions < 1.15.2 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 5cdb777ad3..e6b2e33433 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.18.0 + +Please be aware that we've updated the minor version to Tempo 2.6, which includes breaking changes. +We recommend reviewing the [release notes](https://github.com/grafana/tempo/releases/tag/v2.6.0/) before upgrading. + ### From Chart versions < 1.15.2 Switch to new overrides format, see https://grafana.com/docs/tempo/latest/configuration/#overrides. diff --git a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml index 5878f37f0c..cf34703e60 100644 --- a/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml +++ b/charts/tempo-distributed/ci/parquet-dedicated-columns.yaml @@ -1,7 +1,7 @@ storage: trace: block: - version: vParquet3 + version: vParquet4 dedicated_columns: - name: cluster type: string diff --git a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl index fc89667336..4d417ada2c 100644 --- a/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl +++ b/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl @@ -176,6 +176,7 @@ app.kubernetes.io/part-of: memberlist {{- if not .component }} {{- printf "Component name cannot be empty if rolloutZoneName (%s) is set" .rolloutZoneName | fail }} {{- end }} +name: "{{ .component }}-{{ .rolloutZoneName }}" {{- /* Currently required for rollout-operator. https://github.com/grafana/rollout-operator/issues/15 */}} rollout-group: ingester zone: {{ .rolloutZoneName }} {{- end }}