From 09ef8aba0fd6d2752c42acfa820d0926127174c1 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <38561120+sergargar@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:17:40 +0100 Subject: [PATCH] fix(): set default region CloudWatch (#1693) Co-authored-by: sergargar --- .../cloudwatch_changes_to_network_acls_alarm_configured.py | 2 +- ...loudwatch_changes_to_network_gateways_alarm_configured.py | 2 +- ...watch_changes_to_network_route_tables_alarm_configured.py | 2 +- .../cloudwatch_changes_to_vpcs_alarm_configured.py | 2 +- ...and_alarm_for_aws_config_configuration_changes_enabled.py | 2 +- ...and_alarm_for_cloudtrail_configuration_changes_enabled.py | 2 +- .../cloudwatch_log_metric_filter_authentication_failures.py | 2 +- ...cloudwatch_log_metric_filter_aws_organizations_changes.py | 2 +- ...metric_filter_disable_or_scheduled_deletion_of_kms_cmk.py | 2 +- ...udwatch_log_metric_filter_for_s3_bucket_policy_changes.py | 2 +- .../cloudwatch_log_metric_filter_policy_changes.py | 2 +- .../cloudwatch_log_metric_filter_root_usage.py | 2 +- .../cloudwatch_log_metric_filter_security_group_changes.py | 2 +- .../cloudwatch_log_metric_filter_sign_in_without_mfa.py | 2 +- .../cloudwatch_log_metric_filter_unauthorized_api_calls.py | 2 +- .../providers/aws/services/cloudwatch/cloudwatch_service.py | 5 +++++ 16 files changed, 20 insertions(+), 15 deletions(-) diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured.py index 95ee7aa8..88729b81 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_acls_alarm_configured/cloudwatch_changes_to_network_acls_alarm_configured.py @@ -19,7 +19,7 @@ class cloudwatch_changes_to_network_acls_alarm_configured(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured.py index 3f6f0ac7..819269d2 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_gateways_alarm_configured/cloudwatch_changes_to_network_gateways_alarm_configured.py @@ -19,7 +19,7 @@ class cloudwatch_changes_to_network_gateways_alarm_configured(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured.py index 11dcedf0..03bfab83 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_network_route_tables_alarm_configured/cloudwatch_changes_to_network_route_tables_alarm_configured.py @@ -19,7 +19,7 @@ class cloudwatch_changes_to_network_route_tables_alarm_configured(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured.py index a6c678ad..ae36f122 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_changes_to_vpcs_alarm_configured/cloudwatch_changes_to_vpcs_alarm_configured.py @@ -19,7 +19,7 @@ class cloudwatch_changes_to_vpcs_alarm_configured(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.py index 830a4c93..ee49a888 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_changes_enabled.py @@ -21,7 +21,7 @@ class cloudwatch_log_metric_filter_and_alarm_for_aws_config_configuration_change report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.py index f7929978..97e9eeea 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled/cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_changes_enabled.py @@ -21,7 +21,7 @@ class cloudwatch_log_metric_filter_and_alarm_for_cloudtrail_configuration_change report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures.py index 523d5414..bdc95c0b 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_authentication_failures/cloudwatch_log_metric_filter_authentication_failures.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_authentication_failures(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes.py index c543ef81..86e6691d 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_aws_organizations_changes/cloudwatch_log_metric_filter_aws_organizations_changes.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_aws_organizations_changes(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.py index 821041d5..7c2e3a39 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk/cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_disable_or_scheduled_deletion_of_kms_cmk(Chec report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.py index 5683e6f0..8bdab437 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes/cloudwatch_log_metric_filter_for_s3_bucket_policy_changes.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_for_s3_bucket_policy_changes(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes.py index 4ef88481..7ac9ce65 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_policy_changes/cloudwatch_log_metric_filter_policy_changes.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_policy_changes(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage.py index ec5fae22..18a736b5 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_root_usage/cloudwatch_log_metric_filter_root_usage.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_root_usage(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes.py index 177cc548..0a1897e0 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_security_group_changes/cloudwatch_log_metric_filter_security_group_changes.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_security_group_changes(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa.py index 607374e0..4ce39e42 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_sign_in_without_mfa/cloudwatch_log_metric_filter_sign_in_without_mfa.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_sign_in_without_mfa(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls.py index 69a9b77b..8c6bda8b 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_log_metric_filter_unauthorized_api_calls/cloudwatch_log_metric_filter_unauthorized_api_calls.py @@ -19,7 +19,7 @@ class cloudwatch_log_metric_filter_unauthorized_api_calls(Check): report.status_extended = ( "No CloudWatch log groups found with metric filters or alarms associated." ) - report.region = "us-east-1" + report.region = cloudwatch_client.region report.resource_id = cloudtrail_client.audited_account # 1. Iterate for CloudWatch Log Group in CloudTrail trails log_groups = [] diff --git a/prowler/providers/aws/services/cloudwatch/cloudwatch_service.py b/prowler/providers/aws/services/cloudwatch/cloudwatch_service.py index c250db48..e6b4f28c 100644 --- a/prowler/providers/aws/services/cloudwatch/cloudwatch_service.py +++ b/prowler/providers/aws/services/cloudwatch/cloudwatch_service.py @@ -11,6 +11,11 @@ class CloudWatch: self.service = "cloudwatch" self.session = audit_info.audit_session self.audited_account = audit_info.audited_account + self.region = list( + generate_regional_clients( + self.service, audit_info, global_service=True + ).keys() + )[0] self.regional_clients = generate_regional_clients(self.service, audit_info) self.metric_alarms = [] self.__threading_call__(self.__describe_alarms__)