diff --git a/vitrage/datasources/nagios/transformer.py b/vitrage/datasources/nagios/transformer.py index 3f4025a05..3650cda52 100644 --- a/vitrage/datasources/nagios/transformer.py +++ b/vitrage/datasources/nagios/transformer.py @@ -40,7 +40,6 @@ class NagiosTransformer(AlarmTransformerBase): update_timestamp = datetime_utils.change_to_utc_time_and_format( entity_event[NagiosProperties.LAST_CHECK], - '%Y-%m-%d %H:%M:%S', tbase.TIMESTAMP_FORMAT) vitrage_sample_timestamp = entity_event[DSProps.SAMPLE_DATE] update_timestamp = \ diff --git a/vitrage/tests/unit/datasources/nagios/test_nagios_transformer.py b/vitrage/tests/unit/datasources/nagios/test_nagios_transformer.py index 1357cf80a..9de7070a6 100644 --- a/vitrage/tests/unit/datasources/nagios/test_nagios_transformer.py +++ b/vitrage/tests/unit/datasources/nagios/test_nagios_transformer.py @@ -134,7 +134,6 @@ class NagiosTransformerTest(base.BaseTest): self.assertEqual(event[NagiosProperties.SERVICE], vertex[VProps.NAME]) self.assertEqual(datetime_utils.change_to_utc_time_and_format( event[NagiosProperties.LAST_CHECK], - '%Y-%m-%d %H:%M:%S', tbase.TIMESTAMP_FORMAT), vertex[VProps.UPDATE_TIMESTAMP]) event_type = event.get(DSProps.EVENT_TYPE, None) diff --git a/vitrage/utils/datetime.py b/vitrage/utils/datetime.py index 8ebd27ae1..1af364b3f 100644 --- a/vitrage/utils/datetime.py +++ b/vitrage/utils/datetime.py @@ -16,6 +16,7 @@ from __future__ import absolute_import from datetime import datetime from datetime import timedelta +from dateutil import parser from oslo_utils import timeutils @@ -32,8 +33,8 @@ def change_time_str_format(timestamp_str, old_format, new_format): return utc.strftime(new_format) -def change_to_utc_time_and_format(timestamp_str, old_format, new_format): - timestamp = datetime.strptime(timestamp_str, old_format) +def change_to_utc_time_and_format(timestamp_str, new_format): + timestamp = parser.parse(timestamp_str) timestamp = timestamp - timedelta(seconds=( datetime.now() - datetime.utcnow()).total_seconds()) return timestamp.strftime(new_format)