moving loggers to the new splunk-ready logging support in the spylunk…

…ing project
jay-johnson · Jun 22, 2018 · 50e6295 · 50e6295
1 parent 6319986
commit 50e6295
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/network_pipeline/build_training_request.py b/network_pipeline/build_training_request.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pandas as pd
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.consts import VALID
 from network_pipeline.consts import INVALID
 from network_pipeline.consts import ERROR

diff --git a/network_pipeline/record_packets_to_csv.py b/network_pipeline/record_packets_to_csv.py
@@ -4,7 +4,7 @@
 import pandas as pd
 from pandas.io.json import json_normalize
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.utils import ppj
 from network_pipeline.utils import rnow
 from network_pipeline.build_packet_key import build_packet_key

diff --git a/network_pipeline/scripts/capture_arp.py b/network_pipeline/scripts/capture_arp.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/capture_icmp.py b/network_pipeline/scripts/capture_icmp.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/capture_ssh.py b/network_pipeline/scripts/capture_ssh.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/capture_tcp.py b/network_pipeline/scripts/capture_tcp.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/capture_telnet.py b/network_pipeline/scripts/capture_telnet.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/capture_udp.py b/network_pipeline/scripts/capture_udp.py
@@ -2,7 +2,7 @@
 
 import scapy.all as scapy
 from celery_connectors.utils import ev
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.handle_packets import handle_packets
 
 

diff --git a/network_pipeline/scripts/packets_rabbitmq.py b/network_pipeline/scripts/packets_rabbitmq.py
@@ -4,7 +4,7 @@
 from network_pipeline.consts import FORWARD_BROKER_URL
 from network_pipeline.consts import FORWARD_SSL_OPTIONS
 from network_pipeline.consts import FORWARD_QUEUE
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.record_packets_to_csv import RecordPacketsToCSV
 
 

diff --git a/network_pipeline/scripts/packets_redis.py b/network_pipeline/scripts/packets_redis.py
@@ -4,7 +4,7 @@
 from network_pipeline.consts import FORWARD_BROKER_URL
 from network_pipeline.consts import FORWARD_SSL_OPTIONS
 from network_pipeline.consts import FORWARD_QUEUE
-from network_pipeline.log.setup_logging import build_colorized_logger
+from spylunking.log.setup_logging import build_colorized_logger
 from network_pipeline.record_packets_to_csv import RecordPacketsToCSV
 
 

diff --git a/setup.py b/setup.py
@@ -36,6 +36,7 @@
     "python-owasp-zap-v2.4",
     "python-dateutil<2.7.0",
     "scapy-python3",
+    "spylunking",
     "tox",
     "unittest2",
     "mock"
@@ -60,7 +61,7 @@ def networkpipeline_test_suite():
 setup(
     name="network-pipeline",
     cmdclass={"build_py": build_py},
-    version="1.0.24",
+    version="1.0.25",
     description="Distributed Network Packet Analysis Pipeline " +
     "for Layer 2, 3 and 4 Frames",
     long_description="" +