consolidate logger logic to shared

stream_alert/alert_merger/__init__.py

@@ -1,19 +0,0 @@
-"""Initialize logging for the alert merger."""
-import logging
-import os
-
-# Create a package level logger to import
-LEVEL = os.environ.get('LOGGER_LEVEL', 'INFO').upper()
-
-# Cast integer levels to avoid a ValueError
-if LEVEL.isdigit():
-    LEVEL = int(LEVEL)
-
-logging.basicConfig(format='%(name)s [%(levelname)s]: [%(module)s.%(funcName)s] %(message)s')
-
-LOGGER = logging.getLogger('StreamAlert')
-try:
-    LOGGER.setLevel(LEVEL)
-except (TypeError, ValueError) as err:
-    LOGGER.setLevel('INFO')
-    LOGGER.error('Defaulting to INFO logging: %s', err)

stream_alert/alert_merger/main.py

@@ -18,12 +18,15 @@
 import json
 import os
 
-from stream_alert.alert_merger import LOGGER
+import boto3
+
 from stream_alert.shared.alert import Alert, AlertCreationError
 from stream_alert.shared.alert_table import AlertTable
+from stream_alert.shared.logger import get_logger
 from stream_alert.shared.metrics import ALERT_MERGER_NAME, MetricLogger
 
-import boto3
+
+LOGGER = get_logger(__name__)
 
 
 class AlertMergeGroup(object):

stream_alert/alert_processor/__init__.py

@@ -1,21 +0,0 @@
-"""Initialize logging for the alert processor."""
-import logging
-import os
-
-from stream_alert.shared import ALERT_PROCESSOR_NAME as FUNCTION_NAME
-
-# Create a package level logger to import
-LEVEL = os.environ.get('LOGGER_LEVEL', 'INFO').upper()
-
-# Cast integer levels to avoid a ValueError
-if LEVEL.isdigit():
-    LEVEL = int(LEVEL)
-
-logging.basicConfig(format='%(name)s [%(levelname)s]: [%(module)s.%(funcName)s] %(message)s')
-
-LOGGER = logging.getLogger('StreamAlertOutput')
-try:
-    LOGGER.setLevel(LEVEL)
-except (TypeError, ValueError) as err:
-    LOGGER.setLevel('INFO')
-    LOGGER.error('Defaulting to INFO logging: %s', err)

stream_alert/alert_processor/main.py

@@ -16,17 +16,20 @@
 from __future__ import absolute_import  # Suppresses RuntimeWarning import error in Lambda
 import os
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import StreamAlertOutput
 from stream_alert.shared import backoff_handlers, NORMALIZATION_KEY, resources
 from stream_alert.shared.alert import Alert, AlertCreationError
 from stream_alert.shared.alert_table import AlertTable
 from stream_alert.shared.config import load_config
+from stream_alert.shared.logger import get_logger
 
 import backoff
 from botocore.exceptions import ClientError
 
 
+LOGGER = get_logger(__name__)
+
+
 class AlertProcessor(object):
     """Orchestrates delivery of alerts to the appropriate dispatchers."""
     ALERT_PROCESSOR = None  # AlertProcessor instance which can be re-used across Lambda invocations

stream_alert/alert_processor/outputs/aws.py

@@ -23,7 +23,6 @@
 from botocore.exceptions import ClientError
 import boto3
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.helpers import elide_string_middle
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
@@ -35,6 +34,10 @@
     success_handler,
     giveup_handler
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 class AWSOutput(OutputDispatcher):

stream_alert/alert_processor/outputs/carbonblack.py

@@ -17,12 +17,15 @@
 
 from cbapi.response import BannedHash, Binary, CbResponseAPI
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/alert_processor/outputs/github.py

@@ -17,13 +17,16 @@
 import base64
 import json
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     OutputRequestFailure,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/alert_processor/outputs/jira.py

@@ -17,13 +17,16 @@
 import json
 import os
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     OutputRequestFailure,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/alert_processor/outputs/komand.py

