Revert "Provide Samples & DD queries for AWS GM (#204)" (#207)

This reverts commit 11bb240.

definitions/infra-awsalb/golden_metrics.yml

@@ -1,42 +1,25 @@
 serverErrors4XxAnd5Xx:
   title: Server errors (4xx and 5xx)
-  queries:
-    aws:
-      select: rate(sum(aws.applicationelb.HTTPCode_ELB_4XX_Count) + sum(aws.applicationelb.HTTPCode_ELB_5XX_Count), 1 minute)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: rate(sum((provider.httpCodeElb4XXCount.Sum OR 0) + (provider.httpCodeElb5XXCount.Sum OR 0)),1 minute)
-      from: LoadBalancerSample
-      where: provider='Alb'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: rate(sum((provider.httpCodeElb4XXCount.Sum OR 0) + (provider.httpCodeElb5XXCount.Sum OR 0)),1
+      minute)
+    from: LoadBalancerSample
+    where: provider='Alb'
+    eventId: entityGuid
+    eventName: entityName
 activeConnections:
   title: Active Connections
-  queries:
-    aws:
-      select: rate(sum(aws.applicationelb.ActiveConnectionCount), 1 minute)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: rate(sum(provider.activeConnectionCount.Sum),1 minute)
-      from: LoadBalancerSample
-      where: provider='Alb'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: rate(sum(provider.activeConnectionCount.Sum),1 minute)
+    from: LoadBalancerSample
+    where: provider='Alb'
+    eventId: entityGuid
+    eventName: entityName
 rejectedConnections:
   title: Rejected connections
-  queries:
-    aws:
-      select: rate(sum(aws.applicationelb.RejectedConnectionCount), 1 minute)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: rate(sum(provider.rejectedConnectionCount.Sum),1 minute)
-      from: LoadBalancerSample
-      where: provider='Alb'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: rate(sum(provider.rejectedConnectionCount.Sum),1 minute)
+    from: LoadBalancerSample
+    where: provider='Alb'
+    eventId: entityGuid
+    eventName: entityName

definitions/infra-awsalbtargetgroup/golden_metrics.yml

@@ -1,56 +1,33 @@
 serverErrors4XxAnd5Xx:
   title: Server errors (4xx and 5xx)
-  queries:
-    aws:
-      select: rate(sum(aws.applicationelb.HTTPCode_Target_4XX_Count) + sum(aws.applicationelb.HTTPCode_Target_5XX_Count), 1 minute)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: rate(sum(`provider.httpCodeTarget4XXCount.Sum`) + sum(`provider.httpCodeTarget5XXCount.Sum`),1 minute)
-      from: LoadBalancerSample
-      where: provider='AlbTargetGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: rate(sum(`provider.httpCodeTarget4XXCount.Sum`) + sum(`provider.httpCodeTarget5XXCount.Sum`),1
+      minute)
+    from: LoadBalancerSample
+    where: provider='AlbTargetGroup'
+    eventId: entityGuid
+    eventName: entityName
 unhealthyHosts:
   title: Unhealthy host count
-  queries:
-    aws:
-      select: max(aws.applicationelb.UnHealthyHostCount)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: max(`provider.unHealthyHostCount.Maximum`)
-      from: LoadBalancerSample
-      where: provider='AlbTargetGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: max(`provider.unHealthyHostCount.Maximum`)
+    from: LoadBalancerSample
+    where: provider='AlbTargetGroup'
+    eventId: entityGuid
+    eventName: entityName
 responseTime:
   title: Average response time
-  queries:
-    aws:
-      select: average(aws.applicationelb.TargetResponseTime)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: average(`provider.targetResponseTime.Average`)
-      from: LoadBalancerSample
-      where: provider='AlbTargetGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: average(`provider.targetResponseTime.Average`)
+    from: LoadBalancerSample
+    where: provider='AlbTargetGroup'
+    eventId: entityGuid
+    eventName: entityName
 requests:
   title: Requests
-  queries:
-    aws:
-      select: rate(sum(aws.applicationelb.RequestCountPerTarget), 1 minute)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: rate(sum(provider.requestCountPerTarget.Sum),1 minute)
-      from: LoadBalancerSample
-      where: provider='AlbTargetGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: rate(sum(provider.requestCountPerTarget.Sum),1 minute)
+    from: LoadBalancerSample
+    where: provider='AlbTargetGroup'
+    eventId: entityGuid
+    eventName: entityName

definitions/infra-awsapigatewayapi/golden_metrics.yml

@@ -1,42 +1,24 @@
 requests:
   title: Requests
-  queries:
-    aws:
-      select: sum(aws.apigateway.Count.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum(provider.count.SampleCount)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayApi'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum(provider.count.SampleCount)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayApi'
+    eventId: entityGuid
+    eventName: entityName
 errors4XxAnd5Xx:
   title: Errors (4xx and 5xx)
-  queries:
-    aws:
-      select: sum(`aws.apigateway.5XXError.byApi`) + sum(`aws.apigateway.4XXError.byApi`)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0))
-      from: ApiGatewaySample
-      where: provider='ApiGatewayApi'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0))
+    from: ApiGatewaySample
+    where: provider='ApiGatewayApi'
+    eventId: entityGuid
+    eventName: entityName
 latencyMs:
   title: Latency (ms)
