Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[grafana-sampling] add batch config options and k8s.pod.name to metrics dimensions #3324

Merged
merged 3 commits into from
Sep 24, 2024
Merged

[grafana-sampling] add batch config options and k8s.pod.name to metrics dimensions #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa27eb
[grafana-sampling] add batch config optoins and k8s.pod.name to metri…
rlankfo Sep 24, 2024
2abfac2
bump version
rlankfo Sep 24, 2024
82e9579
Merge branch 'main' into rlankfo/tail-sampling-config-updates
rlankfo Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/grafana-sampling/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions charts/grafana-sampling/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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. |
Expand Down
8 changes: 8 additions & 0 deletions charts/grafana-sampling/templates/_otelcol_processor_batch.alloy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
}
Expand All @@ -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]
Expand Down
12 changes: 12 additions & 0 deletions charts/grafana-sampling/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metricsGeneration:
- service.version
- deployment.environment
- k8s.cluster.name
- k8s.pod.name

sampling:
# -- Toggle tail sampling.
Expand Down Expand Up @@ -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.
Expand Down
Loading