Skip to content

Commit a2b9445

Browse files
author
Eugene Cheung
authored
chore: minor cleanup (#84)
Some minor updates pulled out from #83 cf. commit messages for exact changes --- _By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license_
1 parent 34a5684 commit a2b9445

File tree

8 files changed

+83
-83
lines changed

8 files changed

+83
-83
lines changed

API.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,11 +2703,10 @@ public readonly action: IAlarmActionStrategy;
27032703
```
27042704

27052705
- *Type:* <a href="#cdk-monitoring-constructs.IAlarmActionStrategy">IAlarmActionStrategy</a>
2706+
- *Default:* no action.
27062707

27072708
Default alarm action used for each alarm, unless it is overridden.
27082709

2709-
If you do not want any actions to be created, just use NoAlarmActionStrategy.
2710-
27112710
---
27122711

27132712
##### `annotationStrategy`<sup>Optional</sup> <a name="annotationStrategy" id="cdk-monitoring-constructs.AlarmFactoryDefaults.property.annotationStrategy"></a>

lib/common/alarm/AlarmFactory.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,8 @@ export interface AlarmFactoryDefaults {
336336

337337
/**
338338
* Default alarm action used for each alarm, unless it is overridden.
339-
* If you do not want any actions to be created, just use NoAlarmActionStrategy.
339+
*
340+
* @default no action.
340341
*/
341342
readonly action?: IAlarmActionStrategy;
342343

lib/monitoring/aws-secretsmanager/SecretsManagerMetricsPublisher.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from "path";
22

3-
import { Construct, Duration } from "monocdk";
3+
import { Construct, Duration, Names } from "monocdk";
44
import { Rule, RuleTargetInput, Schedule } from "monocdk/aws-events";
55
import { LambdaFunction } from "monocdk/aws-events-targets";
66
import { Effect, PolicyStatement } from "monocdk/aws-iam";
@@ -60,7 +60,7 @@ export class SecretsManagerMetricsPublisher extends Construct {
6060
}
6161

6262
static getInstance(scope: MonitoringScope) {
63-
const key = scope.node.uniqueId;
63+
const key = Names.nodeUniqueId(scope.node);
6464
let instance = SecretsManagerMetricsPublisher.instances[key];
6565
if (!instance) {
6666
instance = new SecretsManagerMetricsPublisher(scope);
@@ -72,7 +72,7 @@ export class SecretsManagerMetricsPublisher extends Construct {
7272

7373
addSecret(secret: ISecret): void {
7474
// run 1/hr so alarms can recover automatically
75-
const rule = new Rule(this, `RuleFor${secret.node.id}`, {
75+
const rule = new Rule(this, `RuleFor${Names.nodeUniqueId(secret.node)}`, {
7676
schedule: Schedule.cron({
7777
minute: "0",
7878
}),

test/facade/MonitoringAspect.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ describe("MonitoringAspect", () => {
378378
const facade = createDummyMonitoringFacade(stack);
379379

380380
new opensearch.Domain(stack, "DummyOSDomain", {
381-
domainName: "DummyOSDomain",
381+
domainName: "dummy-os-domain",
382382
version: opensearch.EngineVersion.ELASTICSEARCH_7_10,
383383
});
384384
new elasticsearch.Domain(stack, "DummyESDomain", {

test/facade/__snapshots__/MonitoringAspect.test.ts.snap

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/monitoring/aws-opensearch/OpenSearchClusterMonitoring.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import { TestMonitoringScope } from "../TestMonitoringScope";
1313
const stack = new Stack();
1414
[
1515
new elasticsearch.CfnDomain(stack, "ElasticsearchCfnDomain", {
16-
domainName: "ElasticsearchCfnDomain",
16+
domainName: "es-cfn-domain",
1717
}),
1818
new elasticsearch.Domain(stack, "ElasticsearchDomain", {
19-
domainName: "ElasticsearchDomain",
19+
domainName: "es-domain",
2020
version: elasticsearch.ElasticsearchVersion.V7_7,
2121
}),
2222
new opensearch.CfnDomain(stack, "OpenSearchCfnDomain", {
23-
domainName: "OpenSearchCfnDomain",
23+
domainName: "os-cfn-domain",
2424
}),
2525
new opensearch.Domain(stack, "OpenSearchDomain", {
26-
domainName: "OpenSearchDomain",
26+
domainName: "os-domain",
2727
version: opensearch.EngineVersion.OPENSEARCH_1_0,
2828
}),
2929
].forEach((domain) => {

test/monitoring/aws-opensearch/__snapshots__/OpenSearchClusterMonitoring.test.ts.snap

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/monitoring/aws-secretsmanager/__snapshots__/SecretsManagerSecretMonitoring.test.ts.snap

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)