diff --git a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz index 075f0394f84e2..c1bcd234b677a 100644 Binary files a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz and b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz differ diff --git a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json index 9c1f3f479545b..7f14969deff70 100644 --- a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json +++ b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json @@ -1,7 +1,7 @@ { "type": "index", "value": { - "index": "logstash-2015.09.21", + "index": "logstash-2015.09.22", "settings": { "index": { "number_of_shards": "1", @@ -14,12 +14,11 @@ } } }, - "number_of_replicas": "0", - "mapping.single_type": false + "number_of_replicas": "0" } }, "mappings": { - "apache": { + "docs": { "dynamic_templates": [ { "string_fields": { @@ -358,82 +357,32 @@ } } } - }, - "_default_": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@timestamp": { - "type": "date" - }, - "clientip": { - "type": "ip" - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "ip": { - "type": "ip" - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } + } + } + } +} + +{ + "type": "index", + "value": { + "index": "logstash-2015.09.20", + "settings": { + "index": { + "number_of_shards": "1", + "analysis": { + "analyzer": { + "url": { + "type": "standard", + "max_token_length": "1000", + "tokenizer": "uax_url_email" } - }, - "referer": { - "type": "keyword" } - } - }, - "nginx": { + }, + "number_of_replicas": "0" + } + }, + "mappings": { + "docs": { "dynamic_templates": [ { "string_fields": { @@ -780,7 +729,7 @@ { "type": "index", "value": { - "index": "logstash-2015.09.20", + "index": "logstash-2015.09.21", "settings": { "index": { "number_of_shards": "1", @@ -793,1205 +742,11 @@ } } }, - "number_of_replicas": "0", - "mapping.single_type": false + "number_of_replicas": "0" } }, "mappings": { - "apache": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@message": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@tags": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@timestamp": { - "type": "date" - }, - "agent": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "bytes": { - "type": "long" - }, - "clientip": { - "type": "ip" - }, - "extension": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "headings": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "host": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "index": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ip": { - "type": "ip" - }, - "links": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "machine": { - "properties": { - "os": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ram": { - "type": "long" - } - } - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } - } - }, - "phpmemory": { - "type": "long" - }, - "referer": { - "type": "keyword" - }, - "relatedContent": { - "properties": { - "article:modified_time": { - "type": "date" - }, - "article:published_time": { - "type": "date" - }, - "article:section": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "article:tag": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:height": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:width": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:site_name": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:type": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:card": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:site": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - }, - "request": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "response": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "spaces": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "utc_time": { - "type": "date" - }, - "xss": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - }, - "_default_": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@timestamp": { - "type": "date" - }, - "clientip": { - "type": "ip" - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "ip": { - "type": "ip" - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } - } - }, - "referer": { - "type": "keyword" - } - } - }, - "nginx": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@message": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@tags": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@timestamp": { - "type": "date" - }, - "agent": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "bytes": { - "type": "long" - }, - "clientip": { - "type": "ip" - }, - "extension": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "headings": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "host": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "index": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ip": { - "type": "ip" - }, - "links": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "machine": { - "properties": { - "os": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ram": { - "type": "long" - } - } - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } - } - }, - "phpmemory": { - "type": "long" - }, - "referer": { - "type": "keyword" - }, - "relatedContent": { - "properties": { - "article:modified_time": { - "type": "date" - }, - "article:published_time": { - "type": "date" - }, - "article:section": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "article:tag": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:height": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:width": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:site_name": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:type": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:card": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:site": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - }, - "request": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "response": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "spaces": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "utc_time": { - "type": "date" - }, - "xss": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - } - } - } -} - -{ - "type": "index", - "value": { - "index": "logstash-2015.09.22", - "settings": { - "index": { - "number_of_shards": "1", - "analysis": { - "analyzer": { - "url": { - "type": "standard", - "max_token_length": "1000", - "tokenizer": "uax_url_email" - } - } - }, - "number_of_replicas": "0", - "mapping.single_type": false - } - }, - "mappings": { - "apache": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@message": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@tags": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "@timestamp": { - "type": "date" - }, - "agent": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "bytes": { - "type": "long" - }, - "clientip": { - "type": "ip" - }, - "extension": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "headings": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "host": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "index": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ip": { - "type": "ip" - }, - "links": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "machine": { - "properties": { - "os": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "ram": { - "type": "long" - } - } - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } - } - }, - "phpmemory": { - "type": "long" - }, - "referer": { - "type": "keyword" - }, - "relatedContent": { - "properties": { - "article:modified_time": { - "type": "date" - }, - "article:published_time": { - "type": "date" - }, - "article:section": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "article:tag": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:height": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:image:width": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:site_name": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:type": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "og:url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:card": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:description": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:image": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:site": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "twitter:title": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - }, - "request": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "response": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "spaces": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "url": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - }, - "utc_time": { - "type": "date" - }, - "xss": { - "type": "text", - "fields": { - "raw": { - "type": "keyword" - } - } - } - } - }, - "_default_": { - "dynamic_templates": [ - { - "string_fields": { - "match": "*", - "match_mapping_type": "string", - "mapping": { - "fields": { - "raw": { - "type": "keyword" - } - }, - "type": "text" - } - } - } - ], - "properties": { - "@timestamp": { - "type": "date" - }, - "clientip": { - "type": "ip" - }, - "geo": { - "properties": { - "coordinates": { - "type": "geo_point" - }, - "dest": { - "type": "keyword" - }, - "src": { - "type": "keyword" - }, - "srcdest": { - "type": "keyword" - } - } - }, - "id": { - "type": "integer" - }, - "ip": { - "type": "ip" - }, - "memory": { - "type": "double" - }, - "meta": { - "properties": { - "char": { - "type": "keyword" - }, - "related": { - "type": "text" - }, - "user": { - "properties": { - "firstname": { - "type": "text" - }, - "lastname": { - "type": "integer" - } - } - } - } - }, - "referer": { - "type": "keyword" - } - } - }, - "nginx": { + "docs": { "dynamic_templates": [ { "string_fields": {