From ada0ed8fb9a22ef939f41e5f111d0c21d4c6498b Mon Sep 17 00:00:00 2001 From: Andre Dymel <103119168+andre-nr@users.noreply.github.com> Date: Tue, 21 May 2024 15:17:33 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Create=20relationship=20between=20ote?= =?UTF-8?q?l/apm=20app=20and=20elasticache=20memcache=20(#1=E2=80=A6"=20(#?= =?UTF-8?q?1630)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6536b92405c2011f0de86fe1a80645140463a579. --- .../uninstrumented-memcached/definition.yml | 6 ----- relationships/candidates/MEMCACHED.yml | 20 ---------------- ...N-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml | 22 ----------------- ...E-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml | 24 ------------------- 4 files changed, 72 deletions(-) delete mode 100644 entity-types/uninstrumented-memcached/definition.yml delete mode 100644 relationships/candidates/MEMCACHED.yml delete mode 100644 relationships/synthesis/APM-APPLICATION-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml delete mode 100644 relationships/synthesis/EXT-SERVICE-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml diff --git a/entity-types/uninstrumented-memcached/definition.yml b/entity-types/uninstrumented-memcached/definition.yml deleted file mode 100644 index a7509565c..000000000 --- a/entity-types/uninstrumented-memcached/definition.yml +++ /dev/null @@ -1,6 +0,0 @@ -domain: UNINSTRUMENTED -type: MEMCACHED - -configuration: - entityExpirationTime: DAILY - alertable: false \ No newline at end of file diff --git a/relationships/candidates/MEMCACHED.yml b/relationships/candidates/MEMCACHED.yml deleted file mode 100644 index d193f15da..000000000 --- a/relationships/candidates/MEMCACHED.yml +++ /dev/null @@ -1,20 +0,0 @@ -category: MEMCACHED -lookups: - - entityTypes: - - domain: INFRA - type: AWSELASTICACHEMEMCACHEDCLUSTER - - domain: INFRA - type: AWSELASTICACHEMEMCACHEDNODE - tags: - matchingMode: ALL - predicates: - - tagKeys: ["aws.elasticache.configurationEndpointAddress"] - field: endpoint - - tagKeys: ["aws.elasticache.configurationEndpointPort"] - field: port - onMatch: - onMultipleMatches: RELATE_ALL - onMiss: - action: CREATE_UNINSTRUMENTED - uninstrumented: - type: MEMCACHED diff --git a/relationships/synthesis/APM-APPLICATION-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml b/relationships/synthesis/APM-APPLICATION-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml deleted file mode 100644 index 7cc660cf7..000000000 --- a/relationships/synthesis/APM-APPLICATION-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml +++ /dev/null @@ -1,22 +0,0 @@ -relationships: - - name: apmApplicationCallsInfraElastiCacheMemcachedCluster - version: "1" - origins: - - APM Metrics - conditions: - - attribute: metricName - regex: "^Datastore/instance/Memcached/[^/]*\\.cache\\.amazonaws\\.com/[0-9]+" - relationship: - expires: P75M - relationshipType: CALLS - source: - extractGuid: - attribute: entity.guid - target: - lookupGuid: - candidateCategory: MEMCACHED - fields: - - field: endpoint - attribute: metricName__4 - - field: port - attribute: metricName__5 diff --git a/relationships/synthesis/EXT-SERVICE-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml b/relationships/synthesis/EXT-SERVICE-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml deleted file mode 100644 index e260c081f..000000000 --- a/relationships/synthesis/EXT-SERVICE-to-INFRA-ELASTICACHEMEMCACHEDCLUSTER.yml +++ /dev/null @@ -1,24 +0,0 @@ -relationships: - - name: extServiceCallsInfraElasticacheMemcachedCluster - version: "1" - origins: - - OpenTelemetry - conditions: - - attribute: eventType - anyOf: [ "Metric"] - - attribute: db.system - anyOf: [ "memcached" ] - relationship: - expires: P75M - relationshipType: CALLS - source: - extractGuid: - attribute: entity.guid - target: - lookupGuid: - candidateCategory: MEMCACHED - fields: - - field: endpoint - attribute: net.peer.name - - field: port - attribute: net.peer.port