From b8356d22348f39ded345974ca4d69cfdde645cbf Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Thu, 6 Mar 2025 08:07:09 -0800 Subject: [PATCH] CloudWatch: Fix condition for running annotation queries to require dimensions (#101660) --- .../datasource/cloudwatch/annotationSupport.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/public/app/plugins/datasource/cloudwatch/annotationSupport.ts b/public/app/plugins/datasource/cloudwatch/annotationSupport.ts index bf3659a020a..4c1d91746bd 100644 --- a/public/app/plugins/datasource/cloudwatch/annotationSupport.ts +++ b/public/app/plugins/datasource/cloudwatch/annotationSupport.ts @@ -38,18 +38,9 @@ export const CloudWatchAnnotationSupport = { return undefined; } - const { - prefixMatching, - actionPrefix, - alarmNamePrefix, - statistic, - namespace, - metricName, - dimensions = {}, - } = anno.target; + const { prefixMatching, actionPrefix, alarmNamePrefix, statistic, namespace, metricName } = anno.target; const validPrefixMatchingQuery = !!prefixMatching && !!actionPrefix && !!alarmNamePrefix; - const validMetricStatQuery = - !prefixMatching && !!namespace && !!metricName && !!statistic && !!Object.values(dimensions).length; + const validMetricStatQuery = !prefixMatching && !!namespace && !!metricName && !!statistic; if (validPrefixMatchingQuery || validMetricStatQuery) { return anno.target;