Added the zombie_cluster to email report

redhat-performance · Aug 19, 2024 · 64ee24f · 64ee24f
1 parent 6cbdcea
commit 64ee24f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cloud_governance/policy/common_policies/send_aggregated_alerts.py b/cloud_governance/policy/common_policies/send_aggregated_alerts.py
@@ -52,7 +52,7 @@ def __get_es_data(self):
                         {
                             "terms": {
                                 "policy.keyword": [
-                                    "ebs_in_use", "zombie_cluster_resource",
+                                    "ebs_in_use",
                                     "instance_run", "cluster_run", "optimize_resource_report",
                                     "optimize_resources_report", "skipped_resources"
                                 ]

diff --git a/cloud_governance/policy/policy_operations/aws/zombie_cluster/run_zombie_cluster_resources.py b/cloud_governance/policy/policy_operations/aws/zombie_cluster/run_zombie_cluster_resources.py
@@ -3,6 +3,7 @@
 import typeguard
 
 from cloud_governance.common.clouds.aws.ec2.ec2_operations import EC2Operations
+from cloud_governance.common.clouds.aws.utils.common_methods import get_tag_value_from_tags
 from cloud_governance.common.elasticsearch.elasticsearch_operations import ElasticSearchOperations
 from cloud_governance.main.environment_variables import environment_variables
 from cloud_governance.policy.policy_operations.aws.zombie_cluster.zombie_cluster_common_methods import ZombieClusterCommonMethods
@@ -113,6 +114,8 @@ def zombie_cluster_resource(delete: bool = False, region: str = 'us-east-2', res
     delete_data = {}
     cluster_data = {}
     zombie_cluster_common_methods = ZombieClusterCommonMethods(region=region)
+    cluster_delete_days = {}
+    zombie_cluster_resources_ids = {}
     for func in func_resource_list:
         resource_data, cluster_left_out_days = func()
         if resource_data:
@@ -121,6 +124,10 @@ def zombie_cluster_resource(delete: bool = False, region: str = 'us-east-2', res
                 cluster_left_out_days=cluster_left_out_days,
                 notify_data=notify_data, delete_data=delete_data, cluster_data=cluster_data, func_name=func.__name__)
             resource_data_list = sorted(set(resource_data.values()))
+            for resource_id, cluster_name in resource_data.items():
+                zombie_cluster_resources_ids.setdefault(cluster_name.strip(), []).append(resource_id)
+                cluster_delete_days[cluster_name] = get_tag_value_from_tags(tag_name='ClusterDeleteDays',
+                                                                            tags=cluster_left_out_days.get(cluster_name, []))
             resource_data_list = [func.__name__.replace("zombie_cluster_", "") + ':' + item for item in
                                   resource_data_list]
             logger.info(f'key: {func.__name__}, count: {len(resource_data)}, data: {resource_data_list}')
@@ -143,6 +150,8 @@ def zombie_cluster_resource(delete: bool = False, region: str = 'us-east-2', res
             for zombie_cluster in zombie_cluster_result:
                 zombie_cluster['region_name'] = region
                 zombie_cluster['account'] = account
+                zombie_cluster['ResourceIds'] = zombie_cluster_resources_ids[zombie_cluster['ResourceId']]
+                zombie_cluster['CleanUpDays'] = cluster_delete_days[zombie_cluster['ZombieClusterTag']]
                 es_operations.upload_to_elasticsearch(data=zombie_cluster.copy(), index=es_index)
                 logger.info(f'Uploaded the policy results to elasticsearch index: {es_index}')
         else: