From fefff77a07a766c7fae3fbd42469f806609a906f Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Thu, 25 Jun 2015 14:57:53 -0600 Subject: [PATCH] Convert empty string to empty JSON for sub alarms Change 'name' to 'measurement' for alarm state transition. Store empty JSON for reason data. Change-Id: I66b0c05618734a978d2f8ef9c8123815ec7b1d85 --- monasca_persister/persister.py | 10 ++++++---- requirements.txt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/monasca_persister/persister.py b/monasca_persister/persister.py index 02798d59..938a3110 100644 --- a/monasca_persister/persister.py +++ b/monasca_persister/persister.py @@ -442,7 +442,7 @@ class AlarmPersister(AbstractPersister): ts = time_stamp / 1000.0 - data = {"name": 'alarm_state_history', + data = {"measurement": 'alarm_state_history', "timestamp": datetime.fromtimestamp(ts, tz=pytz.utc).strftime( '%Y-%m-%dT%H:%M:%S.%fZ'), "fields": { @@ -452,8 +452,10 @@ class AlarmPersister(AbstractPersister): "new_state": new_state.encode('utf8'), "old_state": old_state.encode('utf8'), "reason": state_change_reason.encode('utf8'), - "reason_data": state_change_reason.encode('utf8'), - "sub_alarms": json.dumps(sub_alarms, ensure_ascii=False).encode('utf8') + "reason_data": "{}".encode('utf8'), + "sub_alarms": json.dumps(sub_alarms, + ensure_ascii=False).encode( + 'utf8') if sub_alarms else "[]".encode('utf8') }, "tags": { "tenant_id": tenant_id.encode('utf8') @@ -532,7 +534,7 @@ class MetricPersister(AbstractPersister): "value": value, "value_meta": json.dumps(value_meta, ensure_ascii=False).encode( - 'utf8') if value_meta else '' + 'utf8') if value_meta else value_meta.encode('utf8') }, "tags": tags} diff --git a/requirements.txt b/requirements.txt index 3110ac97..372cc37d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ babel eventlet -influxdb>=2.6.0 +influxdb==2.6.0 iso8601 kafka-python>=0.9.2,<0.9.3 kazoo>=2.0