Add emit_tags_as_labels to envoy bootstrap config when using Consul T…

…elemetry Collector (#17888)
hashicorp · Jun 27, 2023 · 55056be · 55056be
1 parent c8cfa60
commit 55056be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.changelog/17888.txt b/.changelog/17888.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: Add capture group labels from Envoy cluster FQDNs to Envoy exported metric labels
+```
diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go
@@ -847,7 +847,8 @@ func appendTelemetryCollectorConfig(args *BootstrapTplArgs, telemetryCollectorBi
 			"envoy_grpc": {
 			  "cluster_name": "consul_telemetry_collector_loopback"
 			}
-		  }
+		  },
+		  "emit_tags_as_labels": true
 		}
 	  }`
 

diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go
@@ -539,7 +539,8 @@ const (
 		"envoy_grpc": {
 		  "cluster_name": "consul_telemetry_collector_loopback"
 		}
-	  }
+	  },
+	  "emit_tags_as_labels": true
 	}
   }`
 
@@ -638,7 +639,8 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) {
 						"envoy_grpc": {
 						  "cluster_name": "consul_telemetry_collector_loopback"
 						}
-					  }
+					  },
+					  "emit_tags_as_labels": true
 					}
 				  }`,
 				StaticClustersJSON: `{

diff --git a/command/connect/envoy/testdata/telemetry-collector.golden b/command/connect/envoy/testdata/telemetry-collector.golden
@@ -89,7 +89,8 @@
           "envoy_grpc": {
             "cluster_name": "consul_telemetry_collector_loopback"
           }
-        }
+        },
+        "emit_tags_as_labels": true
       }
     }
   ],
-Original file line number
+Diff line change
@@ Expand Up @@
     			"envoy_grpc": {
     			  "cluster_name": "consul_telemetry_collector_loopback"
     			}
-    		  }
+    		  },
+    		  "emit_tags_as_labels": true
     		}
     	  }`
@@ Expand Down @@