Adapt services (telefraf, eewids-parser) to newer versions

Author: techge

eewids-parser/eewids-parser.py

@@ -4,6 +4,7 @@
     This file is part of EEWIDS (Easily Expandable WIDS)
 
     Copyright (C) 2018 Alexander Paetzelt <techge+eewids posteo net>
+    Copyright (C) 2020 Alexander Paetzelt <techge+eewids posteo net>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,7 +25,6 @@
 import argparse
 import json
 import pika
-import requests
 
 import parser as p
 
@@ -66,20 +66,22 @@ def main(rab_host, rab_port):
 
     # create queue for receiving raw capture data
     # TODO you probably do not want a random queue, but one which is used by multiple workers!!!
-    recv_channel.queue_declare(queue='eewids-parser', exclusive=False)
+    result = recv_channel.queue_declare(queue='eewids-parser', exclusive=False)
+    queue_name = result.method.queue
     #recv_queue = recv_channel.queue.declare(exclusive=True)
     # TODO change routing key on capture tool and here, make it meaningful and global/as argument
-    recv_channel.queue_bind(exchange='capture-raw', queue='eewids-parser', routing_key='*.*.*')
+    # FIXME do not abort if it does not exist
+    recv_channel.queue_bind(exchange='capture-raw', queue=queue_name, routing_key='*')
 
     def callback(ch, method, properties, body):
 
         parsed_data = p.packet_parse(body)
         distribute(parsed_data, send_channel)
 
     # TODO look up right arguments to make sure that this is dividable through multiple workers!
-    recv_channel.basic_consume(callback,
-                               queue='eewids-parser',
-                               no_ack=False)
+    recv_channel.basic_consume(on_message_callback=callback,
+                               queue=queue_name,
+                               auto_ack=True)
 
     print(' [*] Starting parsing. To exit press CTRL+C')
     recv_channel.start_consuming()