mirror of https://github.com/status-im/consul.git
Update envoy metrics label extraction for peered clusters and listeners (#13818)
Now that peered upstreams can generate envoy resources (#13758), we need a way to disambiguate local from peered resources in our metrics. The key difference is that datacenter and partition will be replaced with peer, since in the context of peered resources partition is ambiguous (could refer to the partition in a remote cluster or one that exists locally). The partition and datacenter of the proxy will always be that of the source service. Regexes were updated to make emitting datacenter and partition labels mutually exclusive with peer labels. Listener filter names were updated to better match the existing regex. Cluster names assigned to peered upstreams were updated to be synthesized from local peer name (it previously used the externally provided primary SNI, which contained the peer name from the other side of the peering). Integration tests were updated to assert for the new peer labels.
This commit is contained in:
parent
f7f26220ba
commit
8ed49ea4d0
|
@ -26,6 +26,7 @@ import (
|
||||||
"github.com/hashicorp/consul/agent/connect"
|
"github.com/hashicorp/consul/agent/connect"
|
||||||
"github.com/hashicorp/consul/agent/proxycfg"
|
"github.com/hashicorp/consul/agent/proxycfg"
|
||||||
"github.com/hashicorp/consul/agent/structs"
|
"github.com/hashicorp/consul/agent/structs"
|
||||||
|
"github.com/hashicorp/consul/proto/pbpeering"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -731,18 +732,19 @@ func (s *ResourceGenerator) makeUpstreamClusterForPeerService(
|
||||||
// In the happy path don't return yet as we need to inject TLS config still.
|
// In the happy path don't return yet as we need to inject TLS config still.
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(peering): if we replicated service metadata separately from the
|
tbs, ok := cfgSnap.ConnectProxy.UpstreamPeerTrustBundles.Get(uid.Peer)
|
||||||
// instances we wouldn't have to flip/flop this cluster name like this.
|
if !ok {
|
||||||
clusterName := peerMeta.PrimarySNI()
|
// this should never happen since we loop through upstreams with
|
||||||
if clusterName == "" {
|
// set trust bundles
|
||||||
clusterName = uid.EnvoyID()
|
return c, fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clusterName := generatePeeredClusterName(uid, tbs)
|
||||||
|
|
||||||
s.Logger.Trace("generating cluster for", "cluster", clusterName)
|
s.Logger.Trace("generating cluster for", "cluster", clusterName)
|
||||||
if c == nil {
|
if c == nil {
|
||||||
c = &envoy_cluster_v3.Cluster{
|
c = &envoy_cluster_v3.Cluster{
|
||||||
Name: clusterName,
|
Name: clusterName,
|
||||||
AltStatName: clusterName,
|
|
||||||
ConnectTimeout: durationpb.New(time.Duration(cfg.ConnectTimeoutMs) * time.Millisecond),
|
ConnectTimeout: durationpb.New(time.Duration(cfg.ConnectTimeoutMs) * time.Millisecond),
|
||||||
CommonLbConfig: &envoy_cluster_v3.Cluster_CommonLbConfig{
|
CommonLbConfig: &envoy_cluster_v3.Cluster_CommonLbConfig{
|
||||||
HealthyPanicThreshold: &envoy_type_v3.Percent{
|
HealthyPanicThreshold: &envoy_type_v3.Percent{
|
||||||
|
@ -1598,3 +1600,15 @@ func (s *ResourceGenerator) setHttp2ProtocolOptions(c *envoy_cluster_v3.Cluster)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// generatePeeredClusterName returns an SNI-like cluster name which mimics PeeredServiceSNI
|
||||||
|
// but excludes partition information which could be ambiguous (local vs remote partition).
|
||||||
|
func generatePeeredClusterName(uid proxycfg.UpstreamID, tb *pbpeering.PeeringTrustBundle) string {
|
||||||
|
return strings.Join([]string{
|
||||||
|
uid.Name,
|
||||||
|
uid.NamespaceOrDefault(),
|
||||||
|
uid.Peer,
|
||||||
|
"external",
|
||||||
|
tb.TrustDomain,
|
||||||
|
}, ".")
|
||||||
|
}
|
||||||
|
|
|
@ -95,15 +95,15 @@ func (s *ResourceGenerator) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
peerMeta := cfgSnap.ConnectProxy.UpstreamPeerMeta(uid)
|
tbs, ok := cfgSnap.ConnectProxy.UpstreamPeerTrustBundles.Get(uid.Peer)
|
||||||
|
if !ok {
|
||||||
// TODO(peering): if we replicated service metadata separately from the
|
// this should never happen since we loop through upstreams with
|
||||||
// instances we wouldn't have to flip/flop this cluster name like this.
|
// set trust bundles
|
||||||
clusterName := peerMeta.PrimarySNI()
|
return nil, fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
|
||||||
if clusterName == "" {
|
|
||||||
clusterName = uid.EnvoyID()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clusterName := generatePeeredClusterName(uid, tbs)
|
||||||
|
|
||||||
// Also skip peer instances with a hostname as their address. EDS
|
// Also skip peer instances with a hostname as their address. EDS
|
||||||
// cannot resolve hostnames, so we provide them through CDS instead.
|
// cannot resolve hostnames, so we provide them through CDS instead.
|
||||||
if _, ok := cfgSnap.ConnectProxy.PeerUpstreamEndpointsUseHostnames[uid]; ok {
|
if _, ok := cfgSnap.ConnectProxy.PeerUpstreamEndpointsUseHostnames[uid]; ok {
|
||||||
|
|
|
@ -294,21 +294,27 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(peering): if we replicated service metadata separately from the
|
tbs, ok := cfgSnap.ConnectProxy.UpstreamPeerTrustBundles.Get(uid.Peer)
|
||||||
// instances we wouldn't have to flip/flop this cluster name like this.
|
if !ok {
|
||||||
clusterName := peerMeta.PrimarySNI()
|
// this should never happen since we loop through upstreams with
|
||||||
if clusterName == "" {
|
// set trust bundles
|
||||||
clusterName = uid.EnvoyID()
|
return nil, fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clusterName := generatePeeredClusterName(uid, tbs)
|
||||||
|
|
||||||
// Generate the upstream listeners for when they are explicitly set with a local bind port or socket path
|
// Generate the upstream listeners for when they are explicitly set with a local bind port or socket path
|
||||||
if upstreamCfg != nil && upstreamCfg.HasLocalPortOrSocket() {
|
if upstreamCfg != nil && upstreamCfg.HasLocalPortOrSocket() {
|
||||||
filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
|
filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
|
||||||
clusterName: clusterName,
|
clusterName: clusterName,
|
||||||
filterName: uid.EnvoyID(),
|
filterName: fmt.Sprintf("%s.%s.%s",
|
||||||
routeName: uid.EnvoyID(),
|
upstreamCfg.DestinationName,
|
||||||
protocol: cfg.Protocol,
|
upstreamCfg.DestinationNamespace,
|
||||||
useRDS: false,
|
upstreamCfg.DestinationPeer),
|
||||||
|
routeName: uid.EnvoyID(),
|
||||||
|
protocol: cfg.Protocol,
|
||||||
|
useRDS: false,
|
||||||
|
statPrefix: "upstream_peered.",
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -331,9 +337,13 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
|
||||||
filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
|
filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
|
||||||
routeName: uid.EnvoyID(),
|
routeName: uid.EnvoyID(),
|
||||||
clusterName: clusterName,
|
clusterName: clusterName,
|
||||||
filterName: uid.EnvoyID(),
|
filterName: fmt.Sprintf("%s.%s.%s",
|
||||||
protocol: cfg.Protocol,
|
uid.Name,
|
||||||
useRDS: false,
|
uid.NamespaceOrDefault(),
|
||||||
|
uid.Peer),
|
||||||
|
protocol: cfg.Protocol,
|
||||||
|
useRDS: false,
|
||||||
|
statPrefix: "upstream_peered.",
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -28,12 +28,11 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
||||||
"name": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"altStatName": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
|
||||||
"type": "LOGICAL_DNS",
|
"type": "LOGICAL_DNS",
|
||||||
"connectTimeout": "5s",
|
"connectTimeout": "5s",
|
||||||
"loadAssignment": {
|
"loadAssignment": {
|
||||||
"clusterName": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"clusterName": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"lbEndpoints": [
|
"lbEndpoints": [
|
||||||
|
@ -101,8 +100,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
||||||
"name": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"altStatName": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
|
||||||
"type": "EDS",
|
"type": "EDS",
|
||||||
"edsClusterConfig": {
|
"edsClusterConfig": {
|
||||||
"edsConfig": {
|
"edsConfig": {
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
||||||
"name": "api-a.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"name": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"altStatName": "api-a.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
|
||||||
"type": "EDS",
|
"type": "EDS",
|
||||||
"edsClusterConfig": {
|
"edsClusterConfig": {
|
||||||
"edsConfig": {
|
"edsConfig": {
|
||||||
|
@ -61,8 +60,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
||||||
"name": "db.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"name": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"altStatName": "db.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
|
||||||
"type": "EDS",
|
"type": "EDS",
|
||||||
"edsClusterConfig": {
|
"edsClusterConfig": {
|
||||||
"edsConfig": {
|
"edsConfig": {
|
||||||
|
@ -144,8 +142,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
|
||||||
"name": "no-endpoints?peer=peer-a",
|
"name": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"altStatName": "no-endpoints?peer=peer-a",
|
|
||||||
"type": "EDS",
|
"type": "EDS",
|
||||||
"edsClusterConfig": {
|
"edsClusterConfig": {
|
||||||
"edsConfig": {
|
"edsConfig": {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
||||||
"clusterName": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"clusterName": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"lbEndpoints": [
|
"lbEndpoints": [
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
||||||
"clusterName": "api-a.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"clusterName": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"lbEndpoints": [
|
"lbEndpoints": [
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
||||||
"clusterName": "db.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
"clusterName": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
"lbEndpoints": [
|
"lbEndpoints": [
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
|
||||||
"clusterName": "no-endpoints?peer=peer-a",
|
"clusterName": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
"name": "envoy.filters.network.tcp_proxy",
|
"name": "envoy.filters.network.tcp_proxy",
|
||||||
"typedConfig": {
|
"typedConfig": {
|
||||||
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
||||||
"statPrefix": "upstream.payments?peer=cloud",
|
"statPrefix": "upstream_peered.payments.default.cloud",
|
||||||
"cluster": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
"cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -104,8 +104,8 @@
|
||||||
"name": "envoy.filters.network.tcp_proxy",
|
"name": "envoy.filters.network.tcp_proxy",
|
||||||
"typedConfig": {
|
"typedConfig": {
|
||||||
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
||||||
"statPrefix": "upstream.refunds?peer=cloud",
|
"statPrefix": "upstream_peered.refunds.default.cloud",
|
||||||
"cluster": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
"cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
"name": "envoy.filters.network.tcp_proxy",
|
"name": "envoy.filters.network.tcp_proxy",
|
||||||
"typedConfig": {
|
"typedConfig": {
|
||||||
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
||||||
"statPrefix": "upstream.api-a?peer=peer-a",
|
"statPrefix": "upstream_peered.api-a.default.peer-a",
|
||||||
"cluster": "api-a.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
"cluster": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -42,8 +42,8 @@
|
||||||
"name": "envoy.filters.network.tcp_proxy",
|
"name": "envoy.filters.network.tcp_proxy",
|
||||||
"typedConfig": {
|
"typedConfig": {
|
||||||
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
||||||
"statPrefix": "upstream.no-endpoints?peer=peer-a",
|
"statPrefix": "upstream_peered.no-endpoints.default.peer-a",
|
||||||
"cluster": "no-endpoints?peer=peer-a"
|
"cluster": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -79,8 +79,8 @@
|
||||||
"name": "envoy.filters.network.tcp_proxy",
|
"name": "envoy.filters.network.tcp_proxy",
|
||||||
"typedConfig": {
|
"typedConfig": {
|
||||||
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
|
||||||
"statPrefix": "upstream.db?peer=peer-a",
|
"statPrefix": "upstream_peered.db.default.peer-a",
|
||||||
"cluster": "db.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
"cluster": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -345,7 +345,7 @@ func resourceTagSpecifiers(omitDeprecatedTags bool) ([]string, error) {
|
||||||
// Cluster metrics are prefixed by consul.destination
|
// Cluster metrics are prefixed by consul.destination
|
||||||
//
|
//
|
||||||
// Cluster metric name format:
|
// Cluster metric name format:
|
||||||
// <subset>.<service>.<namespace>.<partition>.<datacenter>.<internal|internal-<version>|external>.<trustdomain>.consul
|
// <subset>.<service>.<namespace>.<partition>.<datacenter|peering>.<internal|internal-<version>|external>.<trustdomain>.consul
|
||||||
//
|
//
|
||||||
// Examples:
|
// Examples:
|
||||||
// (default partition)
|
// (default partition)
|
||||||
|
@ -360,6 +360,8 @@ func resourceTagSpecifiers(omitDeprecatedTags bool) ([]string, error) {
|
||||||
// - cluster.v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
// - cluster.v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
||||||
// - cluster.f8f8f8f8~v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
// - cluster.f8f8f8f8~v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
||||||
// - cluster.passthrough~pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
// - cluster.passthrough~pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
||||||
|
// (peered)
|
||||||
|
// - cluster.pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0
|
||||||
{"consul.destination.custom_hash",
|
{"consul.destination.custom_hash",
|
||||||
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:(%s)~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.%s\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:(%s)~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.%s\.%s\.consul\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
@ -377,12 +379,16 @@ func resourceTagSpecifiers(omitDeprecatedTags bool) ([]string, error) {
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.destination.partition",
|
{"consul.destination.partition",
|
||||||
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:(%s)\.)?%s\.%s\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:(%s)\.)?%s\.internal[^.]*\.%s\.consul\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.destination.datacenter",
|
{"consul.destination.datacenter",
|
||||||
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?(%s)\.%s\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?(%s)\.internal[^.]*\.%s\.consul\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
|
{"consul.destination.peer",
|
||||||
|
fmt.Sprintf(`^cluster\.(%s\.(?:%s\.)?(%s)\.external\.%s\.consul\.)`,
|
||||||
|
reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.destination.routing_type",
|
{"consul.destination.routing_type",
|
||||||
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.(%s)\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.(?:passthrough~)?((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.(%s)\.%s\.consul\.)`,
|
||||||
|
@ -408,16 +414,26 @@ func resourceTagSpecifiers(omitDeprecatedTags bool) ([]string, error) {
|
||||||
// Examples:
|
// Examples:
|
||||||
// - tcp.upstream.db.dc1.downstream_cx_total: 0
|
// - tcp.upstream.db.dc1.downstream_cx_total: 0
|
||||||
// - http.upstream.web.frontend.west.dc1.downstream_cx_total: 0
|
// - http.upstream.web.frontend.west.dc1.downstream_cx_total: 0
|
||||||
|
//
|
||||||
|
// Peered Listener metric name format:
|
||||||
|
// <tcp|http>.upstream_peered.<service>.<namespace>.peer
|
||||||
|
//
|
||||||
|
// Examples:
|
||||||
|
// - http.upstream_peered.web.frontend.cloudpeer.downstream_cx_total: 0
|
||||||
{"consul.upstream.service",
|
{"consul.upstream.service",
|
||||||
fmt.Sprintf(`^(?:tcp|http)\.upstream\.((%s)(?:\.%s)?(?:\.%s)?\.%s\.)`,
|
fmt.Sprintf(`^(?:tcp|http)\.upstream(?:_peered)?\.((%s)(?:\.%s)?(?:\.%s)?\.%s\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.upstream.datacenter",
|
{"consul.upstream.datacenter",
|
||||||
fmt.Sprintf(`^(?:tcp|http)\.upstream\.(%s(?:\.%s)?(?:\.%s)?\.(%s)\.)`,
|
fmt.Sprintf(`^(?:tcp|http)\.upstream\.(%s(?:\.%s)?(?:\.%s)?\.(%s)\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
|
{"consul.upstream.peer",
|
||||||
|
fmt.Sprintf(`^(?:tcp|http)\.upstream_peered\.(%s(?:\.%s)?\.(%s)\.)`,
|
||||||
|
reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.upstream.namespace",
|
{"consul.upstream.namespace",
|
||||||
fmt.Sprintf(`^(?:tcp|http)\.upstream\.(%s(?:\.(%s))?(?:\.%s)?\.%s\.)`,
|
fmt.Sprintf(`^(?:tcp|http)\.upstream(?:_peered)?\.(%s(?:\.(%s))?(?:\.%s)?\.%s\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.upstream.partition",
|
{"consul.upstream.partition",
|
||||||
|
@ -446,8 +462,8 @@ func resourceTagSpecifiers(omitDeprecatedTags bool) ([]string, error) {
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.datacenter",
|
{"consul.datacenter",
|
||||||
fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?(%s)\.%s\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?(%s)\.internal[^.]*\.%s\.consul\.)`,
|
||||||
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
reSegment, reSegment, reSegment, reSegment, reSegment, reSegment, reSegment)},
|
||||||
|
|
||||||
{"consul.routing_type",
|
{"consul.routing_type",
|
||||||
fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.(%s)\.%s\.consul\.)`,
|
fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.(?:%s\.)?%s\.(%s)\.%s\.consul\.)`,
|
||||||
|
|
|
@ -1396,6 +1396,40 @@ func TestConsulTagSpecifiers(t *testing.T) {
|
||||||
"consul.destination.trust_domain": {"f8f8f8f8~v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "e5b08d03-bfc3-c870-1833-baddb116e648"},
|
"consul.destination.trust_domain": {"f8f8f8f8~v2.pong.default.partA.dc2.internal-v1.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "cluster service peered",
|
||||||
|
stat: "cluster.pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors",
|
||||||
|
expect: map[string][]string{
|
||||||
|
"consul.custom_hash": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.destination.custom_hash": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.destination.full_target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
"consul.destination.namespace": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "default"},
|
||||||
|
"consul.destination.peer": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "cloudpeer"},
|
||||||
|
"consul.destination.routing_type": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "external"},
|
||||||
|
"consul.destination.service": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong"},
|
||||||
|
"consul.destination.service_subset": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.destination.target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer"},
|
||||||
|
"consul.destination.trust_domain": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
"consul.full_target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
"consul.namespace": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "default"},
|
||||||
|
"consul.routing_type": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "external"},
|
||||||
|
"consul.service": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong"},
|
||||||
|
"consul.service_subset": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer"},
|
||||||
|
"consul.trust_domain": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
},
|
||||||
|
expectNoDeprecated: map[string][]string{
|
||||||
|
"consul.destination.custom_hash": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.destination.full_target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
"consul.destination.namespace": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "default"},
|
||||||
|
"consul.destination.peer": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "cloudpeer"},
|
||||||
|
"consul.destination.routing_type": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "external"},
|
||||||
|
"consul.destination.service": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong"},
|
||||||
|
"consul.destination.service_subset": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", ""},
|
||||||
|
"consul.destination.target": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "pong.default.cloudpeer"},
|
||||||
|
"consul.destination.trust_domain": {"pong.default.cloudpeer.external.e5b08d03-bfc3-c870-1833-baddb116e648.consul.", "e5b08d03-bfc3-c870-1833-baddb116e648"},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "tcp listener no namespace or partition (OSS)",
|
name: "tcp listener no namespace or partition (OSS)",
|
||||||
stat: "tcp.upstream.db.dc1.downstream_cx_total",
|
stat: "tcp.upstream.db.dc1.downstream_cx_total",
|
||||||
|
@ -1406,6 +1440,15 @@ func TestConsulTagSpecifiers(t *testing.T) {
|
||||||
"consul.upstream.service": {"db.dc1.", "db"},
|
"consul.upstream.service": {"db.dc1.", "db"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "tcp peered listener no namespace or partition (OSS)",
|
||||||
|
stat: "tcp.upstream_peered.db.cloudpeer.downstream_cx_total",
|
||||||
|
expect: map[string][]string{
|
||||||
|
"consul.upstream.peer": {"db.cloudpeer.", "cloudpeer"},
|
||||||
|
"consul.upstream.namespace": {"db.cloudpeer.", ""},
|
||||||
|
"consul.upstream.service": {"db.cloudpeer.", "db"},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "tcp listener with namespace and partition",
|
name: "tcp listener with namespace and partition",
|
||||||
stat: "tcp.upstream.db.frontend.west.dc1.downstream_cx_total",
|
stat: "tcp.upstream.db.frontend.west.dc1.downstream_cx_total",
|
||||||
|
@ -1416,6 +1459,15 @@ func TestConsulTagSpecifiers(t *testing.T) {
|
||||||
"consul.upstream.service": {"db.frontend.west.dc1.", "db"},
|
"consul.upstream.service": {"db.frontend.west.dc1.", "db"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "tcp peered listener with namespace",
|
||||||
|
stat: "tcp.upstream_peered.db.frontend.cloudpeer.downstream_cx_total",
|
||||||
|
expect: map[string][]string{
|
||||||
|
"consul.upstream.peer": {"db.frontend.cloudpeer.", "cloudpeer"},
|
||||||
|
"consul.upstream.namespace": {"db.frontend.cloudpeer.", "frontend"},
|
||||||
|
"consul.upstream.service": {"db.frontend.cloudpeer.", "db"},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "http listener no namespace or partition (OSS)",
|
name: "http listener no namespace or partition (OSS)",
|
||||||
stat: "http.upstream.web.dc1.downstream_cx_total",
|
stat: "http.upstream.web.dc1.downstream_cx_total",
|
||||||
|
@ -1426,6 +1478,15 @@ func TestConsulTagSpecifiers(t *testing.T) {
|
||||||
"consul.upstream.service": {"web.dc1.", "web"},
|
"consul.upstream.service": {"web.dc1.", "web"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "http peered listener no namespace or partition (OSS)",
|
||||||
|
stat: "http.upstream_peered.web.cloudpeer.downstream_cx_total",
|
||||||
|
expect: map[string][]string{
|
||||||
|
"consul.upstream.peer": {"web.cloudpeer.", "cloudpeer"},
|
||||||
|
"consul.upstream.namespace": {"web.cloudpeer.", ""},
|
||||||
|
"consul.upstream.service": {"web.cloudpeer.", "web"},
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "http listener with namespace and partition",
|
name: "http listener with namespace and partition",
|
||||||
stat: "http.upstream.web.frontend.west.dc1.downstream_cx_total",
|
stat: "http.upstream.web.frontend.west.dc1.downstream_cx_total",
|
||||||
|
@ -1436,6 +1497,15 @@ func TestConsulTagSpecifiers(t *testing.T) {
|
||||||
"consul.upstream.service": {"web.frontend.west.dc1.", "web"},
|
"consul.upstream.service": {"web.frontend.west.dc1.", "web"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "http peered listener with namespace",
|
||||||
|
stat: "http.upstream_peered.web.frontend.cloudpeer.downstream_cx_total",
|
||||||
|
expect: map[string][]string{
|
||||||
|
"consul.upstream.peer": {"web.frontend.cloudpeer.", "cloudpeer"},
|
||||||
|
"consul.upstream.namespace": {"web.frontend.cloudpeer.", "frontend"},
|
||||||
|
"consul.upstream.service": {"web.frontend.cloudpeer.", "web"},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
|
|
|
@ -88,13 +88,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -112,7 +116,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -120,7 +124,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -144,7 +152,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -76,13 +76,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -100,7 +104,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -108,7 +112,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -132,7 +140,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,13 +88,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -112,7 +116,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -120,7 +124,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -144,7 +152,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,13 +88,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -112,7 +116,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -120,7 +124,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -144,7 +152,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -97,13 +97,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -121,7 +125,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -129,7 +133,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -153,7 +161,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,13 +88,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -112,7 +116,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -120,7 +124,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -144,7 +152,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -74,13 +74,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -98,7 +102,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -106,7 +110,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -130,7 +138,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -165,13 +165,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -189,7 +193,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -197,7 +201,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -221,7 +229,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -201,13 +201,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -225,7 +229,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -233,7 +237,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -257,7 +265,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -201,13 +201,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -225,7 +229,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -233,7 +237,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -257,7 +265,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -164,13 +164,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -188,7 +192,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -196,7 +200,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -220,7 +228,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,13 +75,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -99,7 +103,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -107,7 +111,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +139,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -99,13 +99,17 @@
|
||||||
"tag_name": "consul.destination.namespace"
|
"tag_name": "consul.destination.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:([^.]+)\\.)?[^.]+\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.partition"
|
"tag_name": "consul.destination.partition"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.datacenter"
|
"tag_name": "consul.destination.datacenter"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"regex": "^cluster\\.([^.]+\\.(?:[^.]+\\.)?([^.]+)\\.external\\.[^.]+\\.consul\\.)",
|
||||||
|
"tag_name": "consul.destination.peer"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.(?:passthrough~)?((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.destination.routing_type"
|
"tag_name": "consul.destination.routing_type"
|
||||||
|
@ -123,7 +127,7 @@
|
||||||
"tag_name": "consul.destination.full_target"
|
"tag_name": "consul.destination.full_target"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.(([^.]+)(?:\\.[^.]+)?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.service"
|
"tag_name": "consul.upstream.service"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -131,7 +135,11 @@
|
||||||
"tag_name": "consul.upstream.datacenter"
|
"tag_name": "consul.upstream.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^(?:tcp|http)\\.upstream\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
"regex": "^(?:tcp|http)\\.upstream_peered\\.([^.]+(?:\\.[^.]+)?\\.([^.]+)\\.)",
|
||||||
|
"tag_name": "consul.upstream.peer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"regex": "^(?:tcp|http)\\.upstream(?:_peered)?\\.([^.]+(?:\\.([^.]+))?(?:\\.[^.]+)?\\.[^.]+\\.)",
|
||||||
"tag_name": "consul.upstream.namespace"
|
"tag_name": "consul.upstream.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -155,7 +163,7 @@
|
||||||
"tag_name": "consul.namespace"
|
"tag_name": "consul.namespace"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
|
"regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.internal[^.]*\\.[^.]+\\.consul\\.)",
|
||||||
"tag_name": "consul.datacenter"
|
"tag_name": "consul.datacenter"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,7 +51,7 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should have healthy endpoints for s2" {
|
@test "s1 upstream should have healthy endpoints for s2" {
|
||||||
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.default.alpha-to-primary.external HEALTHY 1
|
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.primary-to-alpha.external HEALTHY 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should be able to connect to s2 with http/1.1" {
|
@test "s1 upstream should be able to connect to s2 with http/1.1" {
|
||||||
|
@ -69,5 +69,5 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream made 1 connection to s2" {
|
@test "s1 upstream made 1 connection to s2" {
|
||||||
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.default.alpha-to-primary.external.*cx_total" 1
|
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary-to-alpha.external.*cx_total" 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should have healthy endpoints for s2" {
|
@test "s1 upstream should have healthy endpoints for s2" {
|
||||||
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.default.alpha-to-primary.external HEALTHY 1
|
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.primary-to-alpha.external HEALTHY 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should be able to connect to s2 with http/1.1" {
|
@test "s1 upstream should be able to connect to s2 with http/1.1" {
|
||||||
|
@ -53,5 +53,5 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream made 1 connection to s2" {
|
@test "s1 upstream made 1 connection to s2" {
|
||||||
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.default.alpha-to-primary.external.*cx_total" 1
|
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary-to-alpha.external.*cx_total" 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should have healthy endpoints for s2" {
|
@test "s1 upstream should have healthy endpoints for s2" {
|
||||||
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.default.alpha-to-primary.external HEALTHY 1
|
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.primary-to-alpha.external HEALTHY 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should be able to connect to s2" {
|
@test "s1 upstream should be able to connect to s2" {
|
||||||
|
@ -58,5 +58,5 @@ load helpers
|
||||||
|
|
||||||
@test "s1 upstream made 1 connection to s2" {
|
@test "s1 upstream made 1 connection to s2" {
|
||||||
# note this is what the IMPORTING side thinks it is talking to
|
# note this is what the IMPORTING side thinks it is talking to
|
||||||
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.default.alpha-to-primary.external.*cx_total" 1
|
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary-to-alpha.external.*cx_total" 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should have healthy endpoints for s2" {
|
@test "s1 upstream should have healthy endpoints for s2" {
|
||||||
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.default.alpha-to-primary.external HEALTHY 1
|
assert_upstream_has_endpoints_in_status 127.0.0.1:19000 s2.default.primary-to-alpha.external HEALTHY 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream should be able to connect to s2" {
|
@test "s1 upstream should be able to connect to s2" {
|
||||||
|
@ -53,5 +53,5 @@ load helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "s1 upstream made 1 connection to s2" {
|
@test "s1 upstream made 1 connection to s2" {
|
||||||
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.default.alpha-to-primary.external.*cx_total" 1
|
assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.s2.default.primary-to-alpha.external.*cx_total" 1
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue