From a8db544e8594d70eabdc2877b2342565b9b6c4e5 Mon Sep 17 00:00:00 2001 From: Szymon Szypulski Date: Wed, 2 Sep 2020 21:32:43 +0200 Subject: [PATCH] Cloudwatch: Update list of AmazonMQ metrics and dimensions (#27332) Update list of AmazonMQ metrics and Dimensions based on the current list from the official AWS documentation. Also, change InflightCount to InFlightCount. --- pkg/tsdb/cloudwatch/metric_find_query.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go index f3429a5f0b5..aef53dc0dde 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -43,7 +43,7 @@ var customMetricsMetricsMap = make(map[string]map[string]map[string]*customMetri var customMetricsDimensionsMap = make(map[string]map[string]map[string]*customMetricsCache) var metricsMap = map[string][]string{ "AWS/ACMPrivateCA": {"CRLGenerated", "Failure", "MisconfiguredCRLBucket", "Success", "Time"}, - "AWS/AmazonMQ": {"ConsumerCount", "CpuCreditBalance", "CpuUtilization", "CurrentConnectionsCount", "DequeueCount", "DispatchCount", "EnqueueCount", "EnqueueTime", "ExpiredCount", "HeapUsage", "InflightCount", "JournalFilesForFastRecovery", "JournalFilesForFullRecovery", "MemoryUsage", "NetworkIn", "NetworkOut", "OpenTransactionsCount", "ProducerCount", "QueueSize", "StorePercentUsage", "TotalConsumerCount", "TotalMessageCount", "TotalProducerCount"}, + "AWS/AmazonMQ": {"BurstBalance", "ConsumerCount", "CpuCreditBalance", "CpuUtilization", "CurrentConnectionsCount", "DequeueCount", "DispatchCount", "EnqueueCount", "EnqueueTime", "EstablishedConnectionsCount", "ExpiredCount", "HeapUsage", "InactiveDurableTopicSubscribersCount", "InFlightCount", "JobSchedulerStorePercentUsage", "JournalFilesForFastRecovery", "JournalFilesForFullRecovery", "MemoryUsage", "NetworkIn", "NetworkOut", "OpenTransactionCount", "ProducerCount", "QueueSize", "ReceiveCount", "StorePercentUsage", "TempPercentUsage", "TotalConsumerCount", "TotalDequeueCount", "TotalEnqueueCount", "TotalMessageCount", "TotalProducerCount", "VolumeReadOps", "VolumeWriteOps"}, "AWS/ApiGateway": {"4XXError", "5XXError", "CacheHitCount", "CacheMissCount", "Count", "IntegrationLatency", "Latency"}, "AWS/AppStream": {"ActualCapacity", "AvailableCapacity", "CapacityUtilization", "DesiredCapacity", "InUseCapacity", "InsufficientCapacityError", "PendingCapacity", "RunningCapacity"}, "AWS/AppSync": {"4XXError", "5XXError", "Latency"}, @@ -137,7 +137,7 @@ var metricsMap = map[string][]string{ var dimensionsMap = map[string][]string{ "AWS/ACMPrivateCA": {}, - "AWS/AmazonMQ": {"Broker", "Queue", "Topic"}, + "AWS/AmazonMQ": {"Broker", "NetworkConnector", "Queue", "Topic"}, "AWS/ApiGateway": {"ApiName", "Method", "Resource", "Stage"}, "AWS/AppStream": {"Fleet"}, "AWS/AppSync": {"GraphQLAPIId"},