Merge pull request #12 from tech-sketch/nano-sec-support

support nano sec for sender data
tech-sketch · Mar 27, 2017 · 09a3a09 · 09a3a09
2 parents b003d19 + 61ecdf4
commit 09a3a09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lambda_code/AWS_AmazonSNS.py b/lambda_code/AWS_AmazonSNS.py
@@ -103,7 +103,10 @@ def __check_event_type(self, record):
             return "Other"
 
     def send_to_zabbix(self):
-        send_data = json.loads('{"request":"sender data","data":[]}')
+        now = "%.9f" % time.time()
+        sec = now.split(".")[0]
+        ns = now.split(".")[1]
+        send_data = json.loads('{"request":"sender data","data":[],"clock":%s,"ns":%s }' % (sec, ns))
         send_data["data"] = self.send_items
         send_data_string = json.dumps(send_data)
         zbx_client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

diff --git a/scripts/AWS_Service_Health_Dashboard.py b/scripts/AWS_Service_Health_Dashboard.py
@@ -29,7 +29,10 @@ def __init__(self, base_url, block, zabbix_host='localhost', zabbix_port=10051):
 
 
     def get_rss(self, url):
-        send_data = json.loads('{"request":"sender data","data":[]}')
+        now = "%.9f" % time.time()
+        sec = now.split(".")[0]
+        ns = now.split(".")[1]
+        send_data = json.loads('{"request":"sender data","data":[],"clock":%s,"ns":%s }' % (sec, ns))
         response = feedparser.parse(url)
         send_items = []
 

diff --git a/scripts/cloudwatch_zabbix.py b/scripts/cloudwatch_zabbix.py
@@ -169,7 +169,10 @@ def __send_to_zabbix(self, send_data):
 
 
     def send_metric_data_to_zabbix(self):
-        send_data = json.loads('{"request":"sender data","data":[]}')
+        now = "%.9f" % time.time()
+        sec = now.split(".")[0]
+        ns = now.split(".")[1]
+        send_data = json.loads('{"request":"sender data","data":[],"clock":%s,"ns":%s }' % (sec, ns))
         metric_list = self.__get_metric_list()
         all_metric_stats = []
         servicename = self.service