Adding regex pattern to the APM-to-Elasticsearch relationship configuration

relationships/candidates/AWSELASTICSEARCHCLUSTER.yml

@@ -6,12 +6,8 @@ lookups:
     tags:
       matchingMode: ALL
       predicates:
-        - tagKeys: ["aws.accountId"]
-          field: awsAccountId
-        - tagKeys: ["aws.region"]
-          field: awsRegion
-        - tagKeys: ["displayName"]
-          field: awsElasticsearchDomainName
+        - tagKeys: ["aws.es.DomainEndpoint"]
+          field: endpoint
     onMatch:
       onMultipleMatches: RELATE_ALL
     onMiss:

relationships/synthesis/APM-APPLICATION-to-INFRA-AWSELASTICSEARCHCLUSTER.yml

@@ -0,0 +1,22 @@
+relationships:
+  - name: apmServiceCallsElasticsearch
+    version: "1"
+    origins:
+      - Distributed Tracing
+    conditions:
+      - attribute: eventType
+        anyOf: [ "Span" ]
+      - attribute: server.address
+        regex: ^search-[a-zA-Z0-9-]+-[a-zA-Z0-9]+\.([a-zA-Z0-9-]+)\.es\.amazonaws\.com$
+    relationship:
+      expires: P75M
+      relationshipType: CALLS
+      source:
+        extractGuid:
+          attribute: entity.guid
+      target:
+        lookupGuid:
+          candidateCategory: AWSELASTICSEARCHCLUSTER
+          fields:
+            - field: endpoint
+              attribute: server.address

relationships/synthesis/EXT-SERVICE-to-INFRA-AWSELASTICSEARCHCLUSTER.yml

@@ -0,0 +1,22 @@
+relationships:
+  - name: extServiceCallsElasticsearch
+    version: "1"
+    origins:
+      - Distributed Tracing
+    conditions:
+      - attribute: eventType
+        anyOf: [ "Span" ]
+      - attribute: db.system
+        anyOf: [ "elasticsearch" ]
+    relationship:
+      expires: P75M
+      relationshipType: CALLS
+      source:
+        extractGuid:
+          attribute: entity.guid
+      target:
+        lookupGuid:
+          candidateCategory: AWSELASTICSEARCHCLUSTER
+          fields:
+            - field: endpoint
+              attribute: server.address