diff --git a/awx/main/utils/handlers.py b/awx/main/utils/handlers.py index 3eb9852472..25bb49231d 100644 --- a/awx/main/utils/handlers.py +++ b/awx/main/utils/handlers.py @@ -39,6 +39,7 @@ PARAM_NAMES = { 'indv_facts': 'LOG_AGGREGATOR_INDIVIDUAL_FACTS', 'enabled_flag': 'LOG_AGGREGATOR_ENABLED', 'http_timeout': 'LOG_AGGREGATOR_HTTP_TIMEOUT', + 'verify_cert': 'LOG_AGGREGATOR_VERIFY_CERT' } @@ -146,8 +147,11 @@ class BaseHTTPSHandler(logging.Handler): payload_str = json.dumps(payload_input) else: payload_str = payload_input - return dict(data=payload_str, background_callback=unused_callback, - timeout=self.http_timeout) + kwargs = dict(data=payload_str, background_callback=unused_callback, + timeout=self.http_timeout) + if self.verify_cert is False: + kwargs['verify'] = False + return kwargs def skip_log(self, logger_name): if self.host == '' or (not self.enabled_flag): diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index e3af1781db..65257059b1 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -866,8 +866,10 @@ INSIGHTS_URL_BASE = "https://access.redhat.com" TOWER_SETTINGS_MANIFEST = {} +# Settings related to external logger configuration LOG_AGGREGATOR_ENABLED = False LOG_AGGREGATOR_HTTP_TIMEOUT = 5 +LOG_AGGREGATOR_VERIFY_CERT = True # The number of retry attempts for websocket session establishment # If you're encountering issues establishing websockets in clustered Tower,