diff --git a/cloud_governance/policy/common_policies/send_aggregated_alerts.py b/cloud_governance/policy/common_policies/send_aggregated_alerts.py index 99864c21..3670b1a9 100644 --- a/cloud_governance/policy/common_policies/send_aggregated_alerts.py +++ b/cloud_governance/policy/common_policies/send_aggregated_alerts.py @@ -1,6 +1,7 @@ -from datetime import datetime, timedelta, timezone import pandas +from datetime import datetime, timedelta, timezone + from cloud_governance.common.elasticsearch.elasticsearch_operations import ElasticSearchOperations from cloud_governance.common.logger.logger_time_stamp import logger_time_stamp from cloud_governance.common.mails.mail_message import MailMessage diff --git a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily index e8444197..b1a2a1dd 100644 --- a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily @@ -41,7 +41,7 @@ pipeline { // By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py // POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]' - SKIP_POLICIES_ALERT = ["unused_access_key"] + SKIP_POLICIES_ALERT = '["unused_access_key"]' } stages { stage('Checkout') { // Checkout (git clone ...) the projects repository @@ -80,7 +80,7 @@ pipeline { string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'), string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) { if (account == 'industry-partners') { - env.SKIP_POLICIES_ALERT = [] + env.SKIP_POLICIES_ALERT = '[]' } env.account_name = "${account}" env.ADMIN_MAIL_LIST = "${accounts_list[account]}" diff --git a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily index 3697c287..066dfbc4 100644 --- a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily @@ -29,7 +29,7 @@ pipeline { // By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py // POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]' - SKIP_POLICIES_ALERT = ["unused_access_key"] + SKIP_POLICIES_ALERT = '["unused_access_key"]' } stages { stage('Checkout') { // Checkout (git clone ...) the projects repository diff --git a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily index 06a8dd85..9cd34d29 100644 --- a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily +++ b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily @@ -26,7 +26,7 @@ pipeline { // By default, all policies are running in dry_run="yes" mode and the whole list can be found in run_policies.py // POLICIES_IN_ACTION: Policies that run in the dry_run="no" mode POLICIES_IN_ACTION = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles", "zombie_cluster_resource"]' - SKIP_POLICIES_ALERT = ["unused_access_key"] + SKIP_POLICIES_ALERT = '["unused_access_key"]' } stages { stage('Checkout') { // Checkout (git clone ...) the projects repository