Merge pull request #124 from idealista/develop

Develop

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.3.2](https://github.com/idealista/prom2teams/tree/2.3.2)
+[Full Changelog](https://github.com/idealista/prom2teams/compare/2.3.1...2.3.2)
+## Fixed
+- *[#122](https://github.com/idealista/prom2teams/issues/122) Date parsing exception* @miguel-chacon
+
 ## [2.3.1](https://github.com/idealista/prom2teams/tree/2.3.1)
 [Full Changelog](https://github.com/idealista/prom2teams/compare/2.3.0...2.3.1)
 ## Changed

prom2teams/prometheus/message_schema.py

@@ -50,8 +50,8 @@ class AlertSchema(Schema):
     status = fields.Str(default='unknown', missing='unknown')
     labels = fields.Nested('LabelSchema', many=False, unknown=INCLUDE)
     annotations = fields.Nested('AnnotationSchema', many=False, unknown=EXCLUDE)
-    startsAt = fields.Date('%Y-%m-%dT%H:%M:%S.%fZ')
-    endsAt = fields.Date('%Y-%m-%dT%H:%M:%S.%fZ')
+    startsAt = fields.DateTime()
+    endsAt = fields.DateTime()
     generatorURL = fields.Str()
 
 

setup.py

@@ -10,7 +10,7 @@
 
 
 setup(name='prom2teams',
-      version='2.3.1',
+      version='2.3.2',
       description='Project that redirects Prometheus Alert Manager '
       'notifications to Microsoft Teams',
       long_description=readme,

tests/data/jsons/all_ok_multiple.json

@@ -17,8 +17,8 @@
         "description": "disk usage 93% on rootfs device",
         "summary": "Disk usage alert on CS30.evilcorp"
       },
-      "startsAt": "2017-05-09T07:01:37.803000Z",
-      "endsAt": "2017-05-09T07:08:37.818278Z",
+      "startsAt": "2017-05-09T07:01:37.803000000Z",
+      "endsAt": "2017-05-09T07:08:37.818Z",
       "generatorURL": "my.prometheusserver.url"
     },
     {