cloud-governance 1.1.351__tar.gz → 1.1.353__tar.gz

{cloud_governance-1.1.351/cloud_governance.egg-info → cloud_governance-1.1.353}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloud-governance
-Version: 1.1.351
+Version: 1.1.353
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

cloud_governance-1.1.353/cloud_governance/common/mails/postfix.py

@@ -0,0 +1,213 @@
+import datetime
+import os
+import smtplib
+from email.message import EmailMessage
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from typing import Union, Optional
+
+from cloud_governance.common.clouds.aws.s3.s3_operations import S3Operations
+from cloud_governance.common.elasticsearch.elasticsearch_operations import ElasticSearchOperations
+from cloud_governance.common.ldap.ldap_search import LdapSearch
+from cloud_governance.common.logger.init_logger import logger
+
+# https://github.com/redhat-performance/quads/blob/master/quads/tools/postman.py
+from cloud_governance.common.logger.logger_time_stamp import logger_time_stamp
+from cloud_governance.common.utils.api_requests import APIRequests
+from cloud_governance.main.environment_variables import environment_variables
+
+
+class Postfix:
+    """
+    This class send mail using the postfix configuration
+    install postfix and configure on machine
+    $ dnf install postfix -y
+    $ vi /etc/postfix/main.cf
+    relayhost = [smtp.corp.redhat.com]
+    inet_interfaces = all
+    inet_protocols = all
+    relay_domains = rdu2.scalelab.redhat.com, redhat.com
+    $ systemctl restart postfix
+    """
+
+    def __init__(self):
+        self.__environment_variables_dict = environment_variables.environment_variables_dict
+        self.__LDAP_HOST_NAME = self.__environment_variables_dict.get('LDAP_HOST_NAME')
+        self.__ldap_search = LdapSearch(ldap_host_name=self.__LDAP_HOST_NAME)
+        self.reply_to = self.__environment_variables_dict.get('REPLY_TO', 'dev-null@redhat.com')
+        self.__es_host = self.__environment_variables_dict.get('es_host', '')
+        self.__policy = self.__environment_variables_dict.get('policy', '')
+        self.__es_port = self.__environment_variables_dict.get('es_port', '')
+        self.__account = self.__environment_variables_dict.get('account', '')
+        self.__policy_output = self.__environment_variables_dict.get('policy_output', '')
+        self.__default_admins = self.__environment_variables_dict.get('DEFAULT_ADMINS')
+        self.__email_alert = self.__environment_variables_dict.get('EMAIL_ALERT')
+        self.__mail_to = self.__environment_variables_dict.get('EMAIL_TO')
+        self.__mail_cc = self.__environment_variables_dict.get('EMAIL_CC')
+        self.__POSTFIX_HOST = environment_variables.POSTFIX_HOST
+        self.__POSTFIX_PORT = environment_variables.POSTFIX_PORT
+        self.bucket_name, self.key = self.get_bucket_name()
+        self.__perf_services_url = os.environ.get('PERF_SERVICES_URL')
+        self.__es_index = 'cloud-governance-mail-messages'
+        self.__api_request = APIRequests()
+        if self.__es_host:
+            self.__es_operations = ElasticSearchOperations(es_host=self.__es_host, es_port=self.__es_port)
+        if self.__policy_output:
+            self.__s3_operations = S3Operations(region_name='us-east-1')
+
+    def get_bucket_name(self):
+        key = 'logs'
+        if 's3' in self.__policy_output.lower():
+            targets = self.__policy_output.split('/')
+            bucket_name = targets[2]
+            key = targets[3]
+        else:
+            bucket_name = self.__policy_output
+        return bucket_name, key
+
+    def split_emails(self, email_str: str):
+        """
+        This method split the mail list
+        :param email_str:
+        :type email_str:
+        :return:
+        :rtype:
+        """
+        splitter = "," if "," in email_str else " "
+        return [item.strip() for item in email_str.split(splitter)]
+
+    def prettify_to(self, to: Union[str, list]):
+        """
+        This method prettifies to
+        :param to:
+        :type to:
+        :return:
+        :rtype:
+        """
+
+        if isinstance(to, str):
+            to = self.split_emails(email_str=to)
+        if isinstance(to, list):
+            return ','.join([item if '@redhat.com' in item else f'{item}@redhat.com' for item in to])
+        return to
+
+    def prettify_cc(self, cc: Union[str, list], to: str = ''):
+        """
+        This method prettifies cc
+        :param to:
+        :type to:
+        :param cc:
+        :type cc:
+        :return:
+        :rtype:
+        """
+        if isinstance(cc, str):
+            cc = self.split_emails(email_str=cc)
+        cc_unique_values = [cc_user if '@redhat.com' in cc_user else f'{cc_user}@redhat.com' for cc_user in cc]
+        to = self.prettify_to(to=to).split(',')
+        return ','.join(list(set(cc_unique_values) - set(to)))
+
+    def __save_to_elastic(self, **kwargs):
+        """
+        This method uploads data to elasticsearch
+        :param kwargs:
+        :return:
+        """
+        es_data = kwargs.get('es_data')
+        data = {'Policy': self.__policy,
+                'Account': self.__account.upper(),
+                'MessageType': kwargs.get('message_type', 'alert')}
+        if es_data:
+            data.update(es_data)
+        if kwargs.get('resource_id'):
+            data['resource_id'] = kwargs['resource_id']
+        if kwargs.get('extra_purse'):
+            data['extra_purse'] = round(kwargs['extra_purse'], 3)
+        if kwargs.get('remaining_budget'):
+            data['remaining_budget'] = kwargs['remaining_budget']
+        if self.__es_host:
+            self.__es_operations.upload_to_elasticsearch(data=data, index=self.__es_index)
+            logger.info(f'Uploaded to es index: {self.__es_index}')
+        else:
+            logger.info('Error missing the es_host')
+
+    def __save_to_s3(self, content: str, **kwargs):
+        """
+        This method save mail message to s3 bucket
+        :return:
+        """
+        if kwargs.get('filename'):
+            file_name = kwargs['filename'].split('/')[-1]
+            date_key = datetime.datetime.now().strftime("%Y%m%d%H")
+            if self.__policy_output:
+                self.__s3_operations.upload_file(file_name_path=kwargs['filename'],
+                                                 bucket=self.bucket_name,
+                                                 key=f'{self.key}/{self.__policy}/{date_key}',
+                                                 upload_file=file_name)
+                s3_path = f'{self.__policy_output}/logs/{self.__policy}/{date_key}/{file_name}'
+                content += f'\n\nresource_file_path: s3://{s3_path}\n\n'
+                logger.info("File Saved to S3")
+        self.__save_to_elastic(**kwargs)
+
+    @logger_time_stamp
+    def send_email_postfix(self, subject: str, to: any, cc: list, content: str, **kwargs):
+        if self.__email_alert:
+            if self.__mail_to:
+                to = self.__mail_to
+            if self.__mail_cc:
+                cc = self.__mail_cc
+            if not self.__ldap_search.get_user_details(user_name=to):
+                cc.append('athiruma@redhat.com')
+            response = {'ok': True}
+            to = self.prettify_to(to)
+            cc = self.prettify_cc(cc)
+            kwargs.setdefault('es_data', {}).update({'To': to, 'Cc': cc, 'Message': content})
+            if self.__perf_services_url:
+                body = {
+                    "cc": cc,
+                    "to": to,
+                    "subject": subject,
+                    "mail_body": content,
+                }
+                if kwargs.get('filename'):
+                    body['file_content'] = open(kwargs['filename']).read()
+                    body['filename'] = kwargs['filename'].split('/')[-1]
+                api_url = self.__perf_services_url + f"/postfix/send_mail"
+                response = self.__api_request.post(api_url, json=body)
+                response = response.json()
+            else:
+                msg = MIMEMultipart('alternative')
+                msg["Subject"] = subject
+                msg["From"] = "%s <%s>" % (
+                    'cloud-governance',
+                    "@".join(["noreply-cloud-governance", 'redhat.com']),
+                )
+                msg["To"] = to
+                msg["Cc"] = cc
+                # msg.add_header("Reply-To", self.reply_to)
+                # msg.add_header("User-Agent", self.reply_to)
+                if kwargs.get('filename'):
+                    attachment = MIMEText(open(kwargs['filename']).read())
+                    attachment.add_header('Content-Disposition', 'attachment',
+                                          filename=kwargs['filename'].split('/')[-1])
+                    msg.attach(attachment)
+                if kwargs.get('mime_type'):
+                    msg.attach(MIMEText(content, kwargs.get('mime_type')))
+                else:
+                    msg.attach(MIMEText(content))
+                try:
+                    with smtplib.SMTP(self.__POSTFIX_HOST, self.__POSTFIX_PORT) as s:
+                        try:
+                            s.send_message(msg)
+                        except smtplib.SMTPException as ex:
+                            logger.error(f'Error while sending mail, {ex}')
+                    response = {
+                        'ok': True
+                    }
+                except Exception as err:
+                    logger.error(f'Some error occurred, {err}')
+            if isinstance(response, dict) and response.get('ok'):
+                logger.info(f'Mail sent successfully to {to}')
+                self.__save_to_s3(content, **kwargs)
+                return True
+            return False

