Add clock field for json output. Mandatory when you need to synchronize your items. Default in current minute epoch

jbfavre · jbfavre · commit 7791b88b95f2 · 2014-08-07T11:51:59.000+02:00
diff --git a/module/protobix/datacontainer.py b/module/protobix/datacontainer.py
@@ -1,4 +1,5 @@
 import simplejson
+import time
 
 from senderprotocol import SenderProtocol
 
@@ -16,12 +17,13 @@ def set_type(self, data_type):
         if data_type == "lld" or data_type == "items":
             self.data_type = data_type
 
-    def add_item(self, host, key, value):
+    def add_item(self, host, key, value, clock=int(time.time())/60*60):
         if self.data_type == "items":
-            item = { "host": host, "key": key, "value": value}
+            item = { "host": host, "key": key,
+                     "value": value, "clock": clock}
         elif self.data_type == "lld":
-            item = { "host": host, "key": key, "value":
-                     simplejson.dumps({"data":value})}
+            item = { "host": host, "key": key, "clock": clock,
+                     "value": simplejson.dumps({"data":value}) }
         self.items_list.append(item)
 
     def add(self, data):
@@ -30,6 +32,5 @@ def add(self, data):
                 if not data[host][key] == []:
                     self.add_item( host, key, data[host][key])
 
-
     def get_items_list(self):
         return self.items_list
diff --git a/module/protobix/senderprotocol.py b/module/protobix/senderprotocol.py
@@ -3,6 +3,7 @@
 import simplejson
 import socket
 import struct
+import time
 
 from senderexception import SenderException
 
@@ -47,7 +48,8 @@ def set_dryrun(self, dryrun):
 
     def __repr__(self):
         return simplejson.dumps({ "data": ("%r" % self.data_container),
-                                  "request": self.request })
+                                  "request": self.request,
+                                  "clock": int(time.time()) })
 
     def send_to_zabbix(self, data):
         data_len =  struct.pack('<Q', len(data))
@@ -85,7 +87,8 @@ def send(self, container):
     def bulk_send(self, container):
         self.data_container = container
         data = simplejson.dumps({ "data": self.data_container.get_items_list(),
-                                  "request": self.request })
+                                  "request": self.request,
+                                  "clock": int(time.time()) })
         zbx_answer = self.send_to_zabbix(data)
         if self.verbosity:
             print zbx_answer.get('info')
@@ -95,7 +98,8 @@ def single_send(self, container):
         self.data_container = container
         for item in self.data_container.get_items_list():
             data = simplejson.dumps({ "data": [ item ],
-                                      "request": self.request })
+                                      "request": self.request,
+                                      "clock": int(time.time()) })
             result = '-'
             zbx_answer = 0
             if not self.dryrun:
