luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Backport of Add emit_tags_as_labels to envoy bootstrap config when using Consul Telemetry Collector into release/1.16.x (#17901) 

* backport of commit 94584cf5402c11e5a3c93467d43a8ad97af8d6b3

* backport of commit aed6a006935182f2ce0efd14c3cbef8168c78975

* backport of commit 2eb7a2a0670ce5ad69f7855615514722e2b4ace3

---------

Co-authored-by: josh <josh.timmons@hashicorp.com>
This commit is contained in:
hc-github-team-consul-core 2023-06-27 11:51:00 -05:00 committed by GitHub
parent 5344eca78e
commit 4da9985ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/17888.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: Add capture group labels from Envoy cluster FQDNs to Envoy exported metric labels
```

3
command/connect/envoy/bootstrap_config.go
View File

@ -847,7 +847,8 @@ func appendTelemetryCollectorConfig(args *BootstrapTplArgs, telemetryCollectorBi
"envoy_grpc": { "envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback" "cluster_name": "consul_telemetry_collector_loopback"
} }
} },
"emit_tags_as_labels": true
} }
}` }`

6
command/connect/envoy/bootstrap_config_test.go
View File

@ -539,7 +539,8 @@ const (
"envoy_grpc": { "envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback" "cluster_name": "consul_telemetry_collector_loopback"
} }
} },
"emit_tags_as_labels": true
} }
}` }`
@ -638,7 +639,8 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) {
"envoy_grpc": { "envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback" "cluster_name": "consul_telemetry_collector_loopback"
} }
} },
"emit_tags_as_labels": true
} }
}`, }`,
StaticClustersJSON: `{ StaticClustersJSON: `{

3
command/connect/envoy/testdata/telemetry-collector.golden vendored
View File

@ -89,7 +89,8 @@
"envoy_grpc": { "envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback" "cluster_name": "consul_telemetry_collector_loopback"
} }
} },
"emit_tags_as_labels": true
} }
} }
], ],