From 906dee94b11d547a51c0c0217825ac8c2eec0423 Mon Sep 17 00:00:00 2001
From: Deklan Dieterly <deklan.dieterly@hp.com>
Date: Fri, 19 Jun 2015 14:02:14 -0600
Subject: [PATCH] Fixes for Influxd 0.9 latest

change 'name' to 'measurement'.
change 'timestamp' to 'time'.
store value_meta as "" instead of "\"\"" when empty.

Change-Id: I391ab269897e6575abd9027b6b4252083a015536
---
 monasca_persister/persister.py | 8 +++++---
 requirements.txt               | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/monasca_persister/persister.py b/monasca_persister/persister.py
index 95103c9d..02798d59 100644
--- a/monasca_persister/persister.py
+++ b/monasca_persister/persister.py
@@ -525,12 +525,14 @@ class MetricPersister(AbstractPersister):
 
         ts = time_stamp / 1000.0
 
-        data = {"name": metric_name.encode('utf8'),
-                "timestamp": datetime.fromtimestamp(ts, tz=pytz.utc).strftime(
+        data = {"measurement": metric_name.encode('utf8'),
+                "time": datetime.fromtimestamp(ts, tz=pytz.utc).strftime(
                     '%Y-%m-%dT%H:%M:%S.%fZ'),
                 "fields": {
                     "value": value,
-                    "value_meta": json.dumps(value_meta, ensure_ascii=False).encode('utf8')
+                    "value_meta": json.dumps(value_meta,
+                                             ensure_ascii=False).encode(
+                        'utf8') if value_meta else ''
                 },
                 "tags": tags}
 
diff --git a/requirements.txt b/requirements.txt
index 2643cf67..3110ac97 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 babel
 eventlet
-influxdb>=1.0.0
+influxdb>=2.6.0
 iso8601
 kafka-python>=0.9.2,<0.9.3
 kazoo>=2.0