cloud-governance 1.1.358__tar.gz → 1.1.360__tar.gz

{cloud_governance-1.1.358/cloud_governance.egg-info → cloud_governance-1.1.360}/PKG-INFO

@@ -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 → cloud_governance-1.1.360}/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-1.1.358 → cloud_governance-1.1.360}/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-1.1.358 → cloud_governance-1.1.360}/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 → cloud_governance-1.1.360/cloud_governance.egg-info}/PKG-INFO

@@ -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 → cloud_governance-1.1.360}/setup.py

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