Remove unknown identifier warnings for metricsinsights alarms

aws · Dec 12, 2022 · 6aec44a · 6aec44a
1 parent 813c2f1
commit 6aec44a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts b/packages/@aws-cdk/aws-cloudwatch/lib/metric.ts
@@ -589,7 +589,7 @@ export class MathExpression implements IMetric {
 
     const warnings = [];
 
-    if (missingIdentifiers.length > 0) {
+    if (!this.expression.toUpperCase().match('\\s*SELECT\\s.*') && missingIdentifiers.length > 0) {
       warnings.push(`Math expression '${this.expression}' references unknown identifiers: ${missingIdentifiers.join(', ')}. Please add them to the 'usingMetrics' map.`);
     }
 

diff --git a/packages/@aws-cdk/aws-cloudwatch/test/metric-math.test.ts b/packages/@aws-cdk/aws-cloudwatch/test/metric-math.test.ts
@@ -75,6 +75,14 @@ describe('Metric Math', () => {
     expect(m.warnings).toContainEqual(expect.stringContaining("'m1 + m2' references unknown identifiers"));
   });
 
+  test('metrics insights expression does not produce warning for unknown identifier', () => {
+    const m = new MathExpression({
+      expression: "SELECT AVG(CpuUsage) FROM EC2 WHERE Instance = '123456'",
+    });
+
+    expect(m.warnings).toBeUndefined();
+  });
+
   test('math expression referring to unknown expressions produces a warning, even when nested', () => {
     const m = new MathExpression({
       expression: 'e1 + 5',