bumpup to v2.10.2b and updated CHANGELOG

aws-samples · Mar 30, 2024 · c3449f4 · c3449f4
1 parent 8686b58
commit c3449f4
Show file tree

Hide file tree

Showing 130 changed files with 602 additions and 611 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,8 @@ opensearchpy
 past*
 python_dateutil-2.8.1*
 requests*
+s3transfer*
+setuptools*
 typing_extensions*
 ua_parser*
 urllib3*
@@ -69,6 +71,7 @@ dashboard.serverless.zip
 # working files
 .lambda38/
 .lambda39/
+.lambda311/
 .DS_Store
 temp/
 work/
@@ -83,9 +86,13 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+.python-version
 .Python
+_distutils_hack
+distutils-precedence.pth
 build/
 develop-eggs/
+pkg_resources/
 dist/
 downloads/
 eggs/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,17 @@ 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.10.2b] - 2024-03-30
+### Added
+- Added support for Amazon OpenSearch 2.11 #432
+- Supports AWS ca-west-1/Canada (Calgary) Region #441
+
+### Fixed
+- Fixed a bug in the botocore dependencies for the Lambda function that creates the IOC DB #440
+
+### Security
+- Updated AWS SDK for pandas from 3.4.1 to v3.7.1 #442
+
 ## [2.10.2a] - 2023-10-07
 ### Fixed
 - Fixed regex error in ssl_cipher field of alb log #415

diff --git a/deployment/log-exporter/siem-integration-with-control-tower-china.template b/deployment/log-exporter/siem-integration-with-control-tower-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: Control Tower Integration"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: Control Tower Integration"
 Parameters:
   EsLoaderServiceRole:
     Type: String

diff --git a/deployment/log-exporter/siem-integration-with-control-tower-usgov.template b/deployment/log-exporter/siem-integration-with-control-tower-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: Control Tower Integration"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: Control Tower Integration"
 Parameters:
   EsLoaderServiceRole:
     Type: String

diff --git a/deployment/log-exporter/siem-integration-with-control-tower.template b/deployment/log-exporter/siem-integration-with-control-tower.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: Control Tower Integration"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: Control Tower Integration"
 Parameters:
   EsLoaderServiceRole:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-ad-china.template b/deployment/log-exporter/siem-log-exporter-ad-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Active Directory"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Active Directory"
 Parameters:
   KdfAdName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-ad-usgov.template b/deployment/log-exporter/siem-log-exporter-ad-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Active Directory"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Active Directory"
 Parameters:
   KdfAdName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-ad.template b/deployment/log-exporter/siem-log-exporter-ad.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Active Directory"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Active Directory"
 Parameters:
   KdfAdName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-apache-cwl-china.template b/deployment/log-exporter/siem-log-exporter-apache-cwl-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Apache"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Apache"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-apache-cwl-usgov.template b/deployment/log-exporter/siem-log-exporter-apache-cwl-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Apache"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Apache"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-apache-cwl.template b/deployment/log-exporter/siem-log-exporter-apache-cwl.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Apache"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Apache"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-clientvpn-china.template b/deployment/log-exporter/siem-log-exporter-clientvpn-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - ClientVPN"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - ClientVPN"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-clientvpn-usgov.template b/deployment/log-exporter/siem-log-exporter-clientvpn-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - ClientVPN"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - ClientVPN"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-clientvpn.template b/deployment/log-exporter/siem-log-exporter-clientvpn.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - ClientVPN"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - ClientVPN"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl-china.template b/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CloudHSM"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CloudHSM"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl-usgov.template b/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CloudHSM"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CloudHSM"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl.template b/deployment/log-exporter/siem-log-exporter-cloudhsm-cwl.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CloudHSM"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CloudHSM"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-core-china.template b/deployment/log-exporter/siem-log-exporter-core-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - core resource"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - core resource"
 Parameters:
   siemLogBucketName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-core-usgov.template b/deployment/log-exporter/siem-log-exporter-core-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - core resource"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - core resource"
 Parameters:
   siemLogBucketName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-core.template b/deployment/log-exporter/siem-log-exporter-core.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - core resource"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - core resource"
 Parameters:
   siemLogBucketName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-cwl-nocompress-china.template b/deployment/log-exporter/siem-log-exporter-cwl-nocompress-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CWL resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CWL resource without compress"
 Parameters:
   KdfName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-cwl-nocompress-usgov.template b/deployment/log-exporter/siem-log-exporter-cwl-nocompress-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CWL resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CWL resource without compress"
 Parameters:
   KdfName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-cwl-nocompress.template b/deployment/log-exporter/siem-log-exporter-cwl-nocompress.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - CWL resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - CWL resource without compress"
 Parameters:
   KdfName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-eventbridge-events-china.template b/deployment/log-exporter/siem-log-exporter-eventbridge-events-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -131,7 +131,7 @@ Resources:
   RuleInspector4666D3F5:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Inspector2 Coverage
@@ -154,7 +154,7 @@ Resources:
   RuleSecurityHubFDEAF80E:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Security Hub Findings - Imported
@@ -176,7 +176,7 @@ Resources:
   RuleConfigRules81A566BA:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Config Rules Compliance Change

diff --git a/deployment/log-exporter/siem-log-exporter-eventbridge-events-usgov.template b/deployment/log-exporter/siem-log-exporter-eventbridge-events-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -131,7 +131,7 @@ Resources:
   RuleInspector4666D3F5:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Inspector2 Coverage
@@ -154,7 +154,7 @@ Resources:
   RuleSecurityHubFDEAF80E:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Security Hub Findings - Imported
