From 2d407bd308064bf014cd5f9718119b8fc625fea6 Mon Sep 17 00:00:00 2001
From: Matt Veitas <matt.veitas@everbridge.com>
Date: Mon, 18 Nov 2024 13:21:16 -0500
Subject: [PATCH] feat: Add otlp attribute deployment.environment.name to list
 of default labels (#14747)

---
 docs/sources/send-data/otel/_index.md | 1 +
 docs/sources/shared/configuration.md  | 2 +-
 pkg/loghttp/push/otlp_config.go       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/sources/send-data/otel/_index.md b/docs/sources/send-data/otel/_index.md
index 176cd0afd4..ce0b1de644 100644
--- a/docs/sources/send-data/otel/_index.md
+++ b/docs/sources/send-data/otel/_index.md
@@ -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
diff --git a/docs/sources/shared/configuration.md b/docs/sources/shared/configuration.md
index ec2fc098af..203d713023 100644
--- a/docs/sources/shared/configuration.md
+++ b/docs/sources/shared/configuration.md
@@ -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
diff --git a/pkg/loghttp/push/otlp_config.go b/pkg/loghttp/push/otlp_config.go
index f71efe8bee..4739e1f10d 100644
--- a/pkg/loghttp/push/otlp_config.go
+++ b/pkg/loghttp/push/otlp_config.go
@@ -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",