Skip to content

Commit 9e9e721

Browse files
vagrawal-newrelicvagrawal-newrelic
authored
Merge branch 'main' into es-otel-prod-changes
2 parents 5a69f1d + c482606 commit 9e9e721

16 files changed

Lines changed: 182 additions & 146 deletions

File tree

‎entity-types/apm-ai_tool/definition.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ configuration:
77

88
ownership:
99
primaryOwner:
10-
teamName: "no owner"
10+
teamName: "AI Monitoring"

‎entity-types/apm-application/definition.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ configuration:
1111

1212
ownership:
1313
primaryOwner:
14-
teamName: "no owner"
14+
teamName: "APM Services"
15+
secondaryOwners:
16+
- teamName: "Metric Timeslice Team"

‎entity-types/ext-key_transaction/definition.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ configuration:
1010

1111
ownership:
1212
primaryOwner:
13-
teamName: "no owner"
13+
teamName: "APM Services"
14+
secondaryOwners:
15+
- teamName: "Metric Timeslice Team"

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

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type: KAFKABROKER
33

44
synthesis:
55
rules:
6-
# This rule is for OTEL receivers metrics starts with kafka prefix
6+
# This rule is for OTEL kafka and jmx receivers metrics
77
- ruleName: infra_kafkabroker_otel_kafka_metrics_stg
88
compositeIdentifier:
99
separator: ":"
@@ -29,59 +29,19 @@ synthesis:
2929
present: true
3030
- attribute: topic
3131
present: false
32-
- attribute: metricName
33-
prefix: kafka
3432
tags:
3533
# Environment resource attributes
3634
instrumentation.provider:
3735
kafka.cluster.name:
38-
otel.library.name:
39-
entityTagName: instrumentation.name
40-
broker.id:
41-
k8s.pod.name:
42-
k8s.node.name:
43-
k8s.pod.uid:
44-
k8s.namespace.name:
45-
46-
# This rule is for OTEL kafka receivers metrics starts with jvm prefix
47-
- ruleName: infra_kafkabroker_otel_jvm_metrics_stg
48-
compositeIdentifier:
49-
separator: ":"
50-
attributes:
51-
- broker.id
52-
- kafka.cluster.name
53-
compositeName:
54-
fragments:
55-
- value: "BrokerId:"
56-
- attribute: broker.id
57-
- value: " ("
58-
- attribute: kafka.cluster.name
59-
- value: ")"
60-
encodeIdentifierInGUID: true
61-
conditions:
62-
- attribute: eventType
63-
value: Metric
64-
- attribute: instrumentation.provider
65-
value: opentelemetry
66-
- attribute: broker.id
67-
present: true
68-
- attribute: kafka.cluster.name
69-
present: true
70-
- attribute: topic
71-
present: false
72-
- attribute: metricName
73-
prefix: jvm
74-
tags:
75-
# Environment resource attributes
76-
instrumentation.provider:
77-
kafka.cluster.name:
78-
otel.library.name:
79-
entityTagName: instrumentation.name
8036
broker.id:
8137
k8s.pod.name:
38+
ttl: P1D
8239
k8s.node.name:
40+
ttl: P1D
8341
k8s.pod.uid:
42+
ttl: P1D
8443
k8s.namespace.name:
44+
ttl: P1D
8545

8646
# This rule is for OTEL kafka broker logs
8747
- ruleName: infra_kafkabroker_otel_logs_stg
@@ -112,13 +72,15 @@ synthesis:
11272
tags:
11373
instrumentation.provider:
11474
kafka.cluster.name:
115-
otel.library.name:
116-
entityTagName: instrumentation.name
11775
broker.id:
11876
k8s.pod.name:
77+
ttl: P1D
11978
k8s.node.name:
79+
ttl: P1D
12080
k8s.pod.uid:
81+
ttl: P1D
12182
k8s.namespace.name:
83+
ttl: P1D
12284

12385
dashboardTemplates:
12486
# This should match the entity created from the ohi in the infra pipeline

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

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type: KAFKABROKER
33

44
synthesis:
55
rules:
6-
# This rule is for OTEL receivers metrics starts with kafka prefix
6+
# This rule is for OTEL kafka and jmx receivers metrics
77
- ruleName: infra_kafkabroker_otel_kafka_metrics
88
compositeIdentifier:
99
separator: ":"
@@ -29,8 +29,6 @@ synthesis:
2929
present: true
3030
- attribute: topic
3131
present: false
32-
- attribute: metricName
33-
prefix: kafka
3432
tags:
3533
# Environment resource attributes
3634
instrumentation.provider:
@@ -39,51 +37,15 @@ synthesis:
3937
entityTagName: instrumentation.name
4038
broker.id:
4139
k8s.pod.name:
40+
ttl: P1D
4241
k8s.node.name:
42+
ttl: P1D
4343
k8s.pod.uid:
44+
ttl: P1D
4445
k8s.namespace.name:
46+
ttl: P1D
4547

