Merge branch 'main' into javimb/generic-db-rule

entity-types/infra-azurefunctionsapp/definition.yml

@@ -7,7 +7,7 @@ goldenTags:
 - azure.resourceGroupName
 - azure.state
 configuration:
-  entityExpirationTime: DAILY
+  entityExpirationTime: QUARTERLY
   alertable: true
 synthesis:
   tags:

entity-types/infra-host/definition.yml

@@ -292,28 +292,8 @@ synthesis:
           entityTagNames: [hostname]
         instrumentation.provider:
     # AWS EC2 host synthesized via ElasticBeanstalk logs
-    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
-    - identifier: entityId
-      name: aws.ec2.InstanceId
-      encodeIdentifierInGUID: false
-      legacyFeatures:
-        overrideGuidType: true
-      conditions:
-        - attribute: eventType
-          prefix: Log
-        - attribute: aws.Arn
-          present: true
-        - attribute: aws.ec2.InstanceId
-          present: true
-        - attribute: entityId
-          present: true
-      tags:
-        aws.Arn:
-        # Used in AWSEC2.yml for entity relationship candidates
-        aws.ec2.InstanceId:
-    # AWS EC2 host synthesized via ElasticBeanstalk logs
-    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
-    - identifier: aws.Arn
+    # Metrics Streams and API Polling entities use the instanceId to compute the entity.guid
+    - identifier: aws.ec2.InstanceId
       name: aws.ec2.InstanceId
       encodeIdentifierInGUID: true
       legacyFeatures:
@@ -325,8 +305,6 @@ synthesis:
           present: true
         - attribute: aws.ec2.InstanceId
           present: true
-        - attribute: entityId
-          present: false
       tags:
         aws.Arn:
         # Used in AWSEC2.yml for entity relationship candidates