Fix issue with missing module fields in index template (#18983)

The fields.go files were not being imported for the Winlogbeat modules so they were absent from the index template.
elastic · Jun 5, 2020 · 82dc7c0 · 82dc7c0
1 parent d5fee98
commit 82dc7c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -232,7 +232,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Winlogbeat*
 
-- Fix invalid IP addresses in DNS query results from Sysmon data. {issue}18432[18432] {pull}18436{18436}
+- Fix invalid IP addresses in DNS query results from Sysmon data. {issue}18432[18432] {pull}18436[18436]
+- Fields from Winlogbeat modules were not being included in index templates and patterns. {pull}18983[18983]
 
 *Functionbeat*
 

diff --git a/x-pack/winlogbeat/cmd/root.go b/x-pack/winlogbeat/cmd/root.go
@@ -7,6 +7,9 @@ package cmd
 import (
 	"github.com/elastic/beats/v7/winlogbeat/cmd"
 	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
+
+	// Register fields.
+	_ "github.com/elastic/beats/v7/x-pack/winlogbeat/include"
 )
 
 // Name of this beat.

diff --git a/x-pack/winlogbeat/main.go b/x-pack/winlogbeat/main.go
@@ -7,8 +7,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/elastic/beats/v7/winlogbeat/include"
-
 	"github.com/elastic/beats/v7/x-pack/winlogbeat/cmd"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,6 @@ package main @@
     import (
     	"os"
-    	_ "github.com/elastic/beats/v7/winlogbeat/include"
     	"github.com/elastic/beats/v7/x-pack/winlogbeat/cmd"
     )
@@ Expand Down @@