Merge branch 'release/1.15.x' into jm/1.15.4

hashicorp · Jun 27, 2023 · ff7392a · ff7392a
2 parents a92dd87 + e72edb4
commit ff7392a
Show file tree

Hide file tree

Showing 5 changed files with 12 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
@@ -844,7 +844,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
@@ -536,7 +536,8 @@ const (
 		"envoy_grpc": {
 		  "cluster_name": "consul_telemetry_collector_loopback"
 		}
-	  }
+	  },
+	  "emit_tags_as_labels": true
 	}
   }`
 
@@ -635,7 +636,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
       }
     }
   ],

diff --git a/website/content/docs/connect/config-entries/service-defaults.mdx b/website/content/docs/connect/config-entries/service-defaults.mdx
@@ -1418,6 +1418,7 @@ represents a location outside the Consul cluster. Services can dial destinations
   metadata:
     name: test-destination
   spec:
+    protocol: tcp
     destination:
       addresses:
         - "test.com"