Update github/docker/docker to a consistent version across all packag…

…es (#13415)

* Update github/docker/docker to a consistent version across all packages

This bumps up the version of all vendored github.com/docker/docker packages to `github.com/docker/engine@v19.03.2`. This does impact netbsd, because this version of Docker doesn't compile for netbsd. But we will add the appropriate build tags in a follow-up change.

github.com/docker/engine is a fork of github.com/moby/moby but with release tags. (source: moby/moby#39302 (comment))

Ran command:
    govendor fetch github.com/docker/docker/...::github.com/docker/engine@v19.03.2

This fixes the github.com/Sirupsen/logrus issue causing problems with go.mod in #11850. And ensures that all sub-packages are coming from the same repo (another go.mod requirement).

* Add integration build tag to Metricbeat docker/image metricset test

* Run script/clean_vendor.sh

dev-tools/generate_notice.py

@@ -231,6 +231,7 @@ def create_notice(filename, beat, copyright, vendor_dirs, csvfile, overrides=Non
     "Apache License 2.0",
     "Apache License Version 2.0",
     "Apache License, Version 2.0",
+    "licensed under the Apache 2.0 license",  # github.com/zmap/zcrypto
     re.sub(r"\s+", " ", """Apache License
     ==============
 

libbeat/Makefile

@@ -1,7 +1,6 @@
 BEAT_NAME=libbeat
 TEST_ENVIRONMENT?=true
 SYSTEM_TESTS=true
-GOX_OS=linux darwin windows netbsd openbsd
 
 include scripts/Makefile
 

libbeat/common/docker/client.go

@@ -22,45 +22,38 @@ import (
 	"os"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 
 	"github.com/elastic/beats/libbeat/logp"
 )
 
 // NewClient builds and returns a new Docker client
-// It uses version 1.30 by default, and negotiates it with the server so it is downgraded if 1.30 is too high
+// It uses version 1.32 by default, and negotiates it with the server so it is downgraded if 1.32 is too high.
 func NewClient(host string, httpClient *http.Client, httpHeaders map[string]string) (*client.Client, error) {
-	version := os.Getenv("DOCKER_API_VERSION")
+	version, versionOverride := os.LookupEnv("DOCKER_API_VERSION")
 	if version == "" {
 		version = api.DefaultVersion
+		versionOverride = false
 	}
 
 	c, err := client.NewClient(host, version, httpClient, nil)
 	if err != nil {
 		return c, err
 	}
 
-	if os.Getenv("DOCKER_API_VERSION") == "" {
-		logp.Debug("docker", "Negotiating client version")
+	log := logp.NewLogger("docker")
+
+	if versionOverride {
+		log.Debug("Negotiating Docker client version.")
 		ping, err := c.Ping(context.Background())
 		if err != nil {
-			logp.Debug("docker", "Failed to perform ping: %s", err)
-		}
-
-		// try a really old version, before versioning headers existed
-		if ping.APIVersion == "" {
-			ping.APIVersion = "1.22"
-		}
-
-		// if server version is lower than the client version, downgrade
-		if versions.LessThan(ping.APIVersion, version) {
-			c.UpdateClientVersion(ping.APIVersion)
+			log.Debugf("Failed to perform ping: %v", err)
+		} else {
+			c.NegotiateAPIVersionPing(ping)
 		}
 	}
 
-	logp.Debug("docker", "Client version set to %s", c.ClientVersion())
-
+	log.Debugf("Docker client version set to %s.", c.ClientVersion())
 	return c, nil
 }

libbeat/scripts/Makefile

@@ -63,7 +63,7 @@ TEST_ENVIRONMENT?=false ## @testing if true, "make testsuite" runs integration t
 SYSTEM_TESTS?=false ## @testing if true, "make test" and "make testsuite" run unit tests and system tests
 STRESS_TESTS?=false ## @testing if true, "make test" and "make testsuite" run also run the stress tests
 STRESS_TEST_OPTIONS?=-timeout=20m -race -v
-GOX_OS?=linux darwin windows freebsd netbsd openbsd ## @Building List of all OS to be supported by "make crosscompile".
+GOX_OS?=linux darwin windows openbsd ## @Building List of all OS to be supported by "make crosscompile".
 GOX_OSARCH?=!darwin/arm !darwin/arm64 !darwin/386 ## @building Space separated list of GOOS/GOARCH pairs to build by "make crosscompile".
 GOX_FLAGS?= ## @building Additional flags to append to the gox command used by "make crosscompile".
 # XXX: Should be switched back to `snapshot` once the Elasticsearch

libbeat/tests/docker/docker.go

@@ -62,8 +62,13 @@ func (c Client) ContainerStart(image string, cmd []string, labels map[string]str
 // ContainerWait waits for a container to finish
 func (c Client) ContainerWait(ID string) error {
 	ctx := context.Background()
-	_, err := c.cli.ContainerWait(ctx, ID)
-	return err
+	waitC, errC := c.cli.ContainerWait(ctx, ID, container.WaitConditionNotRunning)
+	select {
+	case <-waitC:
+	case err := <-errC:
+		return err
+	}
+	return nil
 }
 
 // ContainerKill kills the given container

metricbeat/Makefile

@@ -6,7 +6,7 @@ TEST_ENVIRONMENT?=true
 ES_BEATS?=..
 
 # Metricbeat can only be cross-compiled on platforms not requiring CGO.
-GOX_OS=netbsd linux windows
+GOX_OS=linux windows
 GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le"
 
 DOCS_BRANCH=$(shell grep doc-branch ../libbeat/docs/version.asciidoc | cut -c 14-)

metricbeat/module/docker/image/image_integration_test.go

@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// +build integration
+
 package image
 
 import (