46-
# This rule is for OTEL kafka receivers metrics starts with jvm prefix
47-
- ruleName: infra_kafkabroker_otel_jvm_metrics
48-
compositeIdentifier:
49-
separator: ":"
50-
attributes:
51-
- broker.id
52-
- kafka.cluster.name
53-
compositeName:
54-
fragments:
55-
- value: "BrokerId:"
56-
- attribute: broker.id
57-
- value: " ("
58-
- attribute: kafka.cluster.name
59-
- value: ")"
60-
encodeIdentifierInGUID: true
61-
conditions:
62-
- attribute: eventType
63-
value: Metric
64-
- attribute: instrumentation.provider
65-
value: opentelemetry
66-
- attribute: broker.id
67-
present: true
68-
- attribute: kafka.cluster.name
69-
present: true
70-
- attribute: topic
71-
present: false
72-
- attribute: metricName
73-
prefix: jvm
74-
tags:
75-
# Environment resource attributes
76-
instrumentation.provider:
77-
kafka.cluster.name:
78-
otel.library.name:
79-
entityTagName: instrumentation.name
80-
broker.id:
81-
k8s.pod.name:
82-
k8s.node.name:
83-
k8s.pod.uid:
84-
k8s.namespace.name:
85-
86-
# This rule is for OTEL kafka broker logs
48+
# This rule is for OTEL kafka broker logs
8749
- ruleName: infra_kafkabroker_otel_logs
8850
compositeIdentifier:
8951
separator: ":"
@@ -112,13 +74,15 @@ synthesis:
11274
tags:
11375
instrumentation.provider:
11476
kafka.cluster.name:
115-
otel.library.name:
116-
entityTagName: instrumentation.name
11777
broker.id:
11878
k8s.pod.name:
79+
ttl: P1D
11980
k8s.node.name:
81+
ttl: P1D
12082
k8s.pod.uid:
83+
ttl: P1D
12184
k8s.namespace.name:
85+
ttl: P1D
12286

12387

12488
dashboardTemplates:

‎entity-types/infra-kafkabroker/tests/Log.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[
2+
{
3+
"broker.id": "1",
4+
"file.name": "kafka-broker-1.log",
5+
"instrumentation.provider": "opentelemetry",
6+
"kafka.cluster.name": "test-kafka-cluster",
7+
"message": "[2025-11-24 12:00:15,822] INFO Terminating process due to signal SIGTERM (org.apache.kafka.common.utils.LoggingSignalHandler)",
8+
"newrelic.logPattern": "nr.DID_NOT_MATCH",
9+
"newrelic.source": "api.logs.otlp",
10+
"otel.library.name": "",
11+
"otel.library.version": "",
12+
"timestamp": 1763985615852
13+
}
14+
]

