Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cloudwatch): Math:UnknownIdentifier warning for INSIGHT_RULE_METRIC #28870

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix(cloudwatch): Math:UnknownIdentifier warning for INSIGHT_RULE_METRIC #28870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a0eb1
fix(cloudwatch): Math:UnknownIdentifier warning for INSIGHT_RULE_METRIC
aws-sde Jan 25, 2024
d566a58
Merge branch 'main' into insight_rule_metric
kaizencc Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ export class MathExpression implements IMetric {
const missingIdentifiers = allIdentifiersInExpression(this.expression).filter(i => !this.usingMetrics[i]);

const warnings: { [id: string]: string } = {};
if (!this.expression.toUpperCase().match('\\s*SELECT|SEARCH|METRICS\\s.*') && missingIdentifiers.length > 0) {
if (!this.expression.toUpperCase().match('\\s*INSIGHT_RULE_METRIC|SELECT|SEARCH|METRICS\\s.*') && missingIdentifiers.length > 0) {
warnings['CloudWatch:Math:UnknownIdentifier'] = `Math expression '${this.expression}' references unknown identifiers: ${missingIdentifiers.join(', ')}. Please add them to the 'usingMetrics' map.`;
}

Expand Down
9 changes: 9 additions & 0 deletions packages/aws-cdk-lib/aws-cloudwatch/test/metric-math.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ describe('Metric Math', () => {
expect(m.warningsV2).toBeUndefined();
});

test('metrics INSIGHT_RULE_METRIC expression does not produce warning for unknown identifier', () => {
const m = new MathExpression({
expression: "INSIGHT_RULE_METRIC('RejectedConnectionsRule', 'Sum')",
usingMetrics: {},
});

expect(m.warningsV2).toBeUndefined();
});

test('math expression referring to unknown expressions produces a warning, even when nested', () => {
const m = new MathExpression({
expression: 'e1 + 5',
Expand Down