From 18c27437b70cab69a5f56fb949f344884e60cb55 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Thu, 17 Sep 2020 13:14:14 -0400
Subject: [PATCH] Fix analytics logging

The analytics change PR adjusted the logging for awx.analytics,
which solved the issue, but should have used the targeted awx.main.analytics.

Also flip a couple of loggers to use the regular awx.analytics (awx analytics)
logger instead of awx.main.analytics (the automation anayltics task system).
---
 awx/api/views/metrics.py                  | 2 +-
 awx/main/analytics/broadcast_websocket.py | 2 +-
 awx/settings/defaults.py                  | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/awx/api/views/metrics.py b/awx/api/views/metrics.py
index 8d78dea21f..39744e1bcd 100644
--- a/awx/api/views/metrics.py
+++ b/awx/api/views/metrics.py
@@ -22,7 +22,7 @@ from awx.api.generics import (
 )
 
 
-logger = logging.getLogger('awx.main.analytics')
+logger = logging.getLogger('awx.analytics')
 
 
 class MetricsView(APIView):
diff --git a/awx/main/analytics/broadcast_websocket.py b/awx/main/analytics/broadcast_websocket.py
index 5cfda529eb..d8abcb4745 100644
--- a/awx/main/analytics/broadcast_websocket.py
+++ b/awx/main/analytics/broadcast_websocket.py
@@ -20,7 +20,7 @@ from django.conf import settings
 BROADCAST_WEBSOCKET_REDIS_KEY_NAME = 'broadcast_websocket_stats'
 
 
-logger = logging.getLogger('awx.main.analytics.broadcast_websocket')
+logger = logging.getLogger('awx.analytics.broadcast_websocket')
 
 
 def dt_to_seconds(dt):
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 1e72bb551f..2d5c3085fe 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -987,6 +987,11 @@ LOGGING = {
             'handlers': ['task_system', 'external_logger'],
             'propagate': False
         },
+        'awx.main.analytics': {
+            'handlers': ['task_system', 'external_logger'],
+            'level': 'INFO',
+            'propagate': False
+        },
         'awx.main.scheduler': {
             'handlers': ['task_system', 'external_logger'],
             'propagate': False
@@ -1001,7 +1006,7 @@ LOGGING = {
             'level': 'INFO',  # very verbose debug-level logs
         },
         'awx.analytics': {
-            'handlers': ['task_system', 'external_logger'],
+            'handlers': ['external_logger'],
             'level': 'INFO',
             'propagate': False
         },