Fix docker import generator for 1.17.1 (#28374)

elastic · Oct 13, 2021 · 632235f · 632235f
1 parent 5e24638
commit 632235f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -258,6 +258,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix `logstash` module when `xpack.enabled: true` is set from emitting redundant events. {pull}22808[22808]
 - Change vsphere.datastore.capacity.used.pct value to betweeen 0 and 1. {pull}23148[23148]
 - `beat` module respects `basepath` config option. {pull}28162[28162]
+- Fix list_docker.go {pull}28374[28374]
 
 *Packetbeat*
 

diff --git a/metricbeat/include/list_docker.go b/metricbeat/include/list_docker.go
diff --git a/metricbeat/scripts/mage/fields.go b/metricbeat/scripts/mage/fields.go
@@ -43,7 +43,7 @@ func GenerateOSSMetricbeatModuleIncludeListGo() error {
 			ModuleDirs:       []string{"module/docker", "module/kubernetes"},
 			ModulesToExclude: nil,
 			Outfile:          "include/list_docker.go",
-			BuildTags:        "\n// +build linux darwin windows\n",
+			BuildTags:        "\n//go:build linux || darwin || windows\n// +build linux darwin windows\n",
 			Pkg:              "include"})
 	if err != nil {
 		return err