From e51d0b6fdeb8b28263f834cd03b4f467d59760a7 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 23 Apr 2020 12:04:19 -0400
Subject: [PATCH] add a setting for enabling high rsyslogd verbosity

---
 awx/main/conf.py                   | 10 ++++++++++
 awx/main/utils/external_logging.py |  2 ++
 awx/settings/defaults.py           |  1 +
 3 files changed, 13 insertions(+)

diff --git a/awx/main/conf.py b/awx/main/conf.py
index b9fb5706bc..22c399a2f0 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -810,6 +810,16 @@ register(
     category=_('Logging'),
     category_slug='logging',
 )
+register(
+    'LOG_AGGREGATOR_RSYSLOGD_DEBUG',
+    field_class=fields.BooleanField,
+    default=False,
+    label=_('Enable rsyslogd debugging'),
+    help_text=_('Enabled high verbosity debugging for rsyslogd.  '
+                'Useful for debugging connection issues for external log aggregation.'),
+    category=_('Logging'),
+    category_slug='logging',
+)
 
 
 register(
diff --git a/awx/main/utils/external_logging.py b/awx/main/utils/external_logging.py
index 9b2e7f9fdf..4b3fcda7fb 100644
--- a/awx/main/utils/external_logging.py
+++ b/awx/main/utils/external_logging.py
@@ -22,6 +22,8 @@ def construct_rsyslog_conf_template(settings=settings):
         spool_directory = '/var/lib/awx'
 
     max_bytes = settings.MAX_EVENT_RES_DATA
+    if settings.LOG_AGGREGATOR_RSYSLOGD_DEBUG:
+        parts.append('$DebugLevel 2')
     parts.extend([
         '$WorkDirectory /var/lib/awx/rsyslog',
         f'$MaxMessageSize {max_bytes}',
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index ea0505208b..25acabda7b 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -942,6 +942,7 @@ LOG_AGGREGATOR_VERIFY_CERT = True
 LOG_AGGREGATOR_LEVEL = 'INFO'
 LOG_AGGREGATOR_MAX_DISK_USAGE_GB = 1
 LOG_AGGREGATOR_MAX_DISK_USAGE_PATH = '/var/lib/awx'
+LOG_AGGREGATOR_RSYSLOGD_DEBUG = False
 
 # The number of retry attempts for websocket session establishment
 # If you're encountering issues establishing websockets in clustered Tower,