cloud-governance 1.1.358__py3-none-any.whl → 1.1.360__py3-none-any.whl

cloud_governance/common/elasticsearch/elasticsearch_operations.py

@@ -27,19 +27,32 @@ class ElasticSearchOperations:
     MIN_SEARCH_RESULTS = 100
     DEFAULT_ES_BULK_LIMIT = 5000
 
-    def __init__(self, es_host: str = None, es_port: str = None, region: str = '', bucket: str = '',
+    def __init__(self,
+                 es_host: str = None,
+                 es_port: str = None,
+                 region: str = '',
+                 es_user: str = None,
+                 es_password: str = None,
+                 bucket: str = '',
                  logs_bucket_key: str = '',
                  timeout: int = 2000):
         self.__environment_variables_dict = environment_variables.environment_variables_dict
         self.__es_host = es_host if es_host else self.__environment_variables_dict.get('es_host')
         self.__es_port = es_port if es_port else self.__environment_variables_dict.get('es_port')
+        self.__es_user = es_user if es_user else self.__environment_variables_dict.get('es_user')
+        self.__es_password = es_password if es_password else self.__environment_variables_dict.get('es_password')
         self.__region = region
         self.__timeout = int(
             self.__environment_variables_dict.get('ES_TIMEOUT')) if self.__environment_variables_dict.get(
             'ES_TIMEOUT') else timeout
         self.__account = self.__environment_variables_dict.get('account')
         try:
-            self.__es = Elasticsearch([{'host': self.__es_host, 'port': self.__es_port}], timeout=self.__timeout,
+            add_host = {'host': self.__es_host, 'port': self.__es_port,
+                        'http_auth': f'{self.__es_user}:{self.__es_password}'}
+            if int(self.__es_port) == 443:
+                add_host['use_ssl'] = True
+            self.__es = Elasticsearch([add_host],
+                                      timeout=self.__timeout,
                                       max_retries=2)
         except Exception as err:
             self.__es = None

cloud_governance/main/environment_variables.py

@@ -92,13 +92,13 @@ class EnvironmentVariables:
             self._environment_variables_dict['account'] = self.get_aws_account_alias_name().upper().replace(
                 'OPENSHIFT-', '')
         self._environment_variables_dict['policy'] = EnvironmentVariables.get_env('policy', '')
-
-        self._environment_variables_dict['aws_non_cluster_policies'] = ['instance_idle', 'ec2_stop', 'ebs_in_use',
-                                                                        'ebs_unattached', 's3_inactive',
-                                                                        'empty_roles', 'ip_unattached',
-                                                                        'unused_nat_gateway',
-                                                                        'zombie_snapshots', 'skipped_resources',
-                                                                        'monthly_report', 'optimize_resources_report']
+        # cost_usage_reports - athena queries on pair account, spot and graviton usage
+        self._environment_variables_dict['non_cluster_policies'] = ['instance_run', 'unattached_volume', 'cluster_run',
+                                                                    'ip_unattached', 'unused_nat_gateway', 'instance_idle',
+                                                                     'ec2_stop', 'ebs_in_use','database_idle', 's3_inactive',
+                                                                    'empty_roles', 'tag_resources', 'cost_usage_reports',
+                                                                    'zombie_snapshots', 'skipped_resources',
+                                                                    'monthly_report', 'optimize_resources_report']
         es_index = 'cloud-governance-policy-es-index'
         self._environment_variables_dict['cost_policies'] = ['cost_explorer', 'cost_over_usage', 'cost_billing_reports',
                                                              'cost_explorer_payer_billings', 'spot_savings_analysis']
@@ -130,6 +130,7 @@ class EnvironmentVariables:
         self._environment_variables_dict['start_date'] = EnvironmentVariables.get_env('start_date', '')
         self._environment_variables_dict['end_date'] = EnvironmentVariables.get_env('end_date', '')
         self._environment_variables_dict['granularity'] = EnvironmentVariables.get_env('granularity', 'DAILY')
+        # ['User', 'Budget', 'Project', 'Manager']
         self._environment_variables_dict['cost_explorer_tags'] = EnvironmentVariables.get_env('cost_explorer_tags',
                                                                                               '{}')
 
@@ -184,6 +185,8 @@ class EnvironmentVariables:
         self._environment_variables_dict['upload_data_es'] = EnvironmentVariables.get_env('upload_data_es', '')
         self._environment_variables_dict['es_host'] = EnvironmentVariables.get_env('es_host', '')
         self._environment_variables_dict['es_port'] = EnvironmentVariables.get_env('es_port', '')
+        self._environment_variables_dict['es_user'] = EnvironmentVariables.get_env('es_user', '')
+        self._environment_variables_dict['es_password'] = EnvironmentVariables.get_env('es_password', '')
         self._environment_variables_dict['es_index'] = EnvironmentVariables.get_env('es_index', es_index)
         self._environment_variables_dict['es_doc_type'] = EnvironmentVariables.get_env('es_doc_type', '')
         self._environment_variables_dict['ES_TIMEOUT'] = EnvironmentVariables.get_env('ES_TIMEOUT', 2000)

cloud_governance/main/main.py

@@ -229,7 +229,7 @@ def main():
                 run_cloud_resource_orchestration()
             else:
                 non_cluster_polices_runner = None
-                is_non_cluster_polices_runner = policy in environment_variables_dict.get('aws_non_cluster_policies')
+                is_non_cluster_polices_runner = policy in environment_variables_dict.get('non_cluster_policies')
                 if is_non_cluster_polices_runner:
                     non_cluster_polices_runner = ZombieNonClusterPolicies()
 

{cloud_governance-1.1.358.dist-info → cloud_governance-1.1.360.dist-info}/METADATA

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

{cloud_governance-1.1.358.dist-info → cloud_governance-1.1.360.dist-info}/RECORD

@@ -108,7 +108,7 @@ cloud_governance/common/clouds/ibm/vpc/vpc_infra_operations.py,sha256=W-NgQRwA15
 cloud_governance/common/elasticsearch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/elasticsearch/elastic_upload.py,sha256=OGdc6ZQ9L8Fjj8mhVARg1flUQ_SKB7J0HVcFVWt67Q0,2576
 cloud_governance/common/elasticsearch/elasticsearch_exceptions.py,sha256=6rwxbRYv93w7qvVaiSDJnwVgxG1A-kwU8IBzAU8iBmg,485
-cloud_governance/common/elasticsearch/elasticsearch_operations.py,sha256=IQOk0ycdPvXNr4qvl9hT97qo03jUk-CwH7AV6m2R4CI,15934
+cloud_governance/common/elasticsearch/elasticsearch_operations.py,sha256=WsAAjjCh-vX6K25SzQRP-rvPJ59RJ4dAtcXHCtmRUOQ,16529
 cloud_governance/common/elasticsearch/modals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/common/elasticsearch/modals/cost_usage_reports_data.py,sha256=xDxGIxJwhOtSh2VOnYx7XShRF90WPPlaQrfVm3fLQr8,1396
 cloud_governance/common/elasticsearch/modals/policy_es_data.py,sha256=6ydpSP_3e1OgyxM9IucohU8wSl0D2quisbmVlkM6WOA,1436
@@ -143,10 +143,10 @@ cloud_governance/common/utils/configs.py,sha256=8ry4UQT9s_GUivhrCdwS0vOWYN6OJIHD
 cloud_governance/common/utils/json_datetime_encoder.py,sha256=_-jzRTe0UqAKTn2E9qaU8SYIxHUoRA5ElWuVA0Y54Xw,338
 cloud_governance/common/utils/utils.py,sha256=ZUsi4ax2XhDIV-EQ5kJt5Ppd72kmm2psqcg1cNDZrvc,4349
 cloud_governance/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloud_governance/main/environment_variables.py,sha256=5LgGK2QiRJd7Z0Pr7sRODPNmOFUrb_XhNFfWIgaqd0M,28024
+cloud_governance/main/environment_variables.py,sha256=Tbz51ZCAQAXde-2ur45btnxtwvf5KGQp-aD9x1MaM0U,28431
 cloud_governance/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
 cloud_governance/main/es_uploader.py,sha256=6Ify5CS2NtUF1xXZ-rMwpYxVzDKfEZhv2vogWFltt98,10656
-cloud_governance/main/main.py,sha256=ydKIGwRjYAxjpGbqcPGBS14E5fZ1k66y3mpmTUIf1HI,18884
+cloud_governance/main/main.py,sha256=4TBiCBO_1z8KpGXb8brPKBmv3jHBl8fl_-Sb80ctYno,18880
 cloud_governance/main/main_common_operations.py,sha256=YbBJF6Smk3YKhEibnn-fIWu1oKP0pSGIM1WnSXFcBuo,366
 cloud_governance/main/run_cloud_resource_orchestration.py,sha256=Jo7-KDqxrIo8uioyTFCohUHse4uqdEt2ZFnHlX2u57g,776
 cloud_governance/main/main_oerations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -263,8 +263,8 @@ cloud_governance/policy/policy_runners/elasticsearch/__init__.py,sha256=47DEQpj8
 cloud_governance/policy/policy_runners/elasticsearch/upload_elastic_search.py,sha256=pOwUJWXjJbyTy8iv3Ap8xJGnqQe-5lZgoR8-vGfAVos,1881
 cloud_governance/policy/policy_runners/ibm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloud_governance/policy/policy_runners/ibm/policy_runner.py,sha256=V0E_f7F3hXit0aSq4BlfX1Jd4vjR2NEvOWsJ5upvZ4o,1302
-cloud_governance-1.1.358.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cloud_governance-1.1.358.dist-info/METADATA,sha256=4IwoOBQ0x3OceyOB6oBbAIMSiPewR2EFgRcyasRPQUE,11364
-cloud_governance-1.1.358.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloud_governance-1.1.358.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
-cloud_governance-1.1.358.dist-info/RECORD,,
+cloud_governance-1.1.360.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cloud_governance-1.1.360.dist-info/METADATA,sha256=SPADSpVrcC6d-IKbmZIeDz1g8_p1vrMcj3oVHyqZWmg,11364
+cloud_governance-1.1.360.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+cloud_governance-1.1.360.dist-info/top_level.txt,sha256=jfB1fgj7jvx3YZkZA4G6hFeS1RHO7J7XtnbjuMNMRww,17
+cloud_governance-1.1.360.dist-info/RECORD,,

{cloud_governance-1.1.358.dist-info → cloud_governance-1.1.360.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any