Merge branch 'NR-330226' of https://github.com/vinaykonatala/entity-d…

…efinitions into NR-330226
newrelic · Nov 19, 2024 · f892382 · f892382
2 parents 781cd79 + 2278f07
commit f892382
Show file tree

Hide file tree

Showing 17 changed files with 495 additions and 32 deletions.
diff --git a/entity-types/infra-awsalb/definition.yml b/entity-types/infra-awsalb/definition.yml
@@ -17,3 +17,42 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          prefix: app
+        - attribute: aws.applicationelb.type
+          value: application
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        aws.applicationelb.type:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          prefix: app
+        - attribute: aws.applicationelb.type
+          value: application
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        aws.applicationelb.type:
diff --git a/entity-types/infra-awscloudfrontdistribution/definition.yml b/entity-types/infra-awscloudfrontdistribution/definition.yml
@@ -8,3 +8,38 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.cloudfront.DistributionId
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.cloudfront.DistributionId
+          present: true
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        aws.cloudfront.DistributionId:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.cloudfront.DistributionId
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.cloudfront.DistributionId
+          present: true
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        aws.cloudfront.DistributionId:
diff --git a/entity-types/infra-awselb/definition.yml b/entity-types/infra-awselb/definition.yml
@@ -9,3 +9,48 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          present: true
+        - attribute: aws.applicationelb.type
+          present: false
+        - attribute: aws.networkelb.type
+          present: false
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        aws.elb.LoadBalancerName:
+          entityTagNames: [ aws.elb.loadBalancer ]
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          present: true
+        - attribute: aws.applicationelb.type
+          present: false
+        - attribute: aws.networkelb.type
+          present: false
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        aws.elb.LoadBalancerName:
+          entityTagNames: [ aws.elb.loadBalancer ]
diff --git a/entity-types/infra-awslambdafunction/definition.yml b/entity-types/infra-awslambdafunction/definition.yml
@@ -16,3 +16,40 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.lambda.FunctionName
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.lambda.FunctionName
+          present: true
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        # Used in AWSLAMBDAFUNCTION.yml for entity relationship candidates
+        aws.lambda.FunctionName:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.lambda.FunctionName
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.lambda.FunctionName
+          present: true
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        # Used in AWSLAMBDAFUNCTION.yml for entity relationship candidates
+        aws.lambda.FunctionName:
diff --git a/entity-types/infra-awsmemorydbcluster/golden_metrics.yml b/entity-types/infra-awsmemorydbcluster/golden_metrics.yml
@@ -3,7 +3,7 @@ bytesUsedForMemoryDb:
   unit: BYTES
   queries:
     aws:
-      select: latest(aws.memorydb.BytesUsedForMemoryDB)
+      select: average(aws.memorydb.BytesUsedForMemoryDB)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -12,7 +12,7 @@ networkPacketsPerSecondAllowanceExceeded:
   unit: COUNT
   queries:
     aws:
-      select: latest(aws.memorydb.NetworkPacketsPerSecondAllowanceExceeded)
+      select: average(aws.memorydb.NetworkPacketsPerSecondAllowanceExceeded)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -21,7 +21,7 @@ networkBandwidthOutAllowanceExceeded:
   unit: COUNT
   queries:
     aws:
-      select: latest(aws.memorydb.NetworkBandwidthOutAllowanceExceeded)
+      select: average(aws.memorydb.NetworkBandwidthOutAllowanceExceeded)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -30,7 +30,7 @@ engineCpuUtilization:
   unit: PERCENTAGE
   queries:
     aws:
-      select: latest(aws.memorydb.EngineCPUUtilization)
+      select: average(aws.memorydb.EngineCPUUtilization)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -39,7 +39,7 @@ replicationBytes:
   unit: BYTES
   queries:
     aws:
-      select: latest(aws.memorydb.ReplicationBytes)
+      select: average(aws.memorydb.ReplicationBytes)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -48,7 +48,7 @@ networkConntrackAllowanceExceeded:
   unit: COUNT
   queries:
     aws:
