From b473da20b4d287926c9f62aaaae8bded8d2a89bd Mon Sep 17 00:00:00 2001 From: Joshua McKiddy Date: Fri, 22 Oct 2021 07:28:36 -0700 Subject: [PATCH 1/3] Updates for 1.4.3 --- assisted_log_enabler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assisted_log_enabler.py b/assisted_log_enabler.py index cedbd2f6..0ce2dc79 100644 --- a/assisted_log_enabler.py +++ b/assisted_log_enabler.py @@ -75,14 +75,14 @@ def assisted_log_enabler(): output_handle.setFormatter(formatter) parser = argparse.ArgumentParser(description='Assisted Log Enabler - Find resources that are not logging, and turn them on.') - parser.add_argument('--mode',help=' Choose the mode that you want to run Assisted Log Enabler in. Available modes: single_account, multi_account. WARNING: For multi_account, You must have the associated CloudFormation template deployed as a StackSet. See the README file for more details.') + parser.add_argument('--mode',help=' Choose the mode that you want to run Assisted Log Enabler in. Available modes: single_account, multi_account, cleanup, dryrun. WARNING: For multi_account, You must have the associated CloudFormation template deployed as a StackSet. See the README file for more details.') - function_parser_group = parser.add_argument_group('Service Options', 'Use these flags to choose which services you want to turn logging on for.') + function_parser_group = parser.add_argument_group('Single & Multi Account Options', 'Use these flags to choose which services you want to turn logging on for.') function_parser_group.add_argument('--all', action='store_true', help=' Turns on all of the log types within the Assisted Log Enabler for AWS.') function_parser_group.add_argument('--eks', action='store_true', help=' Turns on Amazon EKS audit & authenticator logs.') function_parser_group.add_argument('--vpcflow', action='store_true', help=' Turns on Amazon VPC Flow Logs.') function_parser_group.add_argument('--r53querylogs', action='store_true', help=' Turns on Amazon Route 53 Resolver Query Logs.') - function_parser_group.add_argument('--cloudtrail', action='store_true', help=' Turns on AWS CloudTrail.') + function_parser_group.add_argument('--cloudtrail', action='store_true', help=' Turns on AWS CloudTrail. Only available in Single Account version.') cleanup_parser_group = parser.add_argument_group('Cleanup Options', 'Use these flags to choose which resources you want to turn logging off for.') cleanup_parser_group.add_argument('--single_r53querylogs', action='store_true', help=' Removes Amazon Route 53 Resolver Query Log resources created by Assisted Log Enabler for AWS.') From e6011950d66dad03ab5f5209d4f56970fa50f0a0 Mon Sep 17 00:00:00 2001 From: Joshua McKiddy Date: Wed, 3 Nov 2021 16:18:10 -0700 Subject: [PATCH 2/3] Updates for 1.4.3 --- NOTICE | 2 +- README.md | 2 +- assisted_log_enabler.py | 4 ++-- permissions/ALE_child_account_role.yaml | 2 +- permissions/ALE_permissions_example_cleanup_single.json | 2 +- permissions/ALE_permissions_example_single_account.json | 2 +- subfunctions/ALE_cleanup_single.py | 2 +- subfunctions/ALE_dryrun_multi.py | 2 +- subfunctions/ALE_dryrun_single.py | 2 +- subfunctions/ALE_multi_account.py | 2 +- subfunctions/ALE_single_account.py | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NOTICE b/NOTICE index 711f9306..943f5697 100644 --- a/NOTICE +++ b/NOTICE @@ -1,2 +1,2 @@ -Assisted Log Enabler +Assisted Log Enabler for AWS Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/README.md b/README.md index b217e8de..769106f8 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ python3 assisted_log_enabler.py █████  ██ ██  ██ ███████ ██████  ██  █████  ██████   ██     ██  ██ ██ ██   ██ ██   ██ ██  ██     ██   ██  ███████ ██   ████ ██  ██ ██████  ███████ ███████ ██  ██  - Joshua "DozerCat" McKiddy - Team DragonCat - AWS + Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS Twitter: @jdubm31 Type -h for help. diff --git a/assisted_log_enabler.py b/assisted_log_enabler.py index 0ce2dc79..c0f77f39 100644 --- a/assisted_log_enabler.py +++ b/assisted_log_enabler.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging import os @@ -60,7 +60,7 @@ def banner(): █████  ██ ██  ██ ███████ ██████  ██  █████  ██████   ██     ██  ██ ██ ██   ██ ██   ██ ██  ██     ██   ██  ███████ ██   ████ ██  ██ ██████  ███████ ███████ ██  ██  - Joshua "DozerCat" McKiddy - Team DragonCat - AWS + Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS Twitter: @jdubm31 Type -h for help. ''') diff --git a/permissions/ALE_child_account_role.yaml b/permissions/ALE_child_account_role.yaml index 9b192bcc..a0072e2f 100644 --- a/permissions/ALE_child_account_role.yaml +++ b/permissions/ALE_child_account_role.yaml @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS # This sample template is for creating an IAM Role within child accounts, for the purpose of running Assisted Log Enabler across a multi-account environment. diff --git a/permissions/ALE_permissions_example_cleanup_single.json b/permissions/ALE_permissions_example_cleanup_single.json index 0b82b34b..b3548d1c 100644 --- a/permissions/ALE_permissions_example_cleanup_single.json +++ b/permissions/ALE_permissions_example_cleanup_single.json @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -// Joshua "DozerCat" McKiddy - Team DragonCat - AWS +// Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS { "Version": "2012-10-17", diff --git a/permissions/ALE_permissions_example_single_account.json b/permissions/ALE_permissions_example_single_account.json index 5632d9ba..ce3db60b 100644 --- a/permissions/ALE_permissions_example_single_account.json +++ b/permissions/ALE_permissions_example_single_account.json @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -// Joshua "DozerCat" McKiddy - Team DragonCat - AWS +// Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS { "Version": "2012-10-17", diff --git a/subfunctions/ALE_cleanup_single.py b/subfunctions/ALE_cleanup_single.py index 0b38b5ab..680d45e2 100644 --- a/subfunctions/ALE_cleanup_single.py +++ b/subfunctions/ALE_cleanup_single.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging diff --git a/subfunctions/ALE_dryrun_multi.py b/subfunctions/ALE_dryrun_multi.py index aee476eb..832f7a0e 100644 --- a/subfunctions/ALE_dryrun_multi.py +++ b/subfunctions/ALE_dryrun_multi.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging diff --git a/subfunctions/ALE_dryrun_single.py b/subfunctions/ALE_dryrun_single.py index 376788d2..09fb04c5 100644 --- a/subfunctions/ALE_dryrun_single.py +++ b/subfunctions/ALE_dryrun_single.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging diff --git a/subfunctions/ALE_multi_account.py b/subfunctions/ALE_multi_account.py index e6a96ade..252813fc 100644 --- a/subfunctions/ALE_multi_account.py +++ b/subfunctions/ALE_multi_account.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging diff --git a/subfunctions/ALE_single_account.py b/subfunctions/ALE_single_account.py index 78fa2180..ae59bc1f 100644 --- a/subfunctions/ALE_single_account.py +++ b/subfunctions/ALE_single_account.py @@ -1,7 +1,7 @@ #// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. #// SPDX-License-Identifier: Apache-2.0 # Assisted Log Enabler for AWS - Find resources that are not logging, and turn them on. -# Joshua "DozerCat" McKiddy - Team DragonCat - AWS +# Joshua "DozerCat" McKiddy - Customer Incident Response Team (CIRT) - AWS import logging From 84f8c39c7f90da9aa37fe9e087cff8c7c6916696 Mon Sep 17 00:00:00 2001 From: Joshua McKiddy Date: Thu, 4 Nov 2021 09:18:24 -0700 Subject: [PATCH 3/3] Updates for 1.4.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54cb64c4..29f8d32a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -166,3 +166,9 @@ ### Changed * CloudTrail name to be more descriptive that it's created by Assisted Log Enabler for AWS. + +## [1.4.3] - 2021-11-03 + +### Changed +* References to Team DragonCat are now referred to Customer Incident Response Team (CIRT). +* Various argparse help message to be more descriptive. \ No newline at end of file