Merge branch 'hotfix/1.4.9'

Author: fedelemantuano

README.md

@@ -219,3 +219,5 @@ It's possible to use complete Docker images with Apache Storm and SpamScope. Tak
 ![SpamScope](docs/images/Docker01.png?raw=true "SpamScope")
 
 ![SpamScope Topology](docs/images/Docker02.png?raw=true "SpamScope Topology")
+
+![SpamScope Map](docs/images/map.png?raw=true "SpamScope Map")

conf/templates/spamscope.json

@@ -1,5 +1,6 @@
 {
   "order": 0,
+  "version": 2,
   "template": "spamscope_*-*",
   "settings": {
     "analysis": {
@@ -59,7 +60,7 @@
           "headers": {
             "mapping": {
               "index": "analyzed",
-              "type": "text",
+              "type": "string",
               "analyzer": "header"
             },
             "match_pattern": "regex",
@@ -70,7 +71,7 @@
           "body": {
             "mapping": {
               "index": "analyzed",
-              "type": "text",
+              "type": "string",
               "analyzer": "html_body"
             },
             "match": "body"
@@ -80,7 +81,7 @@
           "path_mail": {
             "mapping": {
               "index": "analyzed",
-              "type": "text",
+              "type": "string",
               "analyzer": "path_pattern"
             },
             "match": "path_mail"
@@ -107,10 +108,10 @@
           }
         },
         {
-          "all_text": {
+          "all_string": {
             "mapping": {
               "index": "analyzed",
-              "type": "text",
+              "type": "string",
               "fields": {
                 "raw": {
                   "ignore_above": 256,
@@ -120,10 +121,39 @@
                 }
               }
             },
-            "match_mapping_type": "text"
+            "match_mapping_type": "string"
           }
         }
-      ]
+      ],
+      "_all": {
+        "norms": false,
+        "enabled": true
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "geoip": {
+          "dynamic": true,
+          "properties": {
+            "ip": {
+              "type": "ip"
+            },
+            "latitude": {
+              "type": "half_float"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "longitude": {
+              "type": "half_float"
+            }
+          }
+        },
+        "@version": {
+          "type": "keyword"
+        }
+      }
     }
   }
 }

docs/images/map.png

@@ -1,4 +1,4 @@
-(defproject spamscope "1.4.8-SNAPSHOT"
+(defproject spamscope "1.4.9-SNAPSHOT"
   :resource-paths ["_resources"]
   :target-path "_build"
   :min-lein-version "2.0.0"

project.clj

@@ -19,7 +19,7 @@
 
 from os.path import join
 
-__version__ = "1.4.7"
+__version__ = "1.4.9"
 __configuration_path__ = "/etc/spamscope"
 
 __defaults__ = {