{cloud_governance-1.1.351 → cloud_governance-1.1.353}/cloud_governance/common/utils/configs.py

@@ -7,6 +7,7 @@ HOURS_IN_SECONDS = 3600
 HOURS_IN_DAY = 24
 HOURS_IN_MONTH = 720
 TOTAL_BYTES_IN_KIB = 1024
+INSTANCE_START_PREFIX = 'i-'
 
 DATE_FORMAT = "%Y-%m-%d"
 DATE_TIME_FORMAT_T = "%Y-%m-%dT%h:%m"

{cloud_governance-1.1.351 → cloud_governance-1.1.353}/cloud_governance/policy/policy_operations/aws/tag_non_cluster/tag_non_cluster_resources.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 
 from cloud_governance.common.logger.init_logger import logger
+from cloud_governance.common.utils.configs import INSTANCE_START_PREFIX
 from cloud_governance.policy.policy_operations.aws.tag_non_cluster.non_cluster_operations import NonClusterOperations
 
 
@@ -36,7 +37,8 @@ class TagNonClusterResources(NonClusterOperations):
         @param tags:
         @return:
         """
-        username = self.get_username(start_time=launch_time, resource_id=instance_id, resource_type='AWS::EC2::Instance', tags=tags)
+        username = self.get_username(start_time=launch_time, resource_id=instance_id,
+                                     resource_type='AWS::EC2::Instance', tags=tags)
         search_tags = []
         user_tags = []
         if not username:
@@ -73,8 +75,10 @@ class TagNonClusterResources(NonClusterOperations):
                     if add_tags:
                         if self.dry_run == 'no':
                             try:
-                                self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags, resource_ids=[instance_id], tags=add_tags)
-                                logger.info(f'Added tags to instance: {instance_id} total: {len(add_tags)} tags: {add_tags}')
+                                self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags,
+                                                             resource_ids=[instance_id], tags=add_tags)
+                                logger.info(
+                                    f'Added tags to instance: {instance_id} total: {len(add_tags)} tags: {add_tags}')
                             except Exception as err:
                                 logger.info(err)
                         instances_ids.append(instance_id)
@@ -94,7 +98,8 @@ class TagNonClusterResources(NonClusterOperations):
             volume_id = volume.get('VolumeId')
             tags = volume.get('Tags')
             if not self.validate_existing_tag(tags=tags):
-                username = self.get_username(start_time=volume.get('CreateTime'), resource_id=volume_id, resource_type='AWS::EC2::Volume', tags=tags)
+                username = self.get_username(start_time=volume.get('CreateTime'), resource_id=volume_id,
+                                             resource_type='AWS::EC2::Volume', tags=tags)
                 search_tags = []
                 if not username:
                     get_tags, username = self._get_tags_fom_attachments(attachments=volume.get('Attachments'))
@@ -120,8 +125,10 @@ class TagNonClusterResources(NonClusterOperations):
                 if volume_tags:
                     if self.dry_run == 'no':
                         try:
-                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags, resource_ids=[volume_id], tags=volume_tags)
-                            logger.info(f'added tags to volume_id: {volume_id} total: {len(volume_tags)}  tags: {volume_tags}')
+                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags,
+                                                         resource_ids=[volume_id], tags=volume_tags)
+                            logger.info(
+                                f'added tags to volume_id: {volume_id} total: {len(volume_tags)}  tags: {volume_tags}')
                         except Exception as err:
                             logger.info(err)
                     volume_ids.append(volume_id)
@@ -141,24 +148,33 @@ class TagNonClusterResources(NonClusterOperations):
             snapshot_id = snapshot.get('SnapshotId')
             tags = snapshot.get('Tags')
             if not self.validate_existing_tag(tags=tags):
-                username = self.get_username(start_time=snapshot.get('StartTime'), resource_id=snapshot_id, resource_type='AWS::EC2::Snapshot', tags=tags)
+                username = self.get_username(start_time=snapshot.get('StartTime'), resource_id=snapshot_id,
+                                             resource_type='AWS::EC2::Snapshot', tags=tags)
                 if 'vm_import_image' in username:
                     start_time = snapshot.get('StartTime') + timedelta(seconds=5)
                     end_time = start_time + timedelta(minutes=30)
-                    assume_username = self.get_username(start_time=start_time, resource_id=snapshot_id, resource_type='AWS::EC2::Snapshot', tags=tags, end_time=end_time)
+                    assume_username = self.get_username(start_time=start_time, resource_id=snapshot_id,
+                                                        resource_type='AWS::EC2::Snapshot', tags=tags,
+                                                        end_time=end_time)
                     if assume_username:
                         username = assume_username
                 search_tags = []
                 if not username:
                     if snapshot.get('Description') and 'Created' in snapshot.get('Description'):
-                        image_tags, username = self._get_tags_from_snapshot_description_images(description=snapshot.get('Description'))
+                        image_tags, username = self._get_tags_from_snapshot_description_images(
+                            description=snapshot.get('Description'))
                         if not username:
-                            instance_id = snapshot.get('Description').split(" ")[2].split("(")[1][:-1]
-                            instances = self._get_instances_data(instance_id)
-                            if instances:
-                                for item in instances:
-                                    if item.get('InstanceId') == instance_id:
-                                        item_tags, username = self._get_tags_from_instance_item(instance_item=item)
+                            if INSTANCE_START_PREFIX in snapshot.get('Description'):
+                                try:
+                                    instance_id = snapshot.get('Description').split(" ")[2].split("(")[1][:-1]
+                                    instances = self._get_instances_data(instance_id)
+                                    if instances:
+                                        for item in instances:
+                                            if item.get('InstanceId') == instance_id:
+                                                item_tags, username = self._get_tags_from_instance_item(
+                                                    instance_item=item)
+                                except Exception as err:
+                                    logger.info(err)
                 else:
                     search_tags.extend(self._append_input_tags())
                 if username:
@@ -179,8 +195,10 @@ class TagNonClusterResources(NonClusterOperations):
                 if snapshot_tags:
                     if self.dry_run == 'no':
                         try:
-                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags, resource_ids=[snapshot_id], tags=snapshot_tags)
-                            logger.info(f'added tags to snapshots: {snapshot_id} total: {len(snapshot_tags)} tags: {snapshot_tags}')
+                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags,
+                                                         resource_ids=[snapshot_id], tags=snapshot_tags)
+                            logger.info(
+                                f'added tags to snapshots: {snapshot_id} total: {len(snapshot_tags)} tags: {snapshot_tags}')
                         except Exception as err:
                             logger.info(err)
                     snapshot_ids.append(snapshot_id)
@@ -203,7 +221,8 @@ class TagNonClusterResources(NonClusterOperations):
             image_name = image.get('Name')
             start_time = datetime.fromisoformat(image.get('CreationDate')[:-1] + '+00:00')
             if not self.validate_existing_tag(tags=tags):
-                username = self.get_username(start_time=start_time, resource_id=image_id, resource_type='AWS::EC2::Ami', tags=tags, resource_name=image_name)
+                username = self.get_username(start_time=start_time, resource_id=image_id, resource_type='AWS::EC2::Ami',
+                                             tags=tags, resource_name=image_name)
                 search_tags = []
                 search_tags.extend(self._append_input_tags())
                 if username:
@@ -223,7 +242,8 @@ class TagNonClusterResources(NonClusterOperations):
                 if image_tags:
                     if self.dry_run == 'no':
                         try:
-                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags, resource_ids=[image_id], tags=image_tags)
+                            self.utils.tag_aws_resources(client_method=self.ec2_client.create_tags,
+                                                         resource_ids=[image_id], tags=image_tags)
                             logger.info(f'added tags to image: {image_id} total: {len(image_tags)} tags: {image_tags}')
                         except Exception as err:
                             logger.info(err)

{cloud_governance-1.1.351 → cloud_governance-1.1.353/cloud_governance.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloud-governance
-Version: 1.1.351
+Version: 1.1.353
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

{cloud_governance-1.1.351 → cloud_governance-1.1.353}/setup.py

@@ -2,7 +2,7 @@ from codecs import open
 from os import path
 from setuptools import setup, find_packages
 
-__version__ = '1.1.351'
+__version__ = '1.1.353'
 
 here = path.abspath(path.dirname(__file__))
 

cloud_governance-1.1.351/cloud_governance/common/mails/postfix.py

@@ -1,176 +0,0 @@
-import datetime
-import smtplib
-from email.message import EmailMessage
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from typing import Union, Optional
-
-from cloud_governance.common.clouds.aws.s3.s3_operations import S3Operations
-from cloud_governance.common.elasticsearch.elasticsearch_operations import ElasticSearchOperations
-from cloud_governance.common.ldap.ldap_search import LdapSearch
-from cloud_governance.common.logger.init_logger import logger
-
-# https://github.com/redhat-performance/quads/blob/master/quads/tools/postman.py
-from cloud_governance.common.logger.logger_time_stamp import logger_time_stamp
-from cloud_governance.main.environment_variables import environment_variables
-
-
-class Postfix:
-    """
-    This class send mail using the postfix configuration
-    install postfix and configure on machine
-    $ dnf install postfix -y
-    $ vi /etc/postfix/main.cf
-    relayhost = [smtp.corp.redhat.com]
-    inet_interfaces = all
-    inet_protocols = all
-    relay_domains = rdu2.scalelab.redhat.com, redhat.com
-    $ systemctl restart postfix
-    """
-
-    def __init__(self):
-        self.__environment_variables_dict = environment_variables.environment_variables_dict
-        self.__LDAP_HOST_NAME = self.__environment_variables_dict.get('LDAP_HOST_NAME')
-        self.__ldap_search = LdapSearch(ldap_host_name=self.__LDAP_HOST_NAME)
-        self.reply_to = self.__environment_variables_dict.get('REPLY_TO', 'dev-null@redhat.com')
-        self.__es_host = self.__environment_variables_dict.get('es_host', '')
-        self.__policy = self.__environment_variables_dict.get('policy', '')
-        self.__es_port = self.__environment_variables_dict.get('es_port', '')
-        self.__account = self.__environment_variables_dict.get('account', '')
-        self.__policy_output = self.__environment_variables_dict.get('policy_output', '')
-        self.__default_admins = self.__environment_variables_dict.get('DEFAULT_ADMINS')
-        self.__email_alert = self.__environment_variables_dict.get('EMAIL_ALERT')
-        self.__mail_to = self.__environment_variables_dict.get('EMAIL_TO')
-        self.__mail_cc = self.__environment_variables_dict.get('EMAIL_CC')
-        self.__POSTFIX_HOST = environment_variables.POSTFIX_HOST
-        self.__POSTFIX_PORT = environment_variables.POSTFIX_PORT
-        self.bucket_name, self.key = self.get_bucket_name()
-        self.__es_index = 'cloud-governance-mail-messages'
-        if self.__es_host:
-            self.__es_operations = ElasticSearchOperations(es_host=self.__es_host, es_port=self.__es_port)
-        if self.__policy_output:
-            self.__s3_operations = S3Operations(region_name='us-east-1')
-
-    def get_bucket_name(self):
-        key = 'logs'
-        if 's3' in self.__policy_output.lower():
-            targets = self.__policy_output.split('/')
-            bucket_name = targets[2]
-            key = targets[3]
-        else:
-            bucket_name = self.__policy_output
-        return bucket_name, key
-
-    def split_emails(self, email_str: str):
-        """
-        This method split the mail list
-        :param email_str:
-        :type email_str:
-        :return:
-        :rtype:
-        """
-        splitter = "," if "," in email_str else " "
-        return [item.strip() for item in email_str.split(splitter)]
-
-    def prettify_to(self, to: Union[str, list]):
-        """
-        This method prettify to
-        :param to:
-        :type to:
-        :return:
-        :rtype:
-        """
-
-        if isinstance(to, str):
-            to = self.split_emails(email_str=to)
-        if isinstance(to, list):
-            return ','.join([item if '@redhat.com' in item else f'{item}@redhat.com' for item in to])
-        return to
-
-    def prettify_cc(self, cc: Union[str, list], to: str = ''):
-        """
-        This method prettify cc
-        :param to:
-        :type to:
-        :param cc:
-        :type cc:
-        :return:
-        :rtype:
-        """
-        if isinstance(cc, str):
-            cc = self.split_emails(email_str=cc)
-        cc_unique_values = [cc_user if '@redhat.com' in cc_user else f'{cc_user}@redhat.com' for cc_user in cc]
-        to = self.prettify_to(to=to).split(',')
-        return ','.join(list(set(cc_unique_values) - set(to)))
-
-    @logger_time_stamp
-    def send_email_postfix(self, subject: str, to: any, cc: list, content: str, **kwargs):
-        if self.__email_alert:
-            if self.__mail_to:
-                to = self.__mail_to
-            if self.__mail_cc:
-                cc = self.__mail_cc
-            if not self.__ldap_search.get_user_details(user_name=to):
-                cc.append('athiruma@redhat.com')
-            msg = MIMEMultipart('alternative')
-            msg["Subject"] = subject
-            msg["From"] = "%s <%s>" % (
-                'cloud-governance',
-                "@".join(["noreply-cloud-governance", 'redhat.com']),
-            )
-            msg["To"] = self.prettify_to(to)
-            msg["Cc"] = self.prettify_cc(cc=cc, to=to)
-            # msg.add_header("Reply-To", self.reply_to)
-            # msg.add_header("User-Agent", self.reply_to)
-            if kwargs.get('filename'):
-                attachment = MIMEText(open(kwargs['filename']).read())
-                attachment.add_header('Content-Disposition', 'attachment',
-                                      filename=kwargs['filename'].split('/')[-1])
-                msg.attach(attachment)
-            if kwargs.get('mime_type'):
-                msg.attach(MIMEText(content, kwargs.get('mime_type')))
-            else:
-                msg.attach(MIMEText(content))
-            email_string = msg.as_string()
-            try:
-                with smtplib.SMTP(self.__POSTFIX_HOST, self.__POSTFIX_PORT) as s:
-                    try:
-                        logger.debug(email_string)
-                        s.send_message(msg)
-                        if isinstance(to, str):
-                            logger.warn(f'Mail sent successfully to {to}@redhat.com')
-                        elif isinstance(to, list):
-                            logger.warn(f'Mail sent successfully to {", ".join(to)}@redhat.com')
-                        if kwargs.get('filename'):
-                            file_name = kwargs['filename'].split('/')[-1]
-                            date_key = datetime.datetime.now().strftime("%Y%m%d%H")
-                            if self.__policy_output:
-                                self.__s3_operations.upload_file(file_name_path=kwargs['filename'],
-                                                                 bucket=self.bucket_name,
-                                                                 key=f'{self.key}/{self.__policy}/{date_key}',
-                                                                 upload_file=file_name)
-                                s3_path = f'{self.__policy_output}/logs/{self.__policy}/{date_key}/{file_name}'
-                                content += f'\n\nresource_file_path: s3://{s3_path}\n\n'
-                        es_data = kwargs.get('es_data')
-                        data = {'Policy': self.__policy, 'To': to, 'Cc': cc, 'Message': content,
-                                'Account': self.__account.upper(), 'MessageType': kwargs.get('message_type', 'alert')}
-                        if es_data:
-                            data.update(es_data)
-                        if kwargs.get('resource_id'):
-                            data['resource_id'] = kwargs['resource_id']
-                        if kwargs.get('extra_purse'):
-                            data['extra_purse'] = round(kwargs['extra_purse'], 3)
-                        if kwargs.get('remaining_budget'):
-                            data['remaining_budget'] = kwargs['remaining_budget']
-                        if self.__es_host:
-                            self.__es_operations.upload_to_elasticsearch(data=data, index=self.__es_index)
-                            logger.warn(f'Uploaded to es index: {self.__es_index}')
-                        else:
-                            logger.warn('Error missing the es_host')
-                    except smtplib.SMTPException as ex:
-                        logger.error(f'Error while sending mail, {ex}')
-                        return False
-                return True
-            except Exception as err:
-                logger.error(f'Some error occurred, {err}')
-                return False