Merge branch 'main' into NR-293100-2

newrelic · Nov 26, 2024 · 729519f · 729519f
2 parents f63b938 + cb4e0d0
commit 729519f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 0 deletions.
diff --git a/entity-types/infra-awsalb/definition.yml b/entity-types/infra-awsalb/definition.yml
@@ -29,6 +29,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.alb.loadBalancer
+          present: true
         - attribute: entityId
           present: true
       tags:
@@ -42,6 +44,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.alb.loadBalancer
+          present: true
         - attribute: entityId
           present: false
       tags:

diff --git a/entity-types/infra-awselb/definition.yml b/entity-types/infra-awselb/definition.yml
@@ -21,6 +21,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.elb.loadBalancer
+          present: true
         - attribute: entityId
           present: true
       tags:
@@ -36,6 +38,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.elb.loadBalancer
+          present: true
         - attribute: entityId
           present: false
       tags:

diff --git a/entity-types/infra-awsnlb/definition.yml b/entity-types/infra-awsnlb/definition.yml
@@ -28,6 +28,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.nlb.loadBalancer
+          present: true
         - attribute: entityId
           present: true
       tags:
@@ -41,6 +43,8 @@ synthesis:
           prefix: Log
         - attribute: aws.Arn
           present: true
+        - attribute: aws.nlb.loadBalancer
+          present: true
         - attribute: entityId
           present: false
       tags:

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