From d6dbfce561555e54fbf97f4baa8468ee28083573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Imbern=C3=B3n?= Date: Mon, 25 Nov 2024 10:54:15 +0100 Subject: [PATCH 1/2] Introduce a new candidate category for HTTP services (#1795) --- .../uninstrumented-httpservice/definition.yml | 6 ++++++ relationships/candidates/HTTPSERVICE.yml | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 entity-types/uninstrumented-httpservice/definition.yml create mode 100644 relationships/candidates/HTTPSERVICE.yml diff --git a/entity-types/uninstrumented-httpservice/definition.yml b/entity-types/uninstrumented-httpservice/definition.yml new file mode 100644 index 000000000..f6be602e1 --- /dev/null +++ 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 new file mode 100644 index 000000000..6fe28019c --- /dev/null +++ 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 From cb4e0d0e2c6dcd0a42234b7a2570c7745a940cea Mon Sep 17 00:00:00 2001 From: jsubirat Date: Mon, 25 Nov 2024 17:03:58 +0100 Subject: [PATCH 2/2] fix: Fixes ALB, NLB and ELB definitions (#1797) --- entity-types/infra-awsalb/definition.yml | 4 ++++ entity-types/infra-awselb/definition.yml | 4 ++++ entity-types/infra-awsnlb/definition.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/entity-types/infra-awsalb/definition.yml b/entity-types/infra-awsalb/definition.yml index c5d0c1282..7d1124e04 100644 --- 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 index f33df6c6d..4f98eb213 100644 --- 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 index 790876e86..ea7f98109 100644 --- 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: