From ae937525cd52dff8a058816557e858cc561ee776 Mon Sep 17 00:00:00 2001 From: Christoph Wurm Date: Fri, 22 Mar 2019 19:34:06 +0000 Subject: [PATCH 1/2] Remove IP fields from default_field in Elasticsearch template. --- CHANGELOG.next.asciidoc | 1 + libbeat/template/processor.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e68d087d77e2..8316deb65cc0 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -82,6 +82,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Include ip and boolean type when generating index pattern. {pull}10995[10995] - Using an environment variable for the password when enrolling a beat will now raise an error if the variable doesn't exist. {pull}10936[10936] - Cancelling enrollment of a beat will not enroll the beat. {issue}10150[10150] +- Remove IP fields from default_field in Elasticsearch template. *Auditbeat* diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go index 48897c2bf4e3..db0682ef9f0c 100644 --- a/libbeat/template/processor.go +++ b/libbeat/template/processor.go @@ -100,7 +100,7 @@ func (p *Processor) Process(fields common.Fields, path string, output common.Map } switch field.Type { - case "", "keyword", "text", "ip": + case "", "keyword", "text": addToDefaultFields(&field) } From b1806d1882576e8b04a95b54d9cf78082fb5b0f8 Mon Sep 17 00:00:00 2001 From: Christoph Wurm Date: Fri, 22 Mar 2019 19:49:43 +0000 Subject: [PATCH 2/2] Changelog --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 8316deb65cc0..d1040844efdf 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -82,7 +82,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff] - Include ip and boolean type when generating index pattern. {pull}10995[10995] - Using an environment variable for the password when enrolling a beat will now raise an error if the variable doesn't exist. {pull}10936[10936] - Cancelling enrollment of a beat will not enroll the beat. {issue}10150[10150] -- Remove IP fields from default_field in Elasticsearch template. +- Remove IP fields from default_field in Elasticsearch template. {pull}11399[11399] *Auditbeat*