Merge branch 'maintenance' into develop

Author: Sebastian Wagner

intelmq/tests/bots/parsers/misp/misp_attribute.json

@@ -1 +1 @@
-{"ShadowAttribute": [], "SharingGroup": [], "category": "Payload delivery", "comment": "", "deleted": false, "distribution": "5", "event_id": "2", "id": "7", "sharing_group_id": "0", "timestamp": "1465681304", "to_ids": false, "type": "url", "uuid": "575c8598-f1f0-4c16-a94a-0612c0a83866", "value": "http://fake.website.com/malware/is/here"}
+{"ShadowAttribute": [], "SharingGroup": [], "category": "Payload delivery", "comment": "", "deleted": false, "distribution": "5", "event_id": "2", "id": "7", "sharing_group_id": "0", "timestamp": "1465681304", "to_ids": false, "type": "url", "uuid": "575c8598-f1f0-4c16-a94a-0612c0a83866", "value": "http://fake.example.com/malware/is/here"}

intelmq/tests/bots/parsers/misp/misp_event.json

@@ -14,7 +14,7 @@
             "to_ids": false,
             "type": "url",
             "uuid": "575c8598-f1f0-4c16-a94a-0612c0a83866",
-            "value": "http://fake.website.com/malware/is/here"
+            "value": "http://fake.example.com/malware/is/here"
         },
         {
             "ShadowAttribute": [],

intelmq/tests/bots/parsers/misp/test_parser.py

@@ -29,9 +29,9 @@
     "feed.url": "http://192.168.56.102/",
     "time.observation": "2016-06-15T09:25:26+00:00",
     "time.source": "2016-06-11T21:41:44+00:00",
-    "source.url": "http://fake.website.com/malware/is/here",
+    "source.url": "http://fake.example.com/malware/is/here",
     "event_description.text": "Payload delivery",
-    "event_description.url": "http://192.168.56.102/event/view/2",
+    "event_description.url": "http://192.168.56.102/events/view/2",
     "classification.type": "ransomware",
     "malware.name": "locky",
     'misp.attribute_uuid': '575c8598-f1f0-4c16-a94a-0612c0a83866',