openstack/monasca-persister
Code Issues Proposed changes

Convert empty string to empty JSON for sub alarms

Browse Source 
Change 'name' to 'measurement' for alarm state transition.
Store empty JSON for reason data.

Change-Id: I66b0c05618734a978d2f8ef9c8123815ec7b1d85
This commit is contained in:
Deklan Dieterly 2015-06-25 14:57:53 -06:00
parent 1c2c8bcb7a
commit fefff77a07
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monasca_persister/persister.py
View File

@ -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}

2
requirements.txt
View File

@ -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