From de1dc572422905f8cf8acbb52e7d004929d2f5e7 Mon Sep 17 00:00:00 2001 From: mikkokupsu Date: Tue, 9 Jun 2020 09:51:02 +0300 Subject: [PATCH] CloudWatch: Added AWS WAFV2 metrics (#24048) * Add metrics and dimensions for AWS/WAFV2 * Update pkg/tsdb/cloudwatch/metric_find_query.go Co-authored-by: Arve Knudsen * Fix metric names Co-authored-by: Arve Knudsen --- 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 d5a07b0616b..effecfa1d70 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -117,6 +117,7 @@ var metricsMap = map[string][]string{ "AWS/Usage": {"CallCount", "ResourceCount"}, "AWS/VPN": {"TunnelDataIn", "TunnelDataOut", "TunnelState"}, "AWS/WAF": {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"}, + "AWS/WAFV2": {"AllowedRequests", "BlockedRequests", "CountedRequests", "PassedRequests"}, "AWS/WorkSpaces": {"Available", "ConnectionAttempt", "ConnectionFailure", "ConnectionSuccess", "InSessionLatency", "Maintenance", "SessionDisconnect", "SessionLaunchTime", "Stopped", "Unhealthy", "UserConnected"}, "ECS/ContainerInsights": {"ContainerInstanceCount", "CpuUtilized", "CpuReserved", "DeploymentCount", "DesiredTaskCount", "MemoryUtilized", "MemoryReserved", "NetworkRxBytes", "NetworkTxBytes", "PendingTaskCount", "RunningTaskCount", "ServiceCount", "StorageReadBytes", "StorageWriteBytes", "TaskCount", "TaskSetCount", "instance_cpu_limit", "instance_cpu_reserved_capacity", "instance_cpu_usage_total", "instance_cpu_utilization", "instance_filesystem_utilization", "instance_memory_limit", "instance_memory_reserved_capacity", "instance_memory_utliization", "instance_memory_working_set", "instance_network_total_bytes", "instance_number_of_running_tasks"}, "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"}, @@ -207,6 +208,7 @@ var dimensionsMap = map[string][]string{ "AWS/Usage": {"Class", "Resource", "Service", "Type"}, "AWS/VPN": {"TunnelIpAddress", "VpnId"}, "AWS/WAF": {"Region", "Rule", "RuleGroup", "WebACL"}, + "AWS/WAFV2": {"Region", "Rule", "RuleGroup", "WebACL"}, "AWS/WorkSpaces": {"DirectoryId", "WorkspaceId"}, "ECS/ContainerInsights": {"ClusterName", "ServiceName", "TaskDefinitionFamily", "EC2InstanceId", "ContainerInstanceId"}, "ContainerInsights": {"ClusterName", "NodeName", "Namespace", "InstanceId", "PodName", "Service"},