Skip to content

Commit

Permalink
feat: Add otlp attribute deployment.environment.name to list of defau…
Browse files Browse the repository at this point in the history
…lt labels (#14747)
  • Loading branch information
mveitas authored Nov 18, 2024
1 parent 76bc184 commit 2d407bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/sources/send-data/otel/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Since the OpenTelemetry protocol differs from the Loki storage model, here is ho
- cloud.region
- container.name
- deployment.environment
- deployment.environment.name
- k8s.cluster.name
- k8s.container.name
- k8s.cronjob.name
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/shared/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -2264,7 +2264,7 @@ write_failures_logging:
otlp_config:
# List of default otlp resource attributes to be picked as index labels
# CLI flag: -distributor.otlp.default_resource_attributes_as_index_labels
[default_resource_attributes_as_index_labels: <list of strings> | default = [service.name service.namespace service.instance.id deployment.environment cloud.region cloud.availability_zone k8s.cluster.name k8s.namespace.name k8s.pod.name k8s.container.name container.name k8s.replicaset.name k8s.deployment.name k8s.statefulset.name k8s.daemonset.name k8s.cronjob.name k8s.job.name]]
[default_resource_attributes_as_index_labels: <list of strings> | default = [service.name service.namespace service.instance.id deployment.environment deployment.environment.name cloud.region cloud.availability_zone k8s.cluster.name k8s.namespace.name k8s.pod.name k8s.container.name container.name k8s.replicaset.name k8s.deployment.name k8s.statefulset.name k8s.daemonset.name k8s.cronjob.name k8s.job.name]]
# Enable writes to Kafka during Push requests.
# CLI flag: -distributor.kafka-writes-enabled
Expand Down
1 change: 1 addition & 0 deletions pkg/loghttp/push/otlp_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func (cfg *GlobalOTLPConfig) RegisterFlags(fs *flag.FlagSet) {
"service.namespace",
"service.instance.id",
"deployment.environment",
"deployment.environment.name",
"cloud.region",
"cloud.availability_zone",
"k8s.cluster.name",
Expand Down

0 comments on commit 2d407bd

Please sign in to comment.