-      select: latest(aws.memorydb.NetworkConntrackAllowanceExceeded)
+      select: average(aws.memorydb.NetworkConntrackAllowanceExceeded)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -57,7 +57,7 @@ replicationLag:
   unit: SECONDS
   queries:
     aws:
-      select: latest(aws.memorydb.ReplicationLag)
+      select: average(aws.memorydb.ReplicationLag)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -66,7 +66,7 @@ networkBytesIn:
   unit: BYTES
   queries:
     aws:
-      select: latest(aws.memorydb.NetworkBytesIn)
+      select: average(aws.memorydb.NetworkBytesIn)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -75,7 +75,7 @@ replicationDelayedWriteCommands:
   unit: COUNT
   queries:
     aws:
-      select: latest(aws.memorydb.ReplicationDelayedWriteCommands)
+      select: average(aws.memorydb.ReplicationDelayedWriteCommands)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
@@ -84,7 +84,7 @@ databaseMemoryUsagePercentage:
   unit: PERCENTAGE
   queries:
     aws:
-      select: latest(aws.memorydb.DatabaseMemoryUsagePercentage)
+      select: average(aws.memorydb.DatabaseMemoryUsagePercentage)
       from: Metric
       eventId: entity.guid
       eventName: entity.name
diff --git a/entity-types/infra-awsnlb/definition.yml b/entity-types/infra-awsnlb/definition.yml
@@ -16,3 +16,42 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          prefix: net
+        - attribute: aws.networkelb.type
+          value: network
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        aws.networkelb.type:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.elb.loadBalancer
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.elb.loadBalancer
+          prefix: net
+        - attribute: aws.networkelb.type
+          value: network
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        aws.networkelb.type:
diff --git a/entity-types/infra-awsrdsdbinstance/definition.yml b/entity-types/infra-awsrdsdbinstance/definition.yml
@@ -6,3 +6,38 @@ goldenTags:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.rds.DBInstanceIdentifier
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.rds.DBInstanceIdentifier
+          present: true
+        - attribute: aws.Arn
+          present: true
+        - attribute: entityId
+          present: true
+      tags:
+        aws.Arn:
+        aws.rds.DBInstanceIdentifier:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.rds.DBInstanceIdentifier
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.rds.DBInstanceIdentifier
+          present: true
+        - attribute: entityId
+          present: false
+      tags:
+        aws.Arn:
+        aws.rds.DBInstanceIdentifier:
diff --git a/entity-types/infra-awss3bucket/definition.yml b/entity-types/infra-awss3bucket/definition.yml
@@ -13,3 +13,42 @@ dashboardTemplates:
 configuration:
   entityExpirationTime: DAILY
   alertable: true
+
+synthesis:
+  rules:
+    # Legacy API Polling entities not using the ARN to compute the entity.guid, but directly providing the entityId
+    - identifier: entityId
+      name: aws.s3.BucketName
+      encodeIdentifierInGUID: false
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.s3.BucketName
+          present: true
+        - attribute: entityId
+          present: true
+      tags:
+        # Used in AWSS3BUCKET.yml for entity relationship candidates
+        aws.Arn:
+        # Used in AWSS3BUCKET.yml for entity relationship candidates
+        aws.s3.BucketName:
+    # Metrics Streams and API Polling entities using the ARN to compute the entity.guid
+    - identifier: aws.Arn
+      name: aws.s3.BucketName
+      encodeIdentifierInGUID: true
+      conditions:
+        - attribute: eventType
+          prefix: Log
+        - attribute: aws.Arn
+          present: true
+        - attribute: aws.s3.BucketName
+          present: true
+        - attribute: entityId
+          present: false
+      tags:
+        # Used in AWSS3BUCKET.yml for entity relationship candidates
+        aws.Arn:
+        # Used in AWSS3BUCKET.yml for entity relationship candidates
+        aws.s3.BucketName: