From 632235f775bb3cadf3b0c083dce1d5d078639b5a Mon Sep 17 00:00:00 2001
From: Alex K <8418476+fearful-symmetry@users.noreply.github.com>
Date: Wed, 13 Oct 2021 02:35:19 -0700
Subject: [PATCH] Fix docker import generator for 1.17.1 (#28374)

---
 CHANGELOG.next.asciidoc           | 1 +
 metricbeat/include/list_docker.go | 1 +
 metricbeat/scripts/mage/fields.go | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 0a9d351f897..f089ad4bdfc 100644
--- 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
index c2fc8197b90..1e8a7c494e7 100644
--- a/metricbeat/include/list_docker.go
+++ b/metricbeat/include/list_docker.go
@@ -17,6 +17,7 @@
 
 // Code generated by beats/dev-tools/cmd/module_include_list/module_include_list.go - DO NOT EDIT.
 
+//go:build linux || darwin || windows
 // +build linux darwin windows
 
 package include
diff --git a/metricbeat/scripts/mage/fields.go b/metricbeat/scripts/mage/fields.go
index a46110fee92..4d3c010a08d 100644
--- 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