diff --git a/infrastructure/lib/stacks/monitoringDashboard.ts b/infrastructure/lib/stacks/monitoringDashboard.ts index b98a349..2751ee4 100644 --- a/infrastructure/lib/stacks/monitoringDashboard.ts +++ b/infrastructure/lib/stacks/monitoringDashboard.ts @@ -80,7 +80,7 @@ export class OpenSearchMetricsMonitoringStack extends Stack { private snsMonitorCanaryFailed(canaryName: string, canaryUrl: string, vpcStack: VpcStack): void { const canary = new Canary(this, 'CanaryHeartbeatMonitor', { canaryName: canaryName, - schedule: Schedule.rate(Duration.minutes(1)), + schedule: Schedule.rate(Duration.minutes(5)), test: Test.custom({ code: Code.fromAsset(path.join(__dirname, '../../canary')), handler: 'urlMonitor.handler', diff --git a/infrastructure/lib/stacks/opensearch.ts b/infrastructure/lib/stacks/opensearch.ts index 1554251..ad78518 100644 --- a/infrastructure/lib/stacks/opensearch.ts +++ b/infrastructure/lib/stacks/opensearch.ts @@ -126,7 +126,7 @@ export class OpenSearchDomainStack extends Stack { } this.domain = new opensearch.Domain(this, 'OpenSearchHealthDomain', { - version: opensearch.EngineVersion.OPENSEARCH_2_11, + version: opensearch.EngineVersion.OPENSEARCH_2_13, vpc: props.vpcStack.vpc, vpcSubnets: [this.props.vpcStack.subnets], securityGroups: props.vpcStack.securityGroup ? [props.vpcStack.securityGroup] : undefined, @@ -137,7 +137,7 @@ export class OpenSearchDomainStack extends Stack { masterNodes: 3, dataNodes: 6, dataNodeInstanceType: "r6g.2xlarge.search", - masterNodeInstanceType: "m6g.large.search", + masterNodeInstanceType: "m6g.xlarge.search", }, ebs: { enabled: true, diff --git a/infrastructure/lib/stacks/opensearchNginxProxyReadonly.ts b/infrastructure/lib/stacks/opensearchNginxProxyReadonly.ts index cc075e3..ca4f3ad 100644 --- a/infrastructure/lib/stacks/opensearchNginxProxyReadonly.ts +++ b/infrastructure/lib/stacks/opensearchNginxProxyReadonly.ts @@ -189,6 +189,7 @@ export class OpenSearchMetricsNginxReadonly extends Stack { proxy_buffers 4 256k; proxy_busy_buffers_size 256k; proxy_temp_file_write_size 256k; + proxy_max_temp_file_size 4096m; } }'`; } diff --git a/infrastructure/package-lock.json b/infrastructure/package-lock.json index 402e605..88b12f8 100644 --- a/infrastructure/package-lock.json +++ b/infrastructure/package-lock.json @@ -8,7 +8,7 @@ "name": "infrastructure", "version": "0.1.0", "dependencies": { - "aws-cdk-lib": "2.144.0", + "aws-cdk-lib": "2.146.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" }, @@ -1250,9 +1250,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.144.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.144.0.tgz", - "integrity": "sha512-DpyIyTs8NHX6WgAyYM2mGorirIk+eTjWzXGQRfzAe40qkwcqsb5Ax4JEl5gz1OEo9QIJIgWDtmImgWN0tUbILA==", + "version": "2.146.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.146.0.tgz", + "integrity": "sha512-W3F2zH+P7hUxmu2dlEKJBBi6Twc4//NsJJW00h2LN0dKU+2302QY8jR+P7jgEYzZ7U50phtH4zO6BPmJrhLVEg==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -1279,7 +1279,7 @@ "mime-types": "^2.1.35", "minimatch": "^3.1.2", "punycode": "^2.3.1", - "semver": "^7.6.0", + "semver": "^7.6.2", "table": "^6.8.2", "yaml": "1.10.2" }, @@ -1296,7 +1296,7 @@ "license": "Apache-2.0" }, "node_modules/aws-cdk-lib/node_modules/ajv": { - "version": "8.13.0", + "version": "8.16.0", "inBundle": true, "license": "MIT", "dependencies": { @@ -1456,17 +1456,6 @@ "inBundle": true, "license": "MIT" }, - "node_modules/aws-cdk-lib/node_modules/lru-cache": { - "version": "6.0.0", - "inBundle": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/aws-cdk-lib/node_modules/mime-db": { "version": "1.52.0", "inBundle": true, @@ -1514,12 +1503,9 @@ } }, "node_modules/aws-cdk-lib/node_modules/semver": { - "version": "7.6.0", + "version": "7.6.2", "inBundle": true, "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -1598,11 +1584,6 @@ "punycode": "^2.1.0" } }, - "node_modules/aws-cdk-lib/node_modules/yallist": { - "version": "4.0.0", - "inBundle": true, - "license": "ISC" - }, "node_modules/aws-cdk-lib/node_modules/yaml": { "version": "1.10.2", "inBundle": true, @@ -3983,7 +3964,6 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, "bin": { "semver": "bin/semver.js" } diff --git a/infrastructure/package.json b/infrastructure/package.json index d68646a..f512e20 100644 --- a/infrastructure/package.json +++ b/infrastructure/package.json @@ -20,7 +20,7 @@ "typescript": "~3.9.7" }, "dependencies": { - "aws-cdk-lib": "2.144.0", + "aws-cdk-lib": "2.146.0", "constructs": "^10.0.0", "source-map-support": "^0.5.21" } diff --git a/infrastructure/test/monitoring-stack.test.ts b/infrastructure/test/monitoring-stack.test.ts index 99826a3..ed39220 100644 --- a/infrastructure/test/monitoring-stack.test.ts +++ b/infrastructure/test/monitoring-stack.test.ts @@ -181,7 +181,7 @@ test('Monitoring Stack Test', () => { "RuntimeVersion": "syn-nodejs-puppeteer-7.0", "Schedule": { "DurationInSeconds": "0", - "Expression": "rate(1 minute)" + "Expression": "rate(5 minutes)" }, "StartCanaryAfterCreation": true, "VPCConfig": { diff --git a/infrastructure/test/opensearch-stack.test.ts b/infrastructure/test/opensearch-stack.test.ts index b5e4bb4..698d44a 100644 --- a/infrastructure/test/opensearch-stack.test.ts +++ b/infrastructure/test/opensearch-stack.test.ts @@ -92,6 +92,18 @@ test('OpenSearchDomain Stack Test', () => { "UserPoolId": { "Ref": "UserPool" } - } + }, + "ClusterConfig": { + "DedicatedMasterCount": 3, + "DedicatedMasterEnabled": true, + "DedicatedMasterType": "m6g.xlarge.search", + "InstanceCount": 6, + "InstanceType": "r6g.2xlarge.search", + "ZoneAwarenessConfig": { + "AvailabilityZoneCount": 2 + }, + "ZoneAwarenessEnabled": true + }, + "EngineVersion": "OpenSearch_2.13", }); });