Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Commit

Permalink
update to version v4.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
abewub committed Jul 6, 2023
1 parent 7866ae4 commit 888d8bb
Show file tree
Hide file tree
Showing 17 changed files with 999 additions and 6,030 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ source/services/@aws-solutions/utils/*/index.js

# Node dependencies
node_modules
*.js
!jest.config.js
*.d.ts

# CDK asset staging directory
.cdk.staging
cdk.out
__snapshots__

# Misc
.DS_Store
.DS_Store

# IDEs
.idea
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.0.4] - 2023-07-07

### Changed

- Bug fix
- correct batch size for firhose.putRecordBatch
- Upgrade dependencies
- Enforce [imdsV2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html)

## [4.0.3] - 2023-04-13

### Changed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ See license [here](./LICENSE.txt)

## Collection of operational metrics

This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/centralized-logging/collection-of-operational-metrics.html).
This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/centralized-logging/collection-of-operational-metrics.html).

---

Expand Down
1,618 changes: 309 additions & 1,309 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-centralized-logging",
"version": "4.0.3",
"version": "4.0.4",
"description": "Centralized Logging on AWS",
"scripts": {
"lint": "./node_modules/eslint/bin/eslint.js . --ext .ts",
Expand All @@ -13,15 +13,15 @@
"author": "aws-solutions",
"license": "Apache-2.0",
"devDependencies": {
"@types/node": "^18.15.0",
"@types/node": "^20.3.1",
"@types/uuid": "^9.0.1",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"eslint": "^8.35.0",
"eslint-config-prettier": "^8.7.0",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"prettier": "^2.8.4",
"typescript": "^4.9.5",
"typescript": "^5.1.3",
"aws-cdk": "^2.68.0"
}
}
1 change: 1 addition & 0 deletions source/resources/lib/cl-demo-ec2-construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export class EC2Demo extends Construct {
init: init,
allowAllOutbound: true,
securityGroup: demoSg,
requireImdsv2: true,
});

demoEC2.addUserData(
Expand Down
1 change: 1 addition & 0 deletions source/resources/lib/cl-jumpbox-construct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export class Jumpbox extends Construct {
securityGroup: sg,
vpcSubnets: { subnets: props.subnets },
keyName: props.keyname,
requireImdsv2: true,
});
(jumpbox.node.defaultChild as CfnResource).cfnOptions.condition =
props.deploy;
Expand Down
6 changes: 3 additions & 3 deletions source/resources/lib/cl-primary-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export class CLPrimary extends Stack {
const metricsMap = new CfnMapping(this, "CLMap", {
mapping: {
Metric: {
SendAnonymousMetric: manifest.sendMetric,
SendAnonymizedMetric: manifest.sendMetric,
MetricsEndpoint: manifest.metricsEndpoint, // aws-solutions metrics endpoint
},
},
Expand Down Expand Up @@ -371,7 +371,7 @@ export class CLPrimary extends Stack {
environment: {
LOG_LEVEL: LogLevel.INFO, //change as needed
METRICS_ENDPOINT: metricsMap.findInMap("Metric", "MetricsEndpoint"),
SEND_METRIC: metricsMap.findInMap("Metric", "SendAnonymousMetric"),
SEND_METRIC: metricsMap.findInMap("Metric", "SendAnonymizedMetric"),
CUSTOM_SDK_USER_AGENT: `AwsSolution/${manifest.solutionId}/${manifest.solutionVersion}`,
CLUSTER_SIZE: clusterSize.valueAsString,
SOLUTION_ID: manifest.solutionId,
Expand Down Expand Up @@ -759,7 +759,7 @@ export class CLPrimary extends Stack {
CLUSTER_SIZE: clusterSize.valueAsString,
DELIVERY_STREAM: manifest.firehoseName,
METRICS_ENDPOINT: metricsMap.findInMap("Metric", "MetricsEndpoint"),
SEND_METRIC: metricsMap.findInMap("Metric", "SendAnonymousMetric"),
SEND_METRIC: metricsMap.findInMap("Metric", "SendAnonymizedMetric"),
CUSTOM_SDK_USER_AGENT: `AwsSolution/${manifest.solutionId}/${manifest.solutionVersion}`,
},
handler: "index.handler",
Expand Down
Loading

0 comments on commit 888d8bb

Please sign in to comment.