Skip to content

Commit e1ce11d

Browse files
authored
Stg us unique validation split (#2507)
* Validate STG & PROD by their own * Change rules to their original name * reverse condition
1 parent d77a7dc commit e1ce11d

File tree

23 files changed

+99
-90
lines changed

23 files changed

+99
-90
lines changed

entity-types/ext-testcomposite/definition.stg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ domain: EXT
22
type: TESTCOMPOSITE
33

44
synthesis:
5-
ruleName: ext_testcomposite_id_stg
5+
ruleName: ext_testcomposite_id
66
identifier: service.composite.id
77
compositeName:
88
fragments:

entity-types/infra-container/definition.stg.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type: CONTAINER
44
synthesis:
55
rules:
66
# Dockerstats receiver from otel collector.
7-
- ruleName: infra_container_container_id_stg
7+
- ruleName: infra_container_container_id
88
identifier: container.id
99
name: container.name
1010
encodeIdentifierInGUID: true
@@ -38,7 +38,7 @@ synthesis:
3838
# and select the dashboard.
3939
otel.library.name:
4040
entityTagName: instrumentation.name
41-
- ruleName: infra_container_container_id_stg_2
41+
- ruleName: infra_container_container_id_2
4242
identifier: container.id
4343
name: container.name
4444
encodeIdentifierInGUID: true
@@ -72,7 +72,7 @@ synthesis:
7272
otel.library.name:
7373
entityTagName: instrumentation.name
7474
# kube-state-metrics data via opentelemetry prometheusReceiver
75-
- ruleName: infra_container_composite_stg
75+
- ruleName: infra_container_composite
7676
compositeIdentifier:
7777
separator: ":"
7878
attributes:
@@ -124,7 +124,7 @@ synthesis:
124124
ttl: P1D
125125

126126
# kube-state-metrics data via opentelemetry prometheusReceiver
127-
- ruleName: infra_container_composite_stg_2
127+
- ruleName: infra_container_composite_2
128128
compositeIdentifier:
129129
separator: ":"
130130
attributes:
@@ -178,7 +178,7 @@ synthesis:
178178
ttl: P1D
179179

180180
# cAdvisor data via opentelemetry prometheusReceiver
181-
- ruleName: infra_container_composite_stg_3
181+
- ruleName: infra_container_composite_3
182182
compositeIdentifier:
183183
separator: ":"
184184
attributes:
@@ -230,7 +230,7 @@ synthesis:
230230
ttl: P1D
231231

232232
# cAdvisor data via opentelemetry prometheusReceiver
233-
- ruleName: infra_container_composite_stg_4
233+
- ruleName: infra_container_composite_4
234234
compositeIdentifier:
235235
separator: ":"
236236
attributes:
@@ -284,7 +284,7 @@ synthesis:
284284
ttl: P1D
285285

286286
# kube-state-metrics data via opentelemetry prometheusReceiver preview
287-
- ruleName: infra_container_composite_stg_5
287+
- ruleName: infra_container_composite_5
288288
compositeIdentifier:
289289
separator: ":"
290290
attributes:
@@ -335,7 +335,7 @@ synthesis:
335335

336336

337337
# kube-state-metrics data via opentelemetry prometheusReceiver preview
338-
- ruleName: infra_container_composite_stg_6
338+
- ruleName: infra_container_composite_6
339339
compositeIdentifier:
340340
separator: ":"
341341
attributes:
@@ -387,7 +387,7 @@ synthesis:
387387
entityTagNames: [k8s.deploymentName]
388388

389389
# cAdvisor data via opentelemetry prometheusReceiver preview
390-
- ruleName: infra_container_composite_stg_7
390+
- ruleName: infra_container_composite_7
391391
compositeIdentifier:
392392
separator: ":"
393393
attributes:
@@ -435,7 +435,7 @@ synthesis:
435435

436436

437437
# cAdvisor data via opentelemetry prometheusReceiver preview
438-
- ruleName: infra_container_composite_stg_8
438+
- ruleName: infra_container_composite_8
439439
compositeIdentifier:
440440
separator: ":"
441441
attributes:
@@ -485,7 +485,7 @@ synthesis:
485485

486486

487487
# kubeletstatsreceiver data via opentelemetry
488-
- ruleName: infra_container_composite_stg_9
488+
- ruleName: infra_container_composite_9
489489
compositeIdentifier:
490490
separator: ":"
491491
attributes:
@@ -530,7 +530,7 @@ synthesis:
530530

531531

532532
# kubeletstatsreceiver data via opentelemetry
533-
- ruleName: infra_container_composite_stg_10
533+
- ruleName: infra_container_composite_10
534534
compositeIdentifier:
535535
separator: ":"
536536
attributes:
@@ -576,7 +576,7 @@ synthesis:
576576
entityTagNames: [k8s.nodeName]
577577

578578
# Docker Container from Samples - NOT in use yet - see FF EntitySynthesis/ExtractEntityFromInfraTelemetry
579-
- ruleName: infra_container_entityId_stg
579+
- ruleName: infra_container_entityId
580580
identifier: entityId
581581
name: name
582582
legacyFeatures:
@@ -638,7 +638,7 @@ synthesis:
638638
prefixedTags:
639639
label.:
640640
# K8s Container from Samples - NOT in use yet - see FF EntitySynthesis/ExtractEntityFromInfraTelemetry
641-
- ruleName: infra_container_entityId_stg_2
641+
- ruleName: infra_container_entityId_2
642642
identifier: entityId
643643
name: containerName
644644
legacyFeatures:
@@ -701,7 +701,7 @@ synthesis:
701701
prefixedTags:
702702
label.:
703703
# K8s container logs shipped via newrelic-logging Helm chart
704-
- ruleName: infra_container_logging_k8s_container_identifier_stg
704+
- ruleName: infra_container_logging_k8s_container_identifier
705705
identifier: logging.k8s.container.identifier
706706
name: container_name
707707
encodeIdentifierInGUID: true
@@ -751,7 +751,7 @@ synthesis:
751751

752752
# K8s container logs shipped via newrelic-logging Helm chart. These are logs from legacy K8s containers that use
753753
# a different format in their ID.
754-
- ruleName: infra_container_logging_k8s_container_legacyIdentifier_stg
754+
- ruleName: infra_container_logging_k8s_container_legacyIdentifier
755755
identifier: logging.k8s.container.legacyIdentifier
756756
name: container_name
757757
# The legacyIdentifier is already hashed, no need to hash it again

entity-types/infra-elasticsearchcluster/definition.stg.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ configuration:
1111

1212
synthesis:
1313
rules:
14-
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_stg
14+
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name
1515
identifier: elasticsearch.cluster.name
1616
name: elasticsearch.cluster.name
1717
encodeIdentifierInGUID: true
@@ -29,7 +29,7 @@ synthesis:
2929
entityTagName: instrumentation.name
3030
elasticsearch.cluster.name:
3131
host.name:
32-
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_stg_2
32+
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_2
3333
identifier: elasticsearch.cluster.name
3434
name: elasticsearch.cluster.name
3535
encodeIdentifierInGUID: true
@@ -47,7 +47,7 @@ synthesis:
4747
entityTagName: instrumentation.name
4848
elasticsearch.cluster.name:
4949
host.name:
50-
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_stg_3
50+
- ruleName: infra_elasticsearchcluster_elasticsearch_cluster_name_3
5151
identifier: elasticsearch.cluster.name
5252
name: elasticsearch.cluster.name
5353
encodeIdentifierInGUID: true
@@ -67,7 +67,7 @@ synthesis:
6767
host.name:
6868

6969
# Data from Elastic search integation OHI
70-
- ruleName: infra_elasticsearchcluster_entityId_stg
70+
- ruleName: infra_elasticsearchcluster_entityId
7171
identifier: entityId
7272
name: entityName
7373
legacyFeatures:

entity-types/infra-elasticsearchnode/definition.stg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ configuration:
1313
synthesis:
1414
# Apart from this rule ELASTICSEARCHNODE entities are also created from infra pipeline.
1515
rules:
16-
- ruleName: infra_elasticsearchnode_composite_stg
16+
- ruleName: infra_elasticsearchnode_composite
1717
compositeIdentifier:
1818
separator: ":"
1919
attributes:

entity-types/infra-kafkabroker/definition.stg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type: KAFKABROKER
44
synthesis:
55
rules:
66
# This rule is for OTEL kafka receivers metrics
7-
- ruleName: infra_kafkabroker_kafka_broker_name_stg
7+
- ruleName: infra_kafkabroker_kafka_broker_name
88
identifier: kafka.broker.name
99
name: kafka.broker.name
1010
encodeIdentifierInGUID: true

entity-types/infra-kafkacluster/definition.stg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ configuration:
77
synthesis:
88
rules:
99
# This rule is for OTEL kafka cluster metrics
10-
- ruleName: infra_kafkacluster_kafka_cluster_name_stg
10+
- ruleName: infra_kafkacluster_kafka_cluster_name
1111
identifier: kafka.cluster.name
1212
name: kafka.cluster.name
1313
encodeIdentifierInGUID: true
@@ -36,7 +36,7 @@ synthesis:
3636
k8s.namespace.name:
3737

3838
# This rule is for native kafka cluster metrics
39-
- ruleName: infra_kafkacluster_clusterName_stg
39+
- ruleName: infra_kafkacluster_clusterName
4040
identifier: clusterName
4141
name: displayName
4242
encodeIdentifierInGUID: true

entity-types/infra-kafkatopic/definition.stg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ configuration:
77
synthesis:
88
rules:
99
# This rule is for OTEL contrib jmx kafka receivers metrics
10-
- ruleName: infra_kafkatopic_kafka_topic_name_stg
10+
- ruleName: infra_kafkatopic_kafka_topic_name
1111
identifier: kafka.topic.name
1212
name: kafka.topic.name
1313
encodeIdentifierInGUID: true
@@ -36,7 +36,7 @@ synthesis:
3636

3737

3838
# This rule is for OTEL JMX Kafka receivers with custom JMX configuration metrics
39-
- ruleName: infra_kafkatopic_kafka_topic_name_stg_2
39+
- ruleName: infra_kafkatopic_kafka_topic_name_2
4040
identifier: kafka.topic.name
4141
name: kafka.topic.name
4242
encodeIdentifierInGUID: true
@@ -62,7 +62,7 @@ synthesis:
6262
k8s.namespace.name:
6363

6464
# This rule is for OTEL kafkametrics receivers metrics
65-
- ruleName: infra_kafkatopic_kafka_topic_name_stg_3
65+
- ruleName: infra_kafkatopic_kafka_topic_name_3
6666
identifier: kafka.topic.name
6767
name: kafka.topic.name
6868
encodeIdentifierInGUID: true

entity-types/infra-kubernetes_deployment/definition.stg.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ goldenTags:
1111
synthesis:
1212
rules:
1313
# kube-state-metrics data via opentelemetry prometheusReceiver
14-
- ruleName: infra_kubernetes_deployment_composite_stg
14+
- ruleName: infra_kubernetes_deployment_composite
1515
compositeIdentifier:
1616
separator: ":"
1717
attributes:
@@ -51,7 +51,7 @@ synthesis:
5151
label_:
5252
ttl: P1D
5353
# kube-state-metrics data via opentelemetry prometheusReceiver
54-
- ruleName: infra_kubernetes_deployment_composite_stg_2
54+
- ruleName: infra_kubernetes_deployment_composite_2
5555
compositeIdentifier:
5656
separator: ":"
5757
attributes:
@@ -94,7 +94,7 @@ synthesis:
9494
ttl: P1D
9595

9696
# Infrastructure event data via opentelemetry
97-
- ruleName: infra_kubernetes_deployment_composite_stg_3
97+
- ruleName: infra_kubernetes_deployment_composite_3
9898
compositeIdentifier:
9999
separator: ":"
100100
attributes:
@@ -120,7 +120,7 @@ synthesis:
120120
present: false
121121

122122
# Infrastructure event data via opentelemetry
123-
- ruleName: infra_kubernetes_deployment_composite_stg_4
123+
- ruleName: infra_kubernetes_deployment_composite_4
124124
compositeIdentifier:
125125
separator: ":"
126126
attributes:
@@ -148,7 +148,7 @@ synthesis:
148148
present: true
149149

150150
# newrelic integration data via nri-bundle
151-
- ruleName: infra_kubernetes_deployment_entityId_stg
151+
- ruleName: infra_kubernetes_deployment_entityId
152152
identifier: entityId
153153
name: displayName
154154
legacyFeatures:

entity-types/infra-kubernetes_namespace/definition.stg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ goldenTags:
99
synthesis:
1010
rules:
1111
# kube-state-metrics data via opentelemetry prometheusReceiver
12-
- ruleName: infra_kubernetes_namespace_composite_stg
12+
- ruleName: infra_kubernetes_namespace_composite
1313
compositeIdentifier:
1414
separator: ":"
1515
attributes:
@@ -45,7 +45,7 @@ synthesis:
4545
ttl: P1D
4646

4747
# kube-state-metrics data via opentelemetry prometheusReceiver
48-
- ruleName: infra_kubernetes_namespace_composite_stg_2
48+
- ruleName: infra_kubernetes_namespace_composite_2
4949
compositeIdentifier:
5050
separator: ":"
5151
attributes:
@@ -83,7 +83,7 @@ synthesis:
8383
ttl: P1D
8484

8585
# newrelic integration data via nri-bundle
86-
- ruleName: infra_kubernetes_namespace_entityId_stg
86+
- ruleName: infra_kubernetes_namespace_entityId
8787
identifier: entityId
8888
name: displayName
8989
legacyFeatures:

entity-types/infra-kubernetes_pod/definition.stg.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ goldenTags:
1313
synthesis:
1414
rules:
1515
# kube-state-metrics data via opentelemetry prometheusReceiver
16-
- ruleName: infra_kubernetes_pod_composite_stg
16+
- ruleName: infra_kubernetes_pod_composite
1717
compositeIdentifier:
1818
separator: ":"
1919
attributes:
@@ -82,7 +82,7 @@ synthesis:
8282
ttl: P1D
8383

8484
# kube-state-metrics data via opentelemetry prometheusReceiver
85-
- ruleName: infra_kubernetes_pod_composite_stg_2
85+
- ruleName: infra_kubernetes_pod_composite_2
8686
compositeIdentifier:
8787
separator: ":"
8888
attributes:
@@ -153,7 +153,7 @@ synthesis:
153153
ttl: P1D
154154

155155
# Infrastructure event data via opentelemetry
156-
- ruleName: infra_kubernetes_pod_composite_stg_3
156+
- ruleName: infra_kubernetes_pod_composite_3
157157
compositeIdentifier:
158158
separator: ":"
159159
attributes:
@@ -179,7 +179,7 @@ synthesis:
179179
present: false
180180

181181
# Infrastructure event data via opentelemetry
182-
- ruleName: infra_kubernetes_pod_composite_stg_4
182+
- ruleName: infra_kubernetes_pod_composite_4
183183
compositeIdentifier:
184184
separator: ":"
185185
attributes:
@@ -207,7 +207,7 @@ synthesis:
207207
present: true
208208

209209
# ebpf
210-
- ruleName: infra_kubernetes_pod_composite_stg_5
210+
- ruleName: infra_kubernetes_pod_composite_5
211211
compositeIdentifier:
212212
separator: ":"
213213
attributes:
@@ -242,7 +242,7 @@ synthesis:
242242
entityTagNames: [k8s.deploymentName]
243243

244244
# newrelic integration data via nri-bundle
245-
- ruleName: infra_kubernetes_pod_entityId_stg
245+
- ruleName: infra_kubernetes_pod_entityId
246246
identifier: entityId
247247
name: displayName
248248
legacyFeatures:

0 commit comments

Comments
 (0)