‎entity-types/infra-kafkabroker/tests/Metric.json‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
[
2+
{
3+
"endTimestamp": 1756213747324,
4+
"host.id": "ec22eXXXXXXXX",
5+
"host.name": "ip-XXXXX.us-west-2.compute.internal",
6+
"instrumentation.provider": "opentelemetry",
7+
"broker.id":"1",
8+
"kafka.cluster.name": "shashank-kafka-cluster-4",
9+
"kafka.network.io": {
10+
"type": "count",
11+
"count": 111249
12+
},
13+
"metricName": "kafka.network.io",
14+
"newrelic.source": "api.metrics.otlp",
15+
"os.type": "linux",
16+
"otel.library.name": "io.opentelemetry.contrib.jmxmetrics",
17+
"otel.library.version": "1.46.0-alpha",
18+
"service.name": "kafka-otel-monitoring",
19+
"state": "out",
20+
"telemetry.sdk.language": "java",
21+
"telemetry.sdk.name": "opentelemetry",
22+
"telemetry.sdk.version": "1.49.0",
23+
"timestamp": 1756213687324
24+
},
25+
{
26+
"broker.id": "1",
27+
"host.id": "ec22eXXXXXXXX",
28+
"host.name": "ip-xxxxx.us-east-2.compute.internal",
29+
"instrumentation.provider": "opentelemetry",
30+
"kafka.cluster.name": "shashank-kafka-cluster-4",
31+
"metricName": "queueSize",
32+
"newrelic.source": "api.metrics.otlp",
33+
"os.type": "linux",
34+
"otel.library.name": "io.opentelemetry.sdk.logs",
35+
"otel.library.version": "",
36+
"processorType": "BatchLogRecordProcessor",
37+
"queueSize": {
38+
"type": "gauge",
39+
"count": 1,
40+
"sum": 0,
41+
"min": 0,
42+
"max": 0,
43+
"latest": 0
44+
},
45+
"telemetry.sdk.language": "java",
46+
"telemetry.sdk.name": "opentelemetry",
47+
"telemetry.sdk.version": "1.53.0",
48+
"timestamp": 1768464018207
49+
},
50+
{
51+
"broker.id": "1",
52+
"host.id": "ec22eXXXXXXXX",
53+
"host.name": "ip-xxxx.us-east-2.compute.internal",
54+
"instrumentation.provider": "opentelemetry",
55+
"jvm.class.count": {
56+
"type": "gauge",
57+
"count": 1,
58+
"sum": 7722,
59+
"min": 7722,
60+
"max": 7722,
61+
"latest": 7722
62+
},
63+
"kafka.cluster.name": "shashank-kafka-cluster-4",
64+
"metricName": "jvm.class.count",
65+
"newrelic.source": "api.metrics.otlp",
66+
"os.type": "linux",
67+
"otel.library.name": "io.opentelemetry.jmx",
68+
"otel.library.version": "",
69+
"telemetry.sdk.language": "java",
70+
"telemetry.sdk.name": "opentelemetry",
71+
"telemetry.sdk.version": "1.53.0",
72+
"timestamp": 1768468038207
73+
}
74+
]

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ synthesis:
3232
# Environment resource attributes
3333
instrumentation.provider:
3434
kafka.cluster.name:
35-
otel.library.name:
36-
entityTagName: instrumentation.name
3735

3836
# This rule is for OTEL kafka cluster metrics from jmx receiver - jmxscraper
3937
- ruleName: infra_kafkacluster_otel_jmxscraper_kafka_stg
@@ -61,8 +59,6 @@ synthesis:
6159
# Environment resource attributes
6260
instrumentation.provider:
6361
kafka.cluster.name:
64-
otel.library.name:
65-
entityTagName: instrumentation.name
6662

6763
# This rule is for OTEL kafka cluster metrics from kafka metrics receiver
6864
- ruleName: infra_kafkacluster_otel_kafkametrics_stg
@@ -90,8 +86,6 @@ synthesis:
9086
# Environment resource attributes
9187
instrumentation.provider:
9288
kafka.cluster.name:
93-
otel.library.name:
94-
entityTagName: instrumentation.name
9589

9690
# This rule is for OTEL kafka cluster metrics from prometheus receiver
9791
- ruleName: infra_kafkacluster_otel_prometheus_kafka_stg
@@ -119,8 +113,6 @@ synthesis:
119113
# Environment resource attributes
120114
instrumentation.provider:
121115
kafka.cluster.name:
122-
otel.library.name:
123-
entityTagName: instrumentation.name
124116

125117

126118
# This rule is for OTEL jvm metrics from jmx receiver - jmxscraper
@@ -149,8 +141,6 @@ synthesis:
149141
# Environment resource attributes
150142
instrumentation.provider:
151143
kafka.cluster.name:
152-
otel.library.name:
153-
entityTagName: instrumentation.name
154144

155145
# This rule is for OTEL jvm metrics from jmx receiver - jmxmetrics
156146
- ruleName: infra_kafkacluster_otel_jmxmetrics_jvm_stg
@@ -178,8 +168,6 @@ synthesis:
178168
# Environment resource attributes
179169
instrumentation.provider:
180170
kafka.cluster.name:
181-
otel.library.name:
182-
entityTagName: instrumentation.name
183171

184172
# This rule is for OTEL jvm metrics from prometheus receiver
185173
- ruleName: infra_kafkacluster_otel_prometheus_jvm_stg
@@ -207,8 +195,6 @@ synthesis:
207195
# Environment resource attributes
208196
instrumentation.provider:
209197
kafka.cluster.name:
210-
otel.library.name:
211-
entityTagName: instrumentation.name
212198

213199
# This rule is for OTEL kafka cluster logs
214200
- ruleName: infra_kafkacluster_otel_logs_stg
@@ -232,8 +218,6 @@ synthesis:
232218
# Environment resource attributes
233219
instrumentation.provider:
234220
kafka.cluster.name:
235-
otel.library.name:
236-
entityTagName: instrumentation.name
237221

238222
# This rule is for native kafka cluster metrics
239223
- ruleName: infra_kafkacluster_native_onhost_integration_stg

0 commit comments

Comments
 (0)