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:
parent
5344eca78e
commit
4da9985ebf
|
@ -0,0 +1,3 @@
|
|||
```release-note:improvement
|
||||
connect: Add capture group labels from Envoy cluster FQDNs to Envoy exported metric labels
|
||||
```
|
|
@ -847,7 +847,8 @@ func appendTelemetryCollectorConfig(args *BootstrapTplArgs, telemetryCollectorBi
|
|||
"envoy_grpc": {
|
||||
"cluster_name": "consul_telemetry_collector_loopback"
|
||||
}
|
||||
}
|
||||
},
|
||||
"emit_tags_as_labels": true
|
||||
}
|
||||
}`
|
||||
|
||||
|
|
|
@ -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: `{
|
||||
|
|
|
@ -89,7 +89,8 @@
|
|||
"envoy_grpc": {
|
||||
"cluster_name": "consul_telemetry_collector_loopback"
|
||||
}
|
||||
}
|
||||
},
|
||||
"emit_tags_as_labels": true
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue