aws-solutions · gsingh04 · May 22, 2025 · May 22, 2025
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -15,7 +15,7 @@ body:
   - type: textarea
     id: expected
     attributes:
-      label: Expected Behavior
+      label: Expected behavior
       description: |
         What did you expect to happen?
     validations:
@@ -34,7 +34,7 @@ body:
   - type: textarea
     id: reproduction
     attributes:
-      label: Reproduction Steps
+      label: To Reproduce
       description: |
         Provide a self-contained, concise snippet of code that can be used to reproduce the issue.
         For more complex issues provide a repo with the smallest sample that reproduces the bug.
@@ -54,7 +54,7 @@ body:
   - type: textarea
     id: context
     attributes:
-      label: Additional Information/Context
+      label: Additional context
       description: |
         Anything else that might be relevant for troubleshooting this bug. Providing context helps us come up with a solution that is most useful in the real world.
     validations:
@@ -68,6 +68,10 @@ body:
     validations:
       required: true
 
+  - type: markdown
+    attributes:
+      value: "# Please complete the following information about the solution:"
+
   - type: input
     id: aws-region
     attributes:
@@ -78,7 +82,7 @@ body:
   - type: textarea
     id: other
     attributes:
-      label: Other information
+      label: Other information / Screenshots
       description: |
         e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
     validations:

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,21 +1,22 @@
 ---
 name: 🚀 Feature Request
 description: Suggest an idea for this project
+about: Suggest an idea for this solution
 title: "(module name): (short issue description)"
 labels: [enhancement, needs-triage]
 assignees: []
 body:
   - type: textarea
     id: description
     attributes:
-      label: Describe the feature
+      label: Describe the feature you'd like
       description: A clear and concise description of the feature you are proposing.
     validations:
       required: true
   - type: textarea
     id: use-case
     attributes:
-      label: Use Case
+      label: Is your feature request related to a problem? Please describe.
       description: |
         Why do you need this feature? For example: "I'm always frustrated when..."
     validations:
@@ -31,7 +32,7 @@ body:
   - type: textarea
     id: other
     attributes:
-      label: Other Information
+      label: Additional context
       description: |
         Any alternative solutions or features you considered, a more detailed explanation, stack traces, related issues, links for context, etc.
     validations:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,29 @@ 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).
 
+## [2.4.0] - 2025-05-22
+
+### Added 
+
+- Anonymized operational metrics collection
+
+### Changed
+
+- Added input validation to ensure Light Engine table name only contains alphanumeric characters, hyphens, and underscores
+- Renamed PostgreSQL log field `duration` to `query_time` for consistency with existing MySQL log format
+
+### Fixed
+
+- Issue where domains would display inconsistent metric values. [Issue #277](https://github.com/aws-solutions/centralized-logging-with-opensearch/issues/277)
+- Enhanced OpenSearch API retry mechanism in Log processor Lambda to handle IAM role propagation delays
+
+### Security
+
+- Updated setuptools package to address [CVE-2025-47273](https://avd.aquasec.com/nvd/2025/cve-2025-47273/)
+
 ## [2.3.3] - 2025-04-30
 
-### Updated
+### Changed
 
 - Cognito user invitation email template
 
@@ -35,7 +55,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated prismjs package to address [CVE-2024-53382](https://avd.aquasec.com/nvd/2024/cve-2024-53382/)
 - Updated Babel packages to address [CVE-2025-27789](https://avd.aquasec.com/nvd/2025/cve-2025-27789/)
 
-
 ## [2.3.1] - 2025-02-24
 
 ### Changed

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -55,3 +55,5 @@ If you discover a potential security issue in this project we ask that you notif
 ## Licensing
 
 See the [LICENSE](https://github.com/aws-solutions/centralized-logging-with-opensearch/blob/main/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.
diff --git a/CUSTOM_BUILD.md b/CUSTOM_BUILD.md
@@ -130,17 +130,3 @@ Once you have uploaded the distributable to your Amazon S3 bucket, you can start
 
     Then you can deploy the solution to your account by launching a new AWS CloudFormation stack using the link of the solution template in Amazon S3.
 
-- Deploy via CDK
-
-    In case your accounts have not been bootstrapped for cdk yet, run:
-
-    ```
-    npx cdk bootstrap
-    ```
-
-    Then run:
-    ```
-    cd ./source/constructs
-    npx cdk deploy CentralizedLogging --parameters adminEmail=<your email address>
-    ```
-
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -20,7 +20,7 @@ openapi_spec_validator under the Apache-2.0 license
 pyparsing under the MIT license
 pyyaml under the MIT license
 binaryornot under the BSD license
-chardet under GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL)
+chardet under the LGPL license(s).
 numpy under the BSD-3-Clause license
 pyarrow under the Apache-2.0 license
 pytest-httpserver under the MIT license
@@ -218,15 +218,11 @@ cookie under the MIT license
 ua-parser-builtins under the under the Apache-2.0 license
 urllib3 under the MIT license
 urllib3<1.27, under the MIT license
-urlgrabber under GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL)
 iniparse under the MIT license
 pip under the MIT license
-wsgiref under the Python-2.0 license
 Python under the Python-2.0 license
-yum-metadata-parser under the GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL)
 rpm-python under the MIT license
 pycurl under the GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL)
-pygpgme under the GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL)
 lambda/python under the ISC license
 format under the MIT license
 exit under the Unlicense license
