diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index 59692337cd5..80d33dee130 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -52,6 +52,7 @@ var metricsMap = map[string][]string{
 	"AWS/Athena":                  {"EngineExecutionTime", "QueryPlanningTime", "QueryQueueTime", "ProcessedBytes", "ServiceProcessingTime", "TotalExecutionTime"},
 	"AWS/AutoScaling":             {"GroupDesiredCapacity", "GroupInServiceInstances", "GroupMaxSize", "GroupMinSize", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"},
 	"AWS/Billing":                 {"EstimatedCharges"},
+	"AWS/CertificateManager":      {"DaysToExpiry"},
 	"AWS/Chatbot":                 {"EventsThrottled", "EventsProcessed", "MessageDeliverySuccess", "MessageDeliveryFailure", "UnsupportedEvents"},
 	"AWS/ClientVPN":               {"ActiveConnectionsCount", "AuthenticationFailures", "CrlDaysToExpiry", "EgressBytes", "EgressPackets", "IngressBytes", "IngressPackets", "SelfServicePortalClientConfigurationDownloads"},
 	"AWS/CloudFront":              {"4xxErrorRate", "5xxErrorRate", "BytesDownloaded", "BytesUploaded", "Requests", "TotalErrorRate", "CacheHitRate", "OriginLatency", "401ErrorRate", "403ErrorRate", "404ErrorRate", "502ErrorRate", "503ErrorRate", "504ErrorRate", "LambdaExecutionError", "LambdaValidationError", "LambdaLimitExceededErrors"},
@@ -152,6 +153,7 @@ var dimensionsMap = map[string][]string{
 	"AWS/Athena":                  {"QueryState", "QueryType", "WorkGroup"},
 	"AWS/AutoScaling":             {"AutoScalingGroupName"},
 	"AWS/Billing":                 {"Currency", "LinkedAccount", "ServiceName"},
+	"AWS/CertificateManager":      {},
 	"AWS/Chatbot":                 {"ConfigurationName"},
 	"AWS/ClientVPN":               {"Endpoint"},
 	"AWS/CloudFront":              {"DistributionId", "Region"},