Skip to content

Commit

Permalink
Move _meta section back inside mappings, in legacy templates. (#1186)
Browse files Browse the repository at this point in the history 
This fixes an issue introduced by #1156, discovered in #1180. Composable templates support `_meta` at the template's root, but legacy templates don't. So we're just putting it back inside the mappings for legacy templates.

This also fixes missing updates to the component template, after the introduction of wildcard in #1098.
  • Loading branch information
Mathieu Martin authored Dec 10, 2020
1 parent 18a66d6 commit 83ced31
Show file tree
Hide file tree
Showing 25 changed files with 121 additions and 219 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.next.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ Thanks, you're awesome :-) -->
* Added support in the generated Go source go for `wildcard`, `version`, and `constant_keyword` data types. #1050
* Added support for marking fields, field sets, or field reuse as beta in the documentation. #1051
* Added support for `constant_keyword`'s optional parameter `value`. #1112
* Added component templates for ECS field sets. #1156
* Added component templates for ECS field sets. #1156, #1186

#### Improvements

* Added a notice highlighting that the `tracing` fields are not nested under the
namespace `tracing.` #1162
* ES 6.x template data types will fallback to supported types. #1171, #1176
* ES 6.x template data types will fallback to supported types. #1171, #1176, #1186

#### Deprecated

Expand Down
6 changes: 3 additions & 3 deletions experimental/generated/elasticsearch/7/template.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"_meta": {
"version": "2.0.0-dev+exp"
},
"index_patterns": [
"try-ecs-*"
],
"mappings": {
"_meta": {
"version": "2.0.0-dev+exp"
},
"date_detection": false,
"dynamic_templates": [
{
Expand Down
6 changes: 3 additions & 3 deletions generated/elasticsearch/6/template.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"_meta": {
"version": "2.0.0-dev"
},
"index_patterns": [
"try-ecs-*"
],
"mappings": {
"_doc": {
"_meta": {
"version": "2.0.0-dev"
},
"date_detection": false,
"dynamic_templates": [
{
Expand Down
6 changes: 3 additions & 3 deletions generated/elasticsearch/7/template.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"_meta": {
"version": "2.0.0-dev"
},
"index_patterns": [
"try-ecs-*"
],
"mappings": {
"_meta": {
"version": "2.0.0-dev"
},
"date_detection": false,
"dynamic_templates": [
{
Expand Down
3 changes: 1 addition & 2 deletions generated/elasticsearch/component/agent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"build": {
"properties": {
"original": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
}
}
},
Expand Down
21 changes: 7 additions & 14 deletions generated/elasticsearch/component/client.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
}
}
}
Expand All @@ -37,8 +36,7 @@
"type": "long"
},
"domain": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"geo": {
"properties": {
Expand All @@ -62,8 +60,7 @@
"type": "geo_point"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"region_iso_code": {
"ignore_above": 1024,
Expand Down Expand Up @@ -99,8 +96,7 @@
"type": "long"
},
"registered_domain": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"subdomain": {
"ignore_above": 1024,
Expand All @@ -117,8 +113,7 @@
"type": "keyword"
},
"email": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"full_name": {
"fields": {
Expand All @@ -127,8 +122,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"group": {
"properties": {
Expand Down Expand Up @@ -161,8 +155,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"roles": {
"ignore_above": 1024,
Expand Down
21 changes: 7 additions & 14 deletions generated/elasticsearch/component/destination.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
}
}
}
Expand All @@ -37,8 +36,7 @@
"type": "long"
},
"domain": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"geo": {
"properties": {
Expand All @@ -62,8 +60,7 @@
"type": "geo_point"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"region_iso_code": {
"ignore_above": 1024,
Expand Down Expand Up @@ -99,8 +96,7 @@
"type": "long"
},
"registered_domain": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"subdomain": {
"ignore_above": 1024,
Expand All @@ -117,8 +113,7 @@
"type": "keyword"
},
"email": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"full_name": {
"fields": {
Expand All @@ -127,8 +122,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"group": {
"properties": {
Expand Down Expand Up @@ -161,8 +155,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"roles": {
"ignore_above": 1024,
Expand Down
3 changes: 1 addition & 2 deletions generated/elasticsearch/component/dll.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@
"type": "keyword"
},
"original_file_name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"product": {
"ignore_above": 1024,
Expand Down
6 changes: 2 additions & 4 deletions generated/elasticsearch/component/dns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"type": "keyword"
},
"data": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"name": {
"ignore_above": 1024,
Expand Down Expand Up @@ -51,8 +50,7 @@
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"registered_domain": {
"ignore_above": 1024,
Expand Down
8 changes: 2 additions & 6 deletions generated/elasticsearch/component/error.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@
"type": "text"
},
"stack_trace": {
"doc_values": false,
"fields": {
"text": {
"norms": false,
"type": "text"
}
},
"ignore_above": 1024,
"index": false,
"type": "keyword"
"type": "wildcard"
},
"type": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
}
}
}
Expand Down
18 changes: 6 additions & 12 deletions generated/elasticsearch/component/file.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"type": "keyword"
},
"directory": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"drive_letter": {
"ignore_above": 1,
Expand Down Expand Up @@ -116,8 +115,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"pe": {
"properties": {
Expand All @@ -142,8 +140,7 @@
"type": "keyword"
},
"original_file_name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"product": {
"ignore_above": 1024,
Expand All @@ -161,8 +158,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"type": {
"ignore_above": 1024,
Expand All @@ -189,8 +185,7 @@
"type": "keyword"
},
"distinguished_name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"locality": {
"ignore_above": 1024,
Expand Down Expand Up @@ -251,8 +246,7 @@
"type": "keyword"
},
"distinguished_name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"locality": {
"ignore_above": 1024,
Expand Down
21 changes: 7 additions & 14 deletions generated/elasticsearch/component/host.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"type": "geo_point"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"region_iso_code": {
"ignore_above": 1024,
Expand All @@ -52,8 +51,7 @@
}
},
"hostname": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"id": {
"ignore_above": 1024,
Expand Down Expand Up @@ -83,8 +81,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"kernel": {
"ignore_above": 1024,
Expand All @@ -97,8 +94,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"platform": {
"ignore_above": 1024,
Expand Down Expand Up @@ -128,8 +124,7 @@
"type": "keyword"
},
"email": {
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"full_name": {
"fields": {
Expand All @@ -138,8 +133,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"group": {
"properties": {
Expand Down Expand Up @@ -172,8 +166,7 @@
"type": "text"
}
},
"ignore_above": 1024,
"type": "keyword"
"type": "wildcard"
},
"roles": {
"ignore_above": 1024,
Expand Down
Loading

0 comments on commit 83ced31

Please sign in to comment.