@@ -809,7 +805,6 @@ char-regex under the MIT license
 character-entities under the MIT license
 character-entities-legacy under the MIT license
 character-reference-invalid under the MIT license
-chardet under the MIT license
 check-types under the MIT license
 chokidar under the MIT license
 chrome-trace-event under the MIT license
@@ -1416,7 +1411,7 @@ prettier-linter-helpers under the MIT license
 pretty-bytes under the MIT license
 pretty-error under the MIT license
 pretty-format under the MIT license
-prettytable under the MIT license
+prettytable under the BSD-3-Clause license
 prismjs under the MIT license
 process-nextick-args under the MIT license
 promise under the MIT license
@@ -1516,7 +1511,7 @@ set-blocking under the ISC license
 set-function-length under the MIT license
 set-function-name under the MIT license
 setprototypeof under the ISC license
-setuptools under the ISC license
+setuptools under the MIT license
 shebang-command under the MIT license
 shebang-regex under the MIT license
 shell-quote under the MIT license
@@ -1732,15 +1727,16 @@ color-support under the ISC license.
 charset-normalizer under the MIT license.
 python-dateutil under the Apache-2.0 license.
 six under the MIT license.
-typing-extensions under the PSF-2.0 license.
+typing-extensions under the PSF-2.0 license. 
 jinja2 under the 0BSD license.
 markupsafe under the 0BSD license.
 packaging under the Apache-2.0 license.
 pywin32 under the PSF-2.0 license.
 werkzeug under the 0BSD license.
 commonlib under the 0BSD license.
 pyopenssl under the Apache-2.0 license.
-
+wsgiref under the PSF or ZPL license(s).
+yum-metadata-parser under the MIT license.
 
 ********************
 OPEN SOURCE LICENSES
@@ -1761,5 +1757,7 @@ Python-2.0 - https://opensource.org/licenses/Python-2.0
 Unlicense - https://opensource.org/licenses/Unlicense
 LGPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 LGPL-2.1-only - https://spdx.org/licenses/LGPL-2.1-only.html
+LGPL - https://spdx.org/licenses/GPL-2.0-or-later.html
+GNU Lesser General Public License v2 or later (LGPLv2+) - https://spdx.org/licenses/GPL-2.0-or-later.html
 Zlib - https://spdx.org/licenses/Zlib.html
 PSF-2.0 - https://opensource.org/licenses/Python-2.0
diff --git a/README.md b/README.md
@@ -41,3 +41,6 @@ Please follow the [Implementation Guide](https://docs.aws.amazon.com/solutions/l
 Please follow the [Customization Guide](CUSTOM_BUILD.md) for custom build.
 
 
+## Collection of operational metrics
+
+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-with-opensearch/reference.html).
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -56,8 +56,8 @@ export overrideWarningsEnabled=false
 usage() 
 {
     echo "Usage: $0 bucket solution-name version"
-    echo "Please provide the base source bucket name, trademarked solution name, and version." 
-    echo "For example: ./build-s3-dist.sh mybucket my-solution v1.0.0" 
+    echo "Please provide the base source bucket name, trademarked solution name, version." 
+    echo "For example: ./build-s3-dist.sh mybucket my-solution v1.0.0"
     exit 1 
 }
 

diff --git a/deployment/ecr/clo-logging-syslog/Dockerfile b/deployment/ecr/clo-logging-syslog/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/aws-observability/aws-for-fluent-bit:2.32.2.20241008
+FROM public.ecr.aws/aws-observability/aws-for-fluent-bit:2.32.5.20250422
 
 RUN yum update -y && yum install -y unzip
 

diff --git a/deployment/ecr/clo-s3-list-objects/poetry.lock b/deployment/ecr/clo-s3-list-objects/poetry.lock
diff --git a/deployment/ecr/clo-s3-list-objects/pyproject.toml b/deployment/ecr/clo-s3-list-objects/pyproject.toml
@@ -4,7 +4,7 @@ description = ""
 requires-python = ">=3.10"
 dependencies = [
     "boto3 (==1.26.111)",
-    "setuptools (==70.0.0)"
+    "setuptools (==78.1.1)"
 ]
 
 [tool.poetry]

diff --git a/deployment/run-unit-tests.sh b/deployment/run-unit-tests.sh
@@ -349,6 +349,8 @@ t run_python_test $construct_dir/lib/kinesis/lambda lambda &
 tests_to_run+=($!)
 t run_python_test $construct_dir/lambda/api/grafana grafana &
 tests_to_run+=($!)
+t run_python_test $construct_dir/lambda/metrics metrics &
+tests_to_run+=($!)
 cd $construct_dir/../../deployment/ecr/clo-s3-list-objects
 rm -rf common-lib
 t run_python_test $construct_dir/../../deployment/ecr/clo-s3-list-objects s3-list-objects &
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,3 +55,5 @@ If you discover a potential security issue in this project we ask that you notif
		## Licensing

		See the [LICENSE](https://github.com/aws-solutions/centralized-logging-with-opensearch/blob/main/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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,6 @@ Please follow the [Implementation Guide](https://docs.aws.amazon.com/solutions/l
		Please follow the [Customization Guide](CUSTOM_BUILD.md) for custom build.


		## Collection of operational metrics

		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-with-opensearch/reference.html).