External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6039 from AlanCoding/log_certs

Browse Source 
Setting for external logging cert verification
This commit is contained in:
Alan Rominger
2017-04-17 16:59:33 -04:00
committed by GitHub
parent 30193ffea5 3af0f505d8
commit 31c18f2e16
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/utils/handlers.py
View File

@@ -39,6 +39,7 @@ PARAM_NAMES = {
'indv_facts': 'LOG_AGGREGATOR_INDIVIDUAL_FACTS', 'indv_facts': 'LOG_AGGREGATOR_INDIVIDUAL_FACTS',
'enabled_flag': 'LOG_AGGREGATOR_ENABLED', 'enabled_flag': 'LOG_AGGREGATOR_ENABLED',
'http_timeout': 'LOG_AGGREGATOR_HTTP_TIMEOUT', '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) payload_str = json.dumps(payload_input)
else: else:
payload_str = payload_input payload_str = payload_input
return dict(data=payload_str, background_callback=unused_callback, kwargs = dict(data=payload_str, background_callback=unused_callback,
timeout=self.http_timeout) timeout=self.http_timeout)
if self.verify_cert is False:
kwargs['verify'] = False
return kwargs
def skip_log(self, logger_name): def skip_log(self, logger_name):
if self.host == '' or (not self.enabled_flag): if self.host == '' or (not self.enabled_flag):

2
awx/settings/defaults.py
View File

@@ -866,8 +866,10 @@ INSIGHTS_URL_BASE = "https://access.redhat.com"
TOWER_SETTINGS_MANIFEST = {} TOWER_SETTINGS_MANIFEST = {}
# Settings related to external logger configuration
LOG_AGGREGATOR_ENABLED = False LOG_AGGREGATOR_ENABLED = False
LOG_AGGREGATOR_HTTP_TIMEOUT = 5 LOG_AGGREGATOR_HTTP_TIMEOUT = 5
LOG_AGGREGATOR_VERIFY_CERT = True
# The number of retry attempts for websocket session establishment # The number of retry attempts for websocket session establishment
# If you're encountering issues establishing websockets in clustered Tower, # If you're encountering issues establishing websockets in clustered Tower,