@@ -15,12 +15,15 @@
 """
 from collections import OrderedDict
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/alert_processor/outputs/output_base.py

@@ -26,12 +26,16 @@
 import boto3
 from botocore.exceptions import ClientError
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.shared.backoff_handlers import (
     backoff_handler,
     success_handler,
     giveup_handler
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
+
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 OutputProperty = namedtuple('OutputProperty',

stream_alert/alert_processor/outputs/pagerduty.py

@@ -17,7 +17,6 @@
 import os
 import backoff
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
@@ -29,6 +28,10 @@
     success_handler,
     giveup_handler
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 def events_v2_data(alert, routing_key, with_record=True):

stream_alert/alert_processor/outputs/phantom.py

@@ -16,13 +16,16 @@
 from collections import OrderedDict
 import os
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     OutputRequestFailure,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/alert_processor/outputs/slack.py

@@ -16,13 +16,16 @@
 import cgi
 from collections import OrderedDict
 
-from stream_alert.alert_processor import LOGGER
 from stream_alert.alert_processor.outputs.output_base import (
     OutputDispatcher,
     OutputProperty,
     OutputRequestFailure,
     StreamAlertOutput
 )
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertOutput

stream_alert/apps/__init__.py

@@ -6,23 +6,6 @@
 from stream_alert.apps.exceptions import AppException
 
 
-# Create a package level logger to import
-LEVEL = os.environ.get('LOGGER_LEVEL', 'INFO').upper()
-
-# Cast integer levels to avoid a ValueError
-if LEVEL.isdigit():
-    LEVEL = int(LEVEL)
-
-logging.basicConfig(format='%(name)s [%(levelname)s]: [%(module)s.%(funcName)s] %(message)s')
-
-LOGGER = logging.getLogger('StreamAlertApp')
-try:
-    LOGGER.setLevel(LEVEL)
-except (TypeError, ValueError) as err:
-    LOGGER.setLevel('INFO')
-    LOGGER.error('Defaulting to INFO logging: %s', err)
-
-
 class StreamAlertApp(object):
     """Class to be used as a decorator to register all AppIntegration subclasses"""
     _apps = {}

stream_alert/apps/_apps/__init__.py

@@ -1,3 +1,4 @@
 """Import some package level items to make implementing subclasses a bit nicer"""
-from stream_alert.apps import LOGGER, StreamAlertApp
+from stream_alert.apps import StreamAlertApp
 from stream_alert.apps.app_base import AppIntegration, safe_timeout
+from stream_alert.shared.logger import get_logger

stream_alert/apps/_apps/aliyun.py

@@ -20,7 +20,10 @@
 from aliyunsdkcore.acs_exception.exceptions import ServerException, ClientException
 from aliyunsdkactiontrail.request.v20171204 import LookupEventsRequest
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertApp

stream_alert/apps/_apps/box.py

@@ -20,7 +20,10 @@
 from boxsdk.object.events import EnterpriseEventsStreamType
 from requests.exceptions import ConnectionError
 
-from . import AppIntegration, LOGGER, safe_timeout, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger, safe_timeout
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertApp

stream_alert/apps/_apps/duo.py

@@ -22,7 +22,10 @@
 
 import requests
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 class DuoApp(AppIntegration):

stream_alert/apps/_apps/gsuite.py

@@ -22,7 +22,11 @@
 import apiclient
 from oauth2client import client, service_account
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
+
 
 # Disable noisy google api client logger
 logging.getLogger('googleapiclient.discovery_cache').setLevel(logging.ERROR)

stream_alert/apps/_apps/onelogin.py

@@ -15,7 +15,10 @@
 """
 import re
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 @StreamAlertApp

stream_alert/apps/_apps/salesforce.py

@@ -21,12 +21,16 @@
 import backoff
 import requests
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 class SalesforceAppError(Exception):
     """Salesforce App Error class"""
 
+
 class SalesforceApp(AppIntegration):
     """Salesforce StreamAlert Base App
 

stream_alert/apps/_apps/slack.py

@@ -16,7 +16,10 @@
 import re
 import time
 
-from . import AppIntegration, LOGGER, StreamAlertApp
+from . import AppIntegration, StreamAlertApp, get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 class SlackApp(AppIntegration):

stream_alert/apps/app_base.py

@@ -20,9 +20,12 @@
 from botocore.exceptions import ClientError
 import requests
 
-from stream_alert.apps import LOGGER
 from stream_alert.apps.config import AppConfig
 from stream_alert.apps.batcher import Batcher
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 def _report_time(func):

stream_alert/apps/batcher.py

@@ -19,7 +19,10 @@
 import boto3
 from botocore.exceptions import ClientError
 
-from stream_alert.apps import LOGGER
+from stream_alert.shared.logger import get_logger
+
+
+LOGGER = get_logger(__name__)
 
 
 class Batcher(object):