From 8162ec296016d826cd4cc32690fc01c21ecd54d6 Mon Sep 17 00:00:00 2001 From: Jan Garaj Date: Tue, 20 Feb 2024 19:46:29 +0100 Subject: [PATCH] CloudWatch: Update AWS/ES metrics (#83037) CloudWatch: update AWS/ES metrics --- pkg/tsdb/cloudwatch/constants/metrics.go | 92 +++++++++++++++++++----- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/pkg/tsdb/cloudwatch/constants/metrics.go b/pkg/tsdb/cloudwatch/constants/metrics.go index 53d9a2dce12..bf8555d648b 100644 --- a/pkg/tsdb/cloudwatch/constants/metrics.go +++ b/pkg/tsdb/cloudwatch/constants/metrics.go @@ -74,13 +74,21 @@ var NamespaceMetricsMap = map[string][]string{ "AsynchronousSearchPersistRate", "AsynchronousSearchRejected", "AsynchronousSearchRunningCurrent", + "AsynchronousSearchStoredResponseCount", "AsynchronousSearchStoreHealth", "AsynchronousSearchStoreSize", - "AsynchronousSearchStoredResponseCount", "AsynchronousSearchSubmissionRate", + "AutoFollowLeaderCallFailure", + "AutoFollowNumFailedStartReplication", + "AutoFollowNumSuccessStartReplication", "AutomatedSnapshotFailure", - "CPUCreditBalance", - "CPUUtilization", + "AutoTuneChangesHistoryHeapSize", + "AutoTuneChangesHistoryJVMYoungGenArgs", + "AutoTuneFailed", + "AutoTuneSucceeded", + "AutoTuneValue", + "AvgPointInTimeAliveTime", + "BurstBalance", "ClusterIndexWritesBlocked", "ClusterStatus.green", "ClusterStatus.red", @@ -92,13 +100,30 @@ var NamespaceMetricsMap = map[string][]string{ "ColdToWarmMigrationQueueSize", "ColdToWarmMigrationSuccessCount", "CoordinatingWriteRejected", + "CPUCreditBalance", + "CPUUtilization", + "CrossClusterInboundReplicationRequests", "CrossClusterInboundRequests", "CrossClusterOutboundConnections", + "CrossClusterOutboundReplicationRequests", "CrossClusterOutboundRequests", + "CurrentPointInTime", + "DataNodes", + "DataNodesShards.active", + "DataNodesShards.initializing", + "DataNodesShards.relocating", + "DataNodesShards.unassigned", "DeletedDocuments", "DiskQueueDepth", + "ElasticsearchRequests", + "ESReportingFailedRequestSysErrCount", + "ESReportingFailedRequestUserErrCount", + "ESReportingRequestCount", + "ESReportingSuccessCount", "FollowerCheckPoint", "FreeStorageSpace", + "HasActivePointInTime", + "HasUsedPointInTime", "HotStorageSpaceUtilization", "HotToWarmMigrationFailureCount", "HotToWarmMigrationForceMergeLatency", @@ -115,6 +140,18 @@ var NamespaceMetricsMap = map[string][]string{ "JVMGCYoungCollectionCount", "JVMGCYoungCollectionTime", "JVMMemoryPressure", + "KibanaConcurrentConnections", + "KibanaHealthyNodes", + "KibanaHeapTotal", + "KibanaHeapUsed", + "KibanaHeapUtilization", + "KibanaOS1MinuteLoad", + "KibanaReportingFailedRequestSysErrCount", + "KibanaReportingFailedRequestUserErrCount", + "KibanaReportingRequestCount", + "KibanaReportingSuccessCount", + "KibanaRequestTotal", + "KibanaResponseTimesMaxInMillis", "KMSKeyError", "KMSKeyInaccessible", "KNNCacheCapacityReached", @@ -135,10 +172,7 @@ var NamespaceMetricsMap = map[string][]string{ "KNNScriptQueryErrors", "KNNScriptQueryRequests", "KNNTotalLoadTime", - "KibanaReportingFailedRequestSysErrCount", - "KibanaReportingFailedRequestUserErrCount", - "KibanaReportingRequestCount", - "KibanaReportingSuccessCount", + "LeaderCheckPoint", "LTRFeatureMemoryUsageInBytes", "LTRFeaturesetMemoryUsageInBytes", "LTRMemoryUsage", @@ -146,14 +180,15 @@ var NamespaceMetricsMap = map[string][]string{ "LTRRequestErrorCount", "LTRRequestTotalCount", "LTRStatus.red", - "LeaderCheckPoint", "MasterCPUCreditBalance", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", + "MasterOldGenJVMMemoryPressure", "MasterReachableFromNode", "MasterSysMemoryUtilization", "Nodes", + "OldGenJVMMemoryPressure", "OpenSearchDashboardsConcurrentConnections", "OpenSearchDashboardsHealthyNode", "OpenSearchDashboardsHealthyNodes", @@ -161,6 +196,10 @@ var NamespaceMetricsMap = map[string][]string{ "OpenSearchDashboardsHeapUsed", "OpenSearchDashboardsHeapUtilization", "OpenSearchDashboardsOS1MinuteLoad", + "OpensearchDashboardsReportingFailedRequestSysErrCount", + "OpensearchDashboardsReportingFailedRequestUserErrCount", + "OpensearchDashboardsReportingRequestCount", + "OpensearchDashboardsReportingSuccessCount", "OpenSearchDashboardsRequestTotal", "OpenSearchDashboardsResponseTimesMaxInMillis", "OpenSearchRequests", @@ -169,18 +208,23 @@ var NamespaceMetricsMap = map[string][]string{ "PPLRequestCount", "PrimaryWriteRejected", "ReadIOPS", + "ReadIOPSMicroBursting", "ReadLatency", "ReadThroughput", - "ReplicaWriteRejected", + "ReadThroughputMicroBursting", + "RemoteStorageUsedSpace", + "RemoteStorageWriteRejected", + "ReplicationNumBootstrappingIndices", + "ReplicationNumFailedIndices", + "ReplicationNumPausedIndices", + "ReplicationNumSyncingIndices", "ReplicationRate", - "SQLDefaultCursorRequestCount", - "SQLFailedRequestCountByCusErr", - "SQLFailedRequestCountBySysErr", - "SQLRequestCount", - "SQLUnhealthy", + "ReplicaWriteRejected", + "SearchableDocuments", "SearchLatency", "SearchRate", - "SearchableDocuments", + "SearchShardTaskCancelled", + "SearchTaskCancelled", "SegmentCount", "Shards.active", "Shards.activePrimary", @@ -188,6 +232,11 @@ var NamespaceMetricsMap = map[string][]string{ "Shards.initializing", "Shards.relocating", "Shards.unassigned", + "SQLDefaultCursorRequestCount", + "SQLFailedRequestCountByCusErr", + "SQLFailedRequestCountBySysErr", + "SQLRequestCount", + "SQLUnhealthy", "SysMemoryUtilization", "ThreadpoolBulkQueue", "ThreadpoolBulkRejected", @@ -201,21 +250,24 @@ var NamespaceMetricsMap = map[string][]string{ "ThreadpoolSearchQueue", "ThreadpoolSearchRejected", "ThreadpoolSearchThreads", - "ThreadpoolWriteQueue", - "ThreadpoolWriteRejected", - "ThreadpoolWriteThreads", "Threadpoolsql-workerQueue", "Threadpoolsql-workerRejected", "Threadpoolsql-workerThreads", + "ThreadpoolWriteQueue", + "ThreadpoolWriteRejected", + "ThreadpoolWriteThreads", + "ThroughputThrottle", + "TotalPointInTime", "WarmCPUUtilization", "WarmFreeStorageSpace", "WarmJVMGCOldCollectionCount", "WarmJVMGCYoungCollectionCount", "WarmJVMGCYoungCollectionTime", "WarmJVMMemoryPressure", + "WarmOldGenJVMMemoryPressure", + "WarmSearchableDocuments", "WarmSearchLatency", "WarmSearchRate", - "WarmSearchableDocuments", "WarmStorageSpaceUtilization", "WarmSysMemoryUtilization", "WarmThreadpoolSearchQueue", @@ -227,8 +279,10 @@ var NamespaceMetricsMap = map[string][]string{ "WarmToColdMigrationSuccessCount", "WarmToHotMigrationQueueSize", "WriteIOPS", + "WriteIOPSMicroBursting", "WriteLatency", "WriteThroughput", + "WriteThroughputMicroBursting", }, "AWS/ElastiCache": { "ActiveDefragHits",