From a71eadf3794ba89e7777974f380b1758961a19bf Mon Sep 17 00:00:00 2001 From: Krzysztof Warunek Date: Thu, 22 Oct 2020 09:04:13 +0200 Subject: [PATCH] CloudWatch/Athena - valid metrics and dimensions. (#28436) * CloudWatch/Athena - valid metrics and dimensions. In accordance with https://docs.aws.amazon.com/athena/latest/ug/query-metrics-viewing.html. * Athena: add ProcessedBytes dimension instead of DataScannedInBytes --- pkg/tsdb/cloudwatch/metric_find_query.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go index 31d957c5300..b3e464b63f6 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -48,7 +48,7 @@ var metricsMap = map[string][]string{ "AWS/AppStream": {"ActualCapacity", "AvailableCapacity", "CapacityUtilization", "DesiredCapacity", "InUseCapacity", "InsufficientCapacityError", "PendingCapacity", "RunningCapacity"}, "AWS/AppSync": {"4XXError", "5XXError", "Latency"}, "AWS/ApplicationELB": {"ActiveConnectionCount", "ClientTLSNegotiationErrorCount", "ConsumedLCUs", "ELBAuthError", "ELBAuthFailure", "ELBAuthLatency", "ELBAuthRefreshTokenSuccess", "ELBAuthSuccess", "ELBAuthUserClaimsSizeExceeded", "HTTPCode_ELB_3XX_Count", "HTTPCode_ELB_4XX_Count", "HTTPCode_ELB_5XX_Count", "HTTPCode_Target_2XX_Count", "HTTPCode_Target_3XX_Count", "HTTPCode_Target_4XX_Count", "HTTPCode_Target_5XX_Count", "HTTP_Fixed_Response_Count", "HTTP_Redirect_Count", "HTTP_Redirect_Url_Limit_Exceeded_Count", "HealthyHostCount", "IPv6ProcessedBytes", "IPv6RequestCount", "LambdaInternalError", "LambdaTargetProcessedBytes", "LambdaUserError", "NewConnectionCount", "NonStickyRequestCount", "ProcessedBytes", "RejectedConnectionCount", "RequestCount", "RequestCountPerTarget", "RuleEvaluations", "StandardProcessedBytes", "TargetConnectionErrorCount", "TargetResponseTime", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"}, - "AWS/Athena": {"DataScannedInBytes", "EngineExecutionTime", "QueryPlanningTime", "QueryQueueTime", "QueryState", "QueryType", "ServiceProcessingTime", "TotalExecutionTime", "WorkGroup"}, + "AWS/Athena": {"EngineExecutionTime", "QueryPlanningTime", "QueryQueueTime", "ProcessedBytes", "ServiceProcessingTime", "TotalExecutionTime"}, "AWS/AutoScaling": {"GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"}, "AWS/Billing": {"EstimatedCharges"}, "AWS/Chatbot": {"EventsThrottled", "EventsProcessed", "MessageDeliverySuccess", "MessageDeliveryFailure", "UnsupportedEvents"}, @@ -143,6 +143,7 @@ var dimensionsMap = map[string][]string{ "AWS/AppStream": {"Fleet"}, "AWS/AppSync": {"GraphQLAPIId"}, "AWS/ApplicationELB": {"AvailabilityZone", "LoadBalancer", "TargetGroup"}, + "AWS/Athena": {"QueryState", "QueryType", "WorkGroup"}, "AWS/AutoScaling": {"AutoScalingGroupName"}, "AWS/Billing": {"Currency", "LinkedAccount", "ServiceName"}, "AWS/Chatbot": {"ConfigurationName"},