From b8334c14f8d7425f2027890456fc090d29ee2a95 Mon Sep 17 00:00:00 2001 From: Franco Papalardo Date: Fri, 20 Sep 2019 02:05:58 -0700 Subject: [PATCH] CloudWatch: ContainerInsights metrics support (#18971) * CloudWatch ContainerInsights support --- pkg/tsdb/cloudwatch/metric_find_query.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go index 6f96d7f869f..5501ddee4d0 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -116,6 +116,7 @@ func init() { "AWS/TrustedAdvisor": {"GreenChecks", "RedChecks", "RedResources", "ServiceLimitUsage", "YellowChecks", "YellowResources"}, "AWS/VPN": {"TunnelDataIn", "TunnelDataOut", "TunnelState"}, "AWS/WorkSpaces": {"Available", "ConnectionAttempt", "ConnectionFailure", "ConnectionSuccess", "InSessionLatency", "Maintenance", "SessionDisconnect", "SessionLaunchTime", "Stopped", "Unhealthy", "UserConnected"}, + "ContainerInsights": {"cluster_failed_node_count", "cluster_node_count", "namespace_number_of_running_pods", "node_cpu_limit", "node_cpu_reserved_capacity", "node_cpu_usage_total", "node_cpu_utilization", "node_filesystem_utilization", "node_memory_limit", "node_memory_reserved_capacity", "node_memory_utilization", "node_memory_working_set", "node_network_total_bytes", "node_number_of_running_containers", "node_number_of_running_pods", "pod_cpu_reserved_capacity", "pod_cpu_utilization", "pod_cpu_utilization_over_pod_limit", "pod_memory_reserved_capacity", "pod_memory_utilization", "pod_memory_utilization_over_pod_limit", "pod_number_of_container_restarts", "pod_network_rx_bytes", "pod_network_tx_bytes", "service_number_of_running_pods"}, "Rekognition": {"DetectedFaceCount", "DetectedLabelCount", "ResponseTime", "ServerErrorCount", "SuccessfulRequestCount", "ThrottledCount", "UserErrorCount"}, "WAF": {"AllowedRequests", "BlockedRequests", "CountedRequests", "DDoSAttackBitsPerSecond", "DDoSAttackPacketsPerSecond", "DDoSAttackRequestsPerSecond", "DDoSDetected", "PassedRequests"}, } @@ -196,6 +197,7 @@ func init() { "AWS/TrustedAdvisor": {}, "AWS/VPN": {"TunnelIpAddress", "VpnId"}, "AWS/WorkSpaces": {"DirectoryId", "WorkspaceId"}, + "ContainerInsights": {"ClusterName", "NodeName", "Namespace", "InstanceId", "PodName", "Service"}, "Rekognition": {}, "WAF": {"Region", "Rule", "RuleGroup", "WebACL"}, }