Skip to content

Commit

Permalink
Remove empty properties from the template files
Browse files Browse the repository at this point in the history 
This were introduced in elastic#3515, but I think they cause issues like
the one in elastic#4483, at least in recent versions of ES.

We already removed these in master, but I didn't
realize the 5.x branches are affected.

Fixes elastic#4483.
  • Loading branch information
Tudor Golubenco committed Jun 9, 2017
1 parent 75db472 commit a373306
Show file tree
Hide file tree
Showing 18 changed files with 1 addition and 226 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ https://github.com/elastic/beats/compare/v5.4.1...master[Check the HEAD diff]
- Fix console output {pull}4045[4045]

- Usage of field `_type` is now ignored and hardcoded to `doc`. {pull}3757[3757]
- Removed empty sections from the template files, causing indexing errors for array objects. {pull}4488[4488]

*Filebeat*

Expand Down
3 changes: 0 additions & 3 deletions filebeat/filebeat.template-es2x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"index": "not_analyzed",
"type": "string"
},
"fields": {
"properties": {}
},
"fileset": {
"properties": {
"module": {
Expand Down
3 changes: 0 additions & 3 deletions filebeat/filebeat.template-es6x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"fields": {
"properties": {}
},
"fileset": {
"properties": {
"module": {
Expand Down
3 changes: 0 additions & 3 deletions filebeat/filebeat.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"fields": {
"properties": {}
},
"fileset": {
"properties": {
"module": {
Expand Down
3 changes: 0 additions & 3 deletions heartbeat/heartbeat.template-es2x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
}
}
},
"fields": {
"properties": {}
},
"host": {
"ignore_above": 1024,
"index": "not_analyzed",
Expand Down
3 changes: 0 additions & 3 deletions heartbeat/heartbeat.template-es6x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@
}
}
},
"fields": {
"properties": {}
},
"host": {
"ignore_above": 1024,
"type": "keyword"
Expand Down
3 changes: 0 additions & 3 deletions heartbeat/heartbeat.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@
}
}
},
"fields": {
"properties": {}
},
"host": {
"ignore_above": 1024,
"type": "keyword"
Expand Down
3 changes: 0 additions & 3 deletions libbeat/libbeat.template-es6x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
}
}
},
"fields": {
"properties": {}
},
"meta": {
"properties": {
"cloud": {
Expand Down
7 changes: 0 additions & 7 deletions libbeat/scripts/generate_template.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,6 @@ def fill_field_properties(args, field, defaults, path):
}
})


properties[field["name"]] = {
"properties": {}
}



elif field.get("type") == "group":
if len(path) > 0:
path = path + "." + field["name"]
Expand Down
24 changes: 0 additions & 24 deletions metricbeat/metricbeat.template-es2x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,6 @@
"index": "not_analyzed",
"type": "string"
},
"labels": {
"properties": {}
},
"name": {
"ignore_above": 1024,
"index": "not_analyzed",
Expand All @@ -793,9 +790,6 @@
"ignore_above": 1024,
"index": "not_analyzed",
"type": "string"
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -902,9 +896,6 @@
}
}
},
"labels": {
"properties": {}
},
"size": {
"properties": {
"regular": {
Expand All @@ -914,9 +905,6 @@
"type": "long"
}
}
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -1028,9 +1016,6 @@
}
}
},
"fields": {
"properties": {}
},
"haproxy": {
"properties": {
"info": {
Expand Down Expand Up @@ -1672,9 +1657,6 @@
"insync_replica": {
"type": "boolean"
},
"isr": {
"properties": {}
},
"leader": {
"type": "long"
},
Expand Down Expand Up @@ -3641,9 +3623,6 @@
"index": "not_analyzed",
"type": "string"
},
"percpu": {
"properties": {}
},
"stats": {
"properties": {
"system": {
Expand Down Expand Up @@ -3937,9 +3916,6 @@
}
}
},
"env": {
"properties": {}
},
"fd": {
"properties": {
"limit": {
Expand Down
24 changes: 0 additions & 24 deletions metricbeat/metricbeat.template-es6x.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,9 +763,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"labels": {
"properties": {}
},
"name": {
"ignore_above": 1024,
"type": "keyword"
Expand All @@ -783,9 +780,6 @@
"status": {
"ignore_above": 1024,
"type": "keyword"
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -895,9 +889,6 @@
}
}
},
"labels": {
"properties": {}
},
"size": {
"properties": {
"regular": {
Expand All @@ -907,9 +898,6 @@
"type": "long"
}
}
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -1024,9 +1012,6 @@
}
}
},
"fields": {
"properties": {}
},
"haproxy": {
"properties": {
"info": {
Expand Down Expand Up @@ -1656,9 +1641,6 @@
"insync_replica": {
"type": "boolean"
},
"isr": {
"properties": {}
},
"leader": {
"type": "long"
},
Expand Down Expand Up @@ -3605,9 +3587,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"percpu": {
"properties": {}
},
"stats": {
"properties": {
"system": {
Expand Down Expand Up @@ -3897,9 +3876,6 @@
}
}
},
"env": {
"properties": {}
},
"fd": {
"properties": {
"limit": {
Expand Down
24 changes: 0 additions & 24 deletions metricbeat/metricbeat.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"labels": {
"properties": {}
},
"name": {
"ignore_above": 1024,
"type": "keyword"
Expand All @@ -786,9 +783,6 @@
"status": {
"ignore_above": 1024,
"type": "keyword"
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -898,9 +892,6 @@
}
}
},
"labels": {
"properties": {}
},
"size": {
"properties": {
"regular": {
Expand All @@ -910,9 +901,6 @@
"type": "long"
}
}
},
"tags": {
"properties": {}
}
}
},
Expand Down Expand Up @@ -1027,9 +1015,6 @@
}
}
},
"fields": {
"properties": {}
},
"haproxy": {
"properties": {
"info": {
Expand Down Expand Up @@ -1659,9 +1644,6 @@
"insync_replica": {
"type": "boolean"
},
"isr": {
"properties": {}
},
"leader": {
"type": "long"
},
Expand Down Expand Up @@ -3608,9 +3590,6 @@
"ignore_above": 1024,
"type": "keyword"
},
"percpu": {
"properties": {}
},
"stats": {
"properties": {
"system": {
Expand Down Expand Up @@ -3900,9 +3879,6 @@
}
}
},
"env": {
"properties": {}
},
"fd": {
"properties": {
"limit": {
Expand Down
Loading

0 comments on commit a373306

Please sign in to comment.