Fixed non-alignment with recent API changes: e.json -> e:json()

Author: cybermaggedon

.gitignore

@@ -1,3 +1,4 @@
+.dirstamp
 *.o
 *.lo
 *.swp

config/amqp-topic.lua

@@ -104,7 +104,7 @@ local submit = function(obs)
 end
 
 observer.event = function(e)
-  data = e.json
+  data = e:json()
   submit(data)
 end
 

config/pulsar.lua

@@ -122,7 +122,7 @@ local submit = function(obs)
 end
 
 observer.event = function(e)
-  submit(e.json)
+  submit(e:json())
 end
 
 -- Initialise

config/redis.lua

@@ -62,7 +62,7 @@ end
 
 -- Call the JSON functions for all observer functions.
 observer.event = function(e)
-  submit(e.json)
+  submit(e:json())
 end
 
 -- Initialise

config/zeromq.lua

@@ -66,7 +66,7 @@ end
 
 -- Call the JSON functions for all observer functions.
 observer.event = function(e)
-  submit(e.json)
+  submit(e:json())
 end
 
 -- Initialise

subscribers/cybermon-elasticsearch

@@ -315,7 +315,6 @@ def init():
 def es_output(obs, id):
 
     u = "%s%s/_doc/%s" % (es_url, es_index, id)
-    print(u)
 
     r = requests.put(u, data=json.dumps(obs),
                      headers={"Content-Type": "application/json"})
@@ -336,7 +335,10 @@ def handle(msg, output):
     ob["id"] = ev["id"]
     ob["action"] = ev["action"]
     ob["device"] = ev["device"]
-    ob["network"] = ev["network"]
+    try:
+        ob["network"] = ev["network"]
+    except:
+        pass
     ob["time"] = ev["time"]
     if "url" in ev: ob["url"] = ev["url"]
     if "location" in ev: ob["location"] = ev["location"]

subscribers/cybermon-gaffer

@@ -175,7 +175,7 @@ def handle(msg, output):
         add_edge(edges, "udpflow", src, dest)
 
         if obj["action"] == "dns_message" and "query" in obj["dns_message"]:
-            for v in ev["dns_message"]["query"]:
+            for v in obj["dns_message"]["query"]:
                 if "name" in v:
                     add_edge(edges, "dnsrequest", src, v["name"])