-  queries:
-    aws:
-      select: average(aws.apigateway.Latency.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: average(provider.latency.Average)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayApi'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: average(provider.latency.Average)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayApi'
+    eventId: entityGuid
+    eventName: entityName

definitions/infra-awsapigatewayresourcewithmetrics/golden_metrics.yml

@@ -1,42 +1,24 @@
 requests:
   title: Requests
-  queries:
-    aws:
-      select: sum(aws.apigateway.Count.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum(provider.count.SampleCount)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayResourceWithMetrics'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum(provider.count.SampleCount)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayResourceWithMetrics'
+    eventId: entityGuid
+    eventName: entityName
 errors4XxAnd5Xx:
   title: Errors (4xx and 5xx)
-  queries:
-    aws:
-      select: sum(`aws.apigateway.5XXError.byApi`) + sum(`aws.apigateway.4XXError.byApi`)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0))
-      from: ApiGatewaySample
-      where: provider='ApiGatewayResourceWithMetrics'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0))
+    from: ApiGatewaySample
+    where: provider='ApiGatewayResourceWithMetrics'
+    eventId: entityGuid
+    eventName: entityName
 latencyMs:
   title: Latency (ms)
-  queries:
-    aws:
-      select: average(aws.apigateway.Latency.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: average(provider.latency.Average)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayResourceWithMetrics'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: average(provider.latency.Average)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayResourceWithMetrics'
+    eventId: entityGuid
+    eventName: entityName

definitions/infra-awsapigatewaystage/golden_metrics.yml

@@ -1,42 +1,24 @@
 requests:
   title: Requests
-  queries:
-    aws:
-      select: sum(aws.apigateway.Count.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum(provider.count.SampleCount)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayStage'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum(provider.count.SampleCount)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayStage'
+    eventId: entityGuid
+    eventName: entityName
 errors4XxAnd5Xx:
   title: Errors (4xx and 5xx)
-  queries:
-    aws:
-      select: sum(`aws.apigateway.4XXError.byApi`) + sum(`aws.apigateway.5XXError.byApi`)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: sum((`provider.4xxError.Sum` OR 0) + (`provider.5xxError.Sum` OR 0))
-      from: ApiGatewaySample
-      where: provider='ApiGatewayStage'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: sum((`provider.4xxError.Sum` OR 0) + (`provider.5xxError.Sum` OR 0))
+    from: ApiGatewaySample
+    where: provider='ApiGatewayStage'
+    eventId: entityGuid
+    eventName: entityName
 latencyMs:
   title: Latency (ms)
-  queries:
-    aws:
-      select: average(aws.apigateway.Latency.byApi)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: average(provider.latency.Average)
-      from: ApiGatewaySample
-      where: provider='ApiGatewayStage'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: average(provider.latency.Average)
+    from: ApiGatewaySample
+    where: provider='ApiGatewayStage'
+    eventId: entityGuid
+    eventName: entityName

definitions/infra-awsautoscalinggroup/golden_metrics.yml

@@ -1,42 +1,24 @@
 desiredInstances:
   title: Desired instances
-  queries:
-    aws:
-      select: max(aws.autoscaling.GroupDesiredCapacity)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: max(provider.groupDesiredCapacity.Maximum)
-      from: AutoScalingGroupSample
-      where: provider='AutoScalingGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: max(provider.groupDesiredCapacity.Maximum)
+    from: AutoScalingGroupSample
+    where: provider='AutoScalingGroup'
+    eventId: entityGuid
+    eventName: entityName
 inServiceInstances:
   title: In service instances
-  queries:
-    aws:
-      select: min(aws.autoscaling.GroupInServiceInstances)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: min(provider.groupInServiceInstances.Minimum)
-      from: AutoScalingGroupSample
-      where: provider='AutoScalingGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: min(provider.groupInServiceInstances.Minimum)
+    from: AutoScalingGroupSample
+    where: provider='AutoScalingGroup'
+    eventId: entityGuid
+    eventName: entityName
 pendingInstances:
   title: Pending instances
-  queries:
-    aws:
-      select: max(aws.autoscaling.GroupStandbyInstances)
-      from: Metric
-      eventId: entity.guid
-      eventName: entity.name
-    awsSample:
-      select: max(provider.groupStandbyInstances.Maximum)
-      from: AutoScalingGroupSample
-      where: provider='AutoScalingGroup'
-      eventId: entityGuid
-      eventName: entityName
+  query:
+    select: max(provider.groupStandbyInstances.Maximum)
+    from: AutoScalingGroupSample
+    where: provider='AutoScalingGroup'
+    eventId: entityGuid
+    eventName: entityName