@@ -176,7 +176,7 @@ Resources:
   RuleConfigRules81A566BA:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Config Rules Compliance Change

diff --git a/deployment/log-exporter/siem-log-exporter-eventbridge-events.template b/deployment/log-exporter/siem-log-exporter-eventbridge-events.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - EventBridge events (SecurityHub, ConfigRules, Inspector)"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -131,7 +131,7 @@ Resources:
   RuleInspector4666D3F5:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Inspector2 Coverage
@@ -154,7 +154,7 @@ Resources:
   RuleSecurityHubFDEAF80E:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Security Hub Findings - Imported
@@ -176,7 +176,7 @@ Resources:
   RuleConfigRules81A566BA:
     Type: AWS::Events::Rule
     Properties:
-      Description: "SIEM on OpenSearch Service v2.10.2a:"
+      Description: "SIEM on OpenSearch Service v2.10.2b:"
       EventPattern:
         detail-type:
           - Config Rules Compliance Change

diff --git a/deployment/log-exporter/siem-log-exporter-fsx-china.template b/deployment/log-exporter/siem-log-exporter-fsx-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - FSx resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - FSx resource without compress"
 Parameters:
   FirehoseName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-fsx-usgov.template b/deployment/log-exporter/siem-log-exporter-fsx-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - FSx resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - FSx resource without compress"
 Parameters:
   FirehoseName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-fsx.template b/deployment/log-exporter/siem-log-exporter-fsx.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - FSx resource without compress"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - FSx resource without compress"
 Parameters:
   FirehoseName:
     Type: String

diff --git a/deployment/log-exporter/siem-log-exporter-linux-cwl-china.template b/deployment/log-exporter/siem-log-exporter-linux-cwl-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Linux"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Linux"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-linux-cwl-usgov.template b/deployment/log-exporter/siem-log-exporter-linux-cwl-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Linux"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Linux"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-linux-cwl.template b/deployment/log-exporter/siem-log-exporter-linux-cwl.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Linux"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Linux"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-nginx-cwl-china.template b/deployment/log-exporter/siem-log-exporter-nginx-cwl-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Nginx"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Nginx"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-nginx-cwl-usgov.template b/deployment/log-exporter/siem-log-exporter-nginx-cwl-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Nginx"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Nginx"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-nginx-cwl.template b/deployment/log-exporter/siem-log-exporter-nginx-cwl.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Nginx"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Nginx"
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/deployment/log-exporter/siem-log-exporter-trustedadvisor-china.template b/deployment/log-exporter/siem-log-exporter-trustedadvisor-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - TrustedAdvisor"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - TrustedAdvisor"
 Parameters:
   cweRulesFrequency:
     Type: Number
@@ -61,7 +61,7 @@ Resources:
           # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
           # SPDX-License-Identifier: MIT-0
           __copyright__ = 'Amazon.com, Inc. or its affiliates'
-          __version__ = '2.10.2a'
+          __version__ = '2.10.2b'
           __license__ = 'MIT-0'
           __author__ = 'Katsuya Matsuoka'
           __url__ = 'https://github.com/aws-samples/siem-on-amazon-opensearch-service'

diff --git a/deployment/log-exporter/siem-log-exporter-trustedadvisor-usgov.template b/deployment/log-exporter/siem-log-exporter-trustedadvisor-usgov.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - TrustedAdvisor"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - TrustedAdvisor"
 Parameters:
   cweRulesFrequency:
     Type: Number
@@ -61,7 +61,7 @@ Resources:
           # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
           # SPDX-License-Identifier: MIT-0
           __copyright__ = 'Amazon.com, Inc. or its affiliates'
-          __version__ = '2.10.2a'
+          __version__ = '2.10.2b'
           __license__ = 'MIT-0'
           __author__ = 'Katsuya Matsuoka'
           __url__ = 'https://github.com/aws-samples/siem-on-amazon-opensearch-service'

diff --git a/deployment/log-exporter/siem-log-exporter-trustedadvisor.template b/deployment/log-exporter/siem-log-exporter-trustedadvisor.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - TrustedAdvisor"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - TrustedAdvisor"
 Parameters:
   cweRulesFrequency:
     Type: Number
@@ -61,7 +61,7 @@ Resources:
           # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
           # SPDX-License-Identifier: MIT-0
           __copyright__ = 'Amazon.com, Inc. or its affiliates'
-          __version__ = '2.10.2a'
+          __version__ = '2.10.2b'
           __license__ = 'MIT-0'
           __author__ = 'Katsuya Matsuoka'
           __url__ = 'https://github.com/aws-samples/siem-on-amazon-opensearch-service'

diff --git a/deployment/log-exporter/siem-log-exporter-workspaces-china.template b/deployment/log-exporter/siem-log-exporter-workspaces-china.template
@@ -1,4 +1,4 @@
-Description: "SIEM on Amazon OpenSearch Service v2.10.2a: log exporter - Workspaces"
+Description: "SIEM on Amazon OpenSearch Service v2.10.2b: log exporter - Workspaces"
 Parameters:
   cweRulesFrequency:
     Type: Number
@@ -69,7 +69,7 @@ Resources:
           # SPDX-License-Identifier: MIT-0
           __copyright__ = ('Copyright Amazon.com, Inc. or its affiliates. '
                            'All Rights Reserved.')
-          __version__ = '2.10.2a'
+          __version__ = '2.10.2b'
           __license__ = 'MIT-0'
           __author__ = 'Akihiro Nakajima'
           __url__ = 'https://github.com/aws-samples/siem-on-amazon-opensearch-service'