Update to version v1.0.6

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,7 +17,7 @@ Steps to reproduce the behavior.
 A clear and concise description of what you expected to happen.
 
 **Please complete the following information about the solution:**
-- [ ] Version: [e.g. v1.0.5]
+- [ ] Version: [e.g. v1.0.6]
 
 To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0021) - Video On Demand workflow with AWS Step Functions, MediaConvert, MediaPackage, S3, CloudFront and DynamoDB. Version **v5.0.0**_". If the description does not contain the version information, you can look at the mappings section of the template:
 

.gitignore

@@ -49,4 +49,4 @@ lerna-debug.log*
 *.pem
 **/instance-types/*
 
-.idea/*
+.idea/*

CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [1.0.6] - 2024-04-02
+
+### Security
+
+- Upgrade Druid to v31.0.0
+- Upgrade EC2 AMI to AL2023
+- Patch cross-spawn, esbuild and aws-cdk-lib vulnerabilities
+
+### Fixed
+
+- Fix broken CloudWatch agent integration
+
 ## [1.0.5] - 2024-10-24
 
 ### Security

CONTRIBUTING.md

@@ -54,6 +54,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-solutions/scalable-analytics-using-apache-druid-on-aws/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-solutions/scalable-analytics-using-apache-druid-on-aws/blob/master/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

@@ -1,4 +1,5 @@
 Scalable Analytics using Apache Druid on AWS
+
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except
 in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/
@@ -54,7 +55,7 @@ This software includes third party software subject to the following copyrights:
 @aws-sdk/xml-builder under the Apache-2.0 license
 @babel/code-frame under the MIT license
 @babel/compat-data under the MIT license
-@babel/core under the MIT license.
+@babel/core under the MIT license
 @babel/generator under the MIT license
 @babel/helper-compilation-targets under the MIT license
 @babel/helper-environment-visitor under the MIT license
@@ -87,7 +88,7 @@ This software includes third party software subject to the following copyrights:
 @babel/plugin-syntax-typescript under the MIT license
 @babel/template under the MIT license
 @babel/traverse under the MIT license
-@babel/types under the MIT license.
+@babel/types under the MIT license
 @balena/dockerignore under the Apache-2.0 license
 @bcoe/v8-coverage under the MIT license
 @cspotcode/source-map-support under the MIT license
@@ -102,7 +103,7 @@ This software includes third party software subject to the following copyrights:
 @istanbuljs/load-nyc-config under the ISC license
 @istanbuljs/schema under the MIT license
 @jest/console under the MIT license
-@jest/core under the MIT license.
+@jest/core under the MIT license
 @jest/environment under the MIT license
 @jest/expect under the MIT license
 @jest/expect-utils under the MIT license
@@ -114,7 +115,7 @@ This software includes third party software subject to the following copyrights:
 @jest/test-result under the MIT license
 @jest/test-sequencer under the MIT license
 @jest/transform under the MIT license
-@jest/types under the MIT license.
+@jest/types under the MIT license
 @jridgewell/gen-mapping under the MIT license
 @jridgewell/resolve-uri under the MIT license
 @jridgewell/set-array under the MIT license
@@ -126,12 +127,12 @@ This software includes third party software subject to the following copyrights:
 @pkgr/utils under the MIT license
 @sinclair/typebox under the MIT license
 @sinonjs/commons under the BSD-3-Clause license
-@sinonjs/fake-timers under the BSD-3-Clause license.
+@sinonjs/fake-timers under the BSD-3-Clause license
 @sinonjs/samsam under the BSD-3-Clause license
 @sinonjs/text-encoding under the (Unlicense OR Apache-2.0) license
 @smithy/abort-controller under the Apache-2.0 license
 @smithy/config-resolver under the Apache-2.0 license
-@smithy/core under the Apache-2.0 license.
+@smithy/core under the Apache-2.0 license
 @smithy/credential-provider-imds under the Apache-2.0 license
 @smithy/eventstream-codec under the Apache-2.0 license
 @smithy/fetch-http-handler under the Apache-2.0 license
@@ -153,7 +154,7 @@ This software includes third party software subject to the following copyrights:
 @smithy/shared-ini-file-loader under the Apache-2.0 license
 @smithy/signature-v4 under the Apache-2.0 license
 @smithy/smithy-client under the Apache-2.0 license
-@smithy/types under the Apache-2.0 license.
+@smithy/types under the Apache-2.0 license
 @smithy/url-parser under the Apache-2.0 license
 @smithy/util-base64 under the Apache-2.0 license
 @smithy/util-body-length-browser under the Apache-2.0 license
@@ -162,7 +163,7 @@ This software includes third party software subject to the following copyrights:
 @smithy/util-config-provider under the Apache-2.0 license
 @smithy/util-defaults-mode-browser under the Apache-2.0 license
 @smithy/util-defaults-mode-node under the Apache-2.0 license
-@smithy/util-endpoints under the Apache-2.0 license.
+@smithy/util-endpoints under the Apache-2.0 license
 @smithy/util-hex-encoding under the Apache-2.0 license
 @smithy/util-middleware under the Apache-2.0 license
 @smithy/util-retry under the Apache-2.0 license
@@ -198,12 +199,12 @@ This software includes third party software subject to the following copyrights:
 @types/yargs under the MIT license
 @types/yargs-parser under the MIT license
 @typescript-eslint/eslint-plugin under the MIT license
-@typescript-eslint/parser under the BSD-2-Clause license.
+@typescript-eslint/parser under the BSD-2-Clause license
 @typescript-eslint/scope-manager under the MIT license
 @typescript-eslint/type-utils under the MIT license
-@typescript-eslint/types under the MIT license.
+@typescript-eslint/types under the MIT license
 @typescript-eslint/typescript-estree under the BSD-2-Clause license
-@typescript-eslint/utils under the MIT license.
+@typescript-eslint/utils under the MIT license
 @typescript-eslint/visitor-keys under the MIT license
 acorn under the MIT license
 acorn-jsx under the MIT license
@@ -221,6 +222,7 @@ astral-regex under the MIT license
 asynckit under the MIT license
 aws-cdk under the Apache-2.0 license
 aws-cdk-lib under the Apache-2.0 license
+aws-observability/aws-for-fluent-bit under the Apache-2.0 license
 aws-sdk-client-mock under the MIT license
 axios under the MIT license
 babel-jest under the MIT license
@@ -251,6 +253,7 @@ char-regex under the MIT license
 ci-info under the MIT license
 cjs-module-lexer under the MIT license
 cliui under the ISC license
+cloudwatch-agent/cloudwatch-agent under the MIT license                                                
 co under the MIT license
 collect-v8-coverage under the MIT license
 color-convert under the MIT license
@@ -264,6 +267,8 @@ com.amazonaws/aws-java-sdk-s3 under the Apache-2.0 license
 com.amazonaws/aws-java-sdk-sts under the Apache-2.0 license
 com.amazonaws/elasticache-java-cluster-client under the Apache-2.0 license
 com.amazonaws/jmespath-java under the Apache-2.0 license
+com.amazon.solutions.druid.extensions/druid-cloudwatch under the Apache-2.0 license
+com.amazon.solutions.druid.extensions/druid-oidc under the Apache-2.0 license
 com.fasterxml.jackson.core/jackson-annotations under the Apache-2.0 license
 com.fasterxml.jackson.core/jackson-core under the Apache-2.0 license
 com.fasterxml.jackson.core/jackson-databind under the Apache-2.0 license
@@ -310,10 +315,10 @@ com.nimbusds/oauth2-oidc-sdk under the Apache-2.0 license
 com.ning/compress-lzf under the Apache-2.0 license
 com.opencsv/opencsv under the Apache-2.0 license
 com.squareup.okhttp3/mockwebserver under the Apache-2.0 license
-com.squareup.okhttp3/okhttp under the Apache-2.0 license.
+com.squareup.okhttp3/okhttp under the Apache-2.0 license
 com.squareup.okhttp/okhttp under the Apache-2.0 license
 com.squareup.okio/okio under the Apache-2.0 license
-com.squareup.okio/okio-jvm under the Apache-2.0 license.
+com.squareup.okio/okio-jvm under the Apache-2.0 license
 com.sun.activation/javax.activation under the (CDDL-1.0 OR GPL-2.0-with-classpath-exception) license
 com.sun.jersey.contribs/jersey-guice under the CDDL-1.1 license
 com.sun.jersey.contribs/jersey-guice under the GPL-2.0-with-classpath-exception license
@@ -355,6 +360,7 @@ diff-sequences under the MIT license
 dir-glob under the MIT license
 doctrine under the Apache-2.0 license
 docutils under the BSD-2-Clause license
+druid under the Apache-2.0 license
 electron-to-chromium under the ISC license
 emittery under the MIT license
 emoji-regex under the MIT license
@@ -379,6 +385,7 @@ execa under the MIT license
 exit under the MIT license
 expect under the MIT license.
 exponential-backoff under the Apache-2.0 license
+external-dns/external-dns under the Apache-2.0 license
 fast-deep-equal under the MIT license
 fast-diff under the Apache-2.0 license
 fast-glob under the MIT license
@@ -405,9 +412,9 @@ get-package-type under the MIT license
 get-stream under the MIT license
 glob under the ISC license
 glob-parent under the ISC license
-globals under the MIT license.
+globals under the MIT license
 globby under the MIT license
-graceful-fs under the ISC license.
+graceful-fs under the ISC license
 graphemer under the MIT license
 has under the MIT license
 has-flag under the MIT license
@@ -460,11 +467,11 @@ is-stream under the MIT license
 is-wsl under the MIT license
 isarray under the MIT license
 isexe under the ISC license
-istanbul-lib-coverage under the BSD-3-Clause license.
+istanbul-lib-coverage under the BSD-3-Clause license
 istanbul-lib-instrument under the BSD-3-Clause license
-istanbul-lib-report under the BSD-3-Clause license.
+istanbul-lib-report under the BSD-3-Clause license
 istanbul-lib-source-maps under the BSD-3-Clause license
-istanbul-reports under the BSD-3-Clause license.
+istanbul-reports under the BSD-3-Clause license
 it.unimi.dsi/fastutil under the Apache-2.0 license
 it.unimi.dsi/fastutil-core under the Apache-2.0 license
 it.unimi.dsi/fastutil-extra under the Apache-2.0 license
@@ -481,7 +488,7 @@ javax.validation/validation-api under the Apache-2.0 license
 javax.ws.rs/jsr311-api under the CDDL-1.0 license
 javax.xml.bind/jaxb-api under the CDDL-1.1 license
 javax.xml.bind/jaxb-api under the GPL-2.0-with-classpath-exception license
-jest under the MIT license.
+jest under the MIT license
 jest-changed-files under the MIT license
 jest-circus under the MIT license
 jest-cli under the MIT license
@@ -511,7 +518,7 @@ jest-worker under the MIT license
 Jinja2 under the BSD-3-Clause license
 joda-time/joda-time under the Apache-2.0 license
 js-tokens under the MIT license
-js-yaml under the MIT license.
+js-yaml under the MIT license
 jsesc under the MIT license
 json5 under the MIT license
 json-parse-even-better-errors under the MIT license
@@ -548,7 +555,7 @@ mock under the 0BSD license
 moment under the MIT license
 moto under the Apache-2.0 license
 ms under the MIT license
-mustache under the MIT license.
+mustache under the MIT license
 natural-compare under the MIT license
 natural-compare-lite under the MIT license
 net.bytebuddy/byte-buddy under the Apache-2.0 license
@@ -561,7 +568,7 @@ net.minidev/accessors-smart under the Apache-2.0 license
 net.minidev/json-smart under the Apache-2.0 license
 net.thisptr/jackson-jq under the Apache-2.0 license
 nise under the BSD-3-Clause license
-node-forge under the BSD-3-Clause license.
+node-forge under the BSD-3-Clause license
 node-int64 under the MIT license
 node-releases under the MIT license
 normalize-path under the MIT license
@@ -650,7 +657,7 @@ org.glassfish/jakarta.el under the GPL-2.0-with-classpath-exception license
 org.glassfish/javax.el under the (CDDL-1.0 OR GPL-2.0-with-classpath-exception) license
 org.hamcrest/hamcrest-core under the BSD-3-Clause license
 org.hibernate.validator/hibernate-validator under the Apache-2.0 license
-org.hibernate/hibernate-validator under the Apache-2.0 license.
+org.hibernate/hibernate-validator under the Apache-2.0 license
 org.hyperic/sigar under the Apache-2.0 license
 org.jboss.logging/jboss-logging under the Apache-2.0 license
 org.jdbi/jdbi under the Apache-2.0 license
@@ -678,7 +685,7 @@ org.roaringbitmap/shims under the Apache-2.0 license
 org.skife.config/config-magic under the Apache-2.0 license
 org.slf4j/jcl-over-slf4j under the Apache-2.0 license
 org.slf4j/slf4j-api under the MIT license
-org.tukaani/xz under the Public Domain license
+org.tukaani/xz under the 0BSD license
 org.xerial.snappy/snappy-java under the Apache-2.0 license
 p-limit under the MIT license
 p-locate under the MIT license
@@ -698,7 +705,7 @@ pirates under the MIT license
 pkg-dir under the MIT license
 pluggy under the MIT license
 prelude-ls under the MIT license
-prettier under the MIT license.
+prettier under the MIT license
 prettier-linter-helpers under the MIT license
 pretty-format under the MIT license
 prompts under the MIT license
@@ -714,6 +721,7 @@ pygpgme under the GNU Lesser General Public License v2 or later (LGPLv2+) licens
 pygpgme under the LGPL-2.1-only license
 pytest under the MIT license
 pytest-cov under the MIT license
+Python under the PSF license
 python-dateutil under the (Apache-2.0 or BSD) license
 queue-microtask under the MIT license
 react-is under the MIT license
@@ -726,23 +734,24 @@ resolve.exports under the MIT license
 responses under the Apache-2.0 license
 reusify under the MIT license
 rimraf under the ISC license
+rpm-python under the MIT license
 run-applescript under the MIT license
 run-parallel under the MIT license
 s3transfer under the Apache-2.0 license
-semver under the ISC license.
+semver under the ISC license
 setuptools under the MIT license
 shebang-command under the MIT license
 shebang-regex under the MIT license
 signal-exit under the ISC license
-sinon under the BSD-3-Clause license.
+sinon under the BSD-3-Clause license
 sisteransi under the MIT license
 slash under the MIT license
 slice-ansi under the MIT license
 software.amazon.ion/ion-java under the Apache-2.0 license
-source-map under the BSD-3-Clause license.
-source-map-support under the MIT license.
+source-map under the BSD-3-Clause license
+source-map-support under the MIT license
 sprintf-js under the BSD-3-Clause license
-stack-utils under the MIT license.
+stack-utils under the MIT license
 string-length under the MIT license
 string-width under the MIT license
 strip-ansi under the MIT license
@@ -775,7 +784,7 @@ uri-js under the BSD-2-Clause license
 urlgrabber under the GNU Lesser General Public License v2 or later (LGPLv2+) license
 urlgrabber under the LGPL-2.0-or-later license
 urllib3 under the MIT license
-uuid under the MIT license.
+uuid under the MIT license
 v8-compile-cache-lib under the MIT license
 v8-to-istanbul under the ISC license
 walker under the Apache-2.0 license
@@ -790,10 +799,11 @@ xmltodict under the MIT license
 y18n under the ISC license
 yallist under the ISC license
 yaml under the ISC license
-yargs under the MIT license.
-yargs-parser under the ISC license.
+yargs under the MIT license
+yargs-parser under the ISC license
 yn under the MIT license
 yocto-queue under the MIT license
+yum-metadata-parser under the GPL-2.0 license
 
 ********************
 OPEN SOURCE LICENSES
@@ -813,7 +823,7 @@ CC0-1.0 - None
 CDDL-1.0 - None
 CDDL-1.1 - None
 EPL-1.0 - http://www.eclipse.org/legal/epl-v10.html
-EPL-2.0 - None
+EPL-2.0 - http://www.eclipse.org/legal/epl-v20.html
 GNU Lesser General Public License v2 or later (LGPLv2+) - None
 GNU Library or Lesser General Public License (LGPL) - None
 GPL-2.0-with-classpath-exception - None
@@ -826,7 +836,8 @@ LGPL/MIT - None
 MIT - https://opensource.org/licenses/MIT
 Mozilla Public License, Version 2.0 - http://www.mozilla.org/MPL/2.0/index.txt
 PSF or ZPL - None
-PSF-2.0 - https://opensource.org/licenses/PSF-2.0
+PSF-2.0 - https://opensource.org/license/python-2-0
+Python-2.0 - https://opensource.org/license/python-2-0
 Public Domain - None
 Unicode/ICU License - https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE
-Unlicense - https://opensource.org/licenses/Unlicense
+Unlicense - https://opensource.org/licenses/Unlicense