Merge branch 'newrelic:main' into main

newrelic · Jan 17, 2025 · c05afe4 · c05afe4
2 parents 9d9ac26 + 01d9d0b
commit c05afe4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/relationships/candidates/AWSREDSHIFTCLUSTER.yml b/relationships/candidates/AWSREDSHIFTCLUSTER.yml
@@ -6,8 +6,8 @@ lookups:
     tags:
       matchingMode: ALL
       predicates:
-        - tagKeys: ["configuration.endpoint.address"]
-          field: cloudEndpointAddress
+        - tagKeys: ["server.address"]
+          field: serverAddress
     onMatch:
       onMultipleMatches: RELATE_ALL
     onMiss:

diff --git a/relationships/candidates/KUBERNETESCLUSTER.yml b/relationships/candidates/KUBERNETESCLUSTER.yml
@@ -6,7 +6,7 @@ lookups:
     tags:
       matchingMode: FIRST
       predicates:
-        - tagKeys: [ "displayName" ]
+        - tagKeys: [ "displayname" ]
           field: cluster.name
         - tagKeys: [ "k8s.cluster.name" ]
           field: cluster.name

diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-REDSHIFTCLUSTER.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-REDSHIFTCLUSTER.yml
@@ -0,0 +1,22 @@
+relationships:
+  - name: apmApplicationCallsInfraRedshiftCluster
+    version: "1"
+    origins:
+      - Distributed Tracing
+    conditions:
+      - attribute: eventType
+        anyOf: [ "Span" ]
+      - attribute: server.address
+        regex: '^[a-zA-Z0-9\-]+\.[a-z0-9]+\.[a-zA-Z0-9\-]+\.redshift\.amazonaws\.com$'
+    relationship:
+      expires: P75M
+      relationshipType: CALLS
+      source:
+        extractGuid:
+          attribute: entity.guid
+      target:
+        lookupGuid:
+          candidateCategory: AWSREDSHIFTCLUSTER
+          fields:
+            - field: serverAddress
+              attribute: server.address
diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-REDSHIFTCLUSTER.yml
@@ -20,5 +20,5 @@ relationships:
         lookupGuid:
           candidateCategory: AWSREDSHIFTCLUSTER
           fields:
-            - field: cloudEndpointAddress
-              attribute: configuration.endpoint.address
+            - field: serverAddress
+              attribute: server.address