Merge branch 'newrelic:main' into main

newrelic · Nov 28, 2024 · a128745 · a128745
2 parents 0a78548 + cb4e0d0
commit a128745
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 47 deletions.
diff --git a/entity-types/apm-application/golden_metrics.yml b/entity-types/apm-application/golden_metrics.yml
@@ -1,5 +1,5 @@
 responseTimeMs:
-  title: Response time (ms)
+  title: Response time
   unit: MS
   query:
     select: average(apm.service.transaction.duration) * 1000 AS 'Response time (ms)'

diff --git a/entity-types/ext-nvidia_jetson/definition.yml b/entity-types/ext-nvidia_jetson/definition.yml
@@ -8,8 +8,6 @@ synthesis:
     conditions:
       - attribute: eventType
         value: jetsonTegrastats
-      - attribute: metricName
-        value: "ram_used"
     tags:
       agentVersion:
         entityTagName: newrelic.agentVersion

diff --git a/entity-types/ext-service/golden_metrics.yml b/entity-types/ext-service/golden_metrics.yml
@@ -1,5 +1,5 @@
 throughput:
-  title: Throughput (rpm)
+  title: Throughput
   unit: REQUESTS_PER_MINUTE
   queries:
     opentelemetry:
@@ -19,7 +19,7 @@ throughput:
       select: rate(count(http.server.duration), 1 minute)
       from: Metric
 errorRate:
-  title: Error rate (%)
+  title: Error rate
   unit: PERCENTAGE
   queries:
     opentelemetry:
@@ -39,7 +39,7 @@ errorRate:
       select: (filter(count(http.server.duration), where numeric(http.status_code) >= 400 AND numeric(http.status_code) != 404) * 100) / count(http.server.duration)
       from: Metric
 responseTimeMs:
-  title: Response time (ms)
+  title: Response time
   unit: MS
   queries:
     opentelemetry:

diff --git a/entity-types/infra-awsalb/definition.yml b/entity-types/infra-awsalb/definition.yml
@@ -22,37 +22,31 @@ synthesis:
   rules:
     # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
     - identifier: entityId
-      name: aws.elb.loadBalancer
+      name: aws.alb.loadBalancer
       encodeIdentifierInGUID: false
       conditions:
         - attribute: eventType
           prefix: Log
         - attribute: aws.Arn
           present: true
-        - attribute: aws.elb.loadBalancer
-          prefix: app
-        - attribute: aws.applicationelb.type
-          value: application
+        - attribute: aws.alb.loadBalancer
+          present: true
         - attribute: entityId
           present: true
       tags:
         aws.Arn:
-        aws.applicationelb.type:
     # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
     - identifier: aws.Arn
-      name: aws.elb.loadBalancer
+      name: aws.alb.loadBalancer
       encodeIdentifierInGUID: true
       conditions:
         - attribute: eventType
           prefix: Log
         - attribute: aws.Arn
           present: true
-        - attribute: aws.elb.loadBalancer
-          prefix: app
-        - attribute: aws.applicationelb.type
-          value: application
+        - attribute: aws.alb.loadBalancer
+          present: true
         - attribute: entityId
           present: false
       tags:
-        aws.Arn:
-        aws.applicationelb.type:
+        aws.Arn:
diff --git a/entity-types/infra-awselb/definition.yml b/entity-types/infra-awselb/definition.yml
@@ -23,16 +23,12 @@ synthesis:
           present: true
         - attribute: aws.elb.loadBalancer
           present: true
-        - attribute: aws.applicationelb.type
-          present: false
-        - attribute: aws.networkelb.type
-          present: false
         - attribute: entityId
           present: true
       tags:
         aws.Arn:
-        aws.elb.LoadBalancerName:
-          entityTagNames: [ aws.elb.loadBalancer ]
+        aws.elb.loadBalancer:
+          entityTagNames: [ aws.elb.LoadBalancerName ]
     # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
     - identifier: aws.Arn
       name: aws.elb.loadBalancer
@@ -44,13 +40,9 @@ synthesis:
           present: true
         - attribute: aws.elb.loadBalancer
           present: true
-        - attribute: aws.applicationelb.type
-          present: false
-        - attribute: aws.networkelb.type
-          present: false
         - attribute: entityId
           present: false
       tags:
         aws.Arn:
-        aws.elb.LoadBalancerName:
-          entityTagNames: [ aws.elb.loadBalancer ]
+        aws.elb.loadBalancer:
+          entityTagNames: [ aws.elb.LoadBalancerName ]
diff --git a/entity-types/infra-awsnlb/definition.yml b/entity-types/infra-awsnlb/definition.yml
@@ -21,37 +21,31 @@ synthesis:
   rules:
     # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
     - identifier: entityId
-      name: aws.elb.loadBalancer
+      name: aws.nlb.loadBalancer
       encodeIdentifierInGUID: false
       conditions:
         - attribute: eventType
           prefix: Log
         - attribute: aws.Arn
           present: true
-        - attribute: aws.elb.loadBalancer
-          prefix: net
-        - attribute: aws.networkelb.type
-          value: network
+        - attribute: aws.nlb.loadBalancer
+          present: true
         - attribute: entityId
           present: true
       tags:
         aws.Arn:
-        aws.networkelb.type:
     # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
     - identifier: aws.Arn
-      name: aws.elb.loadBalancer
+      name: aws.nlb.loadBalancer
       encodeIdentifierInGUID: true
       conditions:
         - attribute: eventType
           prefix: Log
         - attribute: aws.Arn
           present: true
-        - attribute: aws.elb.loadBalancer
-          prefix: net
-        - attribute: aws.networkelb.type
-          value: network
+        - attribute: aws.nlb.loadBalancer
+          present: true
         - attribute: entityId
           present: false
       tags:
-        aws.Arn:
-        aws.networkelb.type:
+        aws.Arn:
diff --git a/entity-types/media_streaming-video/definition.yml b/entity-types/media_streaming-video/definition.yml
@@ -0,0 +1,28 @@
+domain: MEDIA_STREAMING
+type: VIDEO
+synthesis:
+  rules:
+    # telemetry with Video* eventType
+    - identifier: appName
+      name: appName
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Video
+      tags:
+        playerName:
+        playerVersion:
+        deviceType:
+        deviceGroup:
+        deviceManufacturer:
+        deviceModel:
+goldenTags:
+  - playerName
+  - playerVersion
+  - deviceType
+  - deviceGroup
+  - deviceManufacturer
+  - deviceModel
+configuration:
+  alertable: true
+  entityExpirationTime: EIGHT_DAYS
diff --git a/entity-types/ngep-application_settings/definition.yml b/entity-types/ngep-application_settings/definition.yml
@@ -0,0 +1,8 @@
+# APM Configuration Settings Entity Definition
+
+domain: NGEP
+type: APPLICATION_SETTINGS
+
+configuration:
+  entityExpirationTime: MANUAL
+  alertable: true
diff --git a/entity-types/uninstrumented-httpservice/definition.yml b/entity-types/uninstrumented-httpservice/definition.yml
@@ -0,0 +1,6 @@
+domain: UNINSTRUMENTED
+type: HTTPSERVICE
+
+configuration:
+  entityExpirationTime: FOUR_HOURS
+  alertable: false
diff --git a/relationships/candidates/HTTPSERVICE.yml b/relationships/candidates/HTTPSERVICE.yml
@@ -0,0 +1,18 @@
+category: HTTPSERVICE
+lookups:
+  - entityTypes:
+    - domain: APM
+      type: APPLICATION
+    - domain: EXT
+      type: SERVICE
+    tags:
+      matchingMode: ALL
+      predicates:
+        - tagKeys: ["nr.endpointHostname"]
+          field: hostname
+    onMatch:
+     onMultipleMatches: RELATE_ALL
+    onMiss:
+      action: CREATE_UNINSTRUMENTED
+      uninstrumented:
+        type: HTTPSERVICE
diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-AWSELASTICSEARCHCLUSTER.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-AWSELASTICSEARCHCLUSTER.yml
@@ -19,4 +19,4 @@ relationships:
           candidateCategory: AWSELASTICSEARCHCLUSTER
           fields:
             - field: endpoint
-              attribute: http.url
+              attribute: server.address
diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESISSTREAM.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-KINESISSTREAM.yml
@@ -1,5 +1,5 @@
 relationships:
-  - name: AWSKINESISSTREAM
+  - name: apmServiceCallsInfraKinesisStream
     version: "1"
     origins:
       - Distributed Tracing

diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSELASTICSEARCHCLUSTER.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-AWSELASTICSEARCHCLUSTER.yml
@@ -19,4 +19,4 @@ relationships:
           candidateCategory: AWSELASTICSEARCHCLUSTER
           fields:
             - field: endpoint
-              attribute: url.full
+              attribute: server.address