Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add emit_tags_as_labels to envoy bootstrap config when using Consul Telemetry Collector #17888

Merged
merged 3 commits into from
Jun 27, 2023
Merged

Add emit_tags_as_labels to envoy bootstrap config when using Consul Telemetry Collector #17888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94584cf
Add emit_tags_as_labels to envoy
Jun 26, 2023
aed6a00
Update tests
Jun 26, 2023
2eb7a2a
Add changelog
Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/17888.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: Add capture group labels from Envoy cluster FQDNs to Envoy exported metric labels
```
3 changes: 2 additions & 1 deletion command/connect/envoy/bootstrap_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,8 @@ func appendTelemetryCollectorConfig(args *BootstrapTplArgs, telemetryCollectorBi
"envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback"
}
}
},
"emit_tags_as_labels": true
}
}`

Expand Down
6 changes: 4 additions & 2 deletions command/connect/envoy/bootstrap_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,8 @@ const (
"envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback"
}
}
},
"emit_tags_as_labels": true
}
}`

Expand Down Expand Up @@ -638,7 +639,8 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) {
"envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback"
}
}
},
"emit_tags_as_labels": true
}
}`,
StaticClustersJSON: `{
Expand Down
3 changes: 2 additions & 1 deletion command/connect/envoy/testdata/telemetry-collector.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"envoy_grpc": {
"cluster_name": "consul_telemetry_collector_loopback"
}
}
},
"emit_tags_as_labels": true
}
}
],
Expand Down