diff --git a/.appveyor.yml b/.appveyor.yml index 6f434afa82c..04e6b737fe8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,7 +6,7 @@ os: Windows Server 2012 R2 # Environment variables environment: - GOROOT: c:\go1.7.1 + GOROOT: c:\go1.7.4 GOPATH: c:\gopath PYWIN_DL: https://beats-files.s3.amazonaws.com/deps/pywin32-220.win32-py2.7.exe matrix: @@ -24,13 +24,13 @@ clone_folder: c:\gopath\src\github.com\elastic\beats cache: - C:\ProgramData\chocolatey\bin -> .appveyor.yml - C:\ProgramData\chocolatey\lib -> .appveyor.yml -- C:\go1.7.1 -> .appveyor.yml +- C:\go1.7.4 -> .appveyor.yml - C:\tools\mingw64 -> .appveyor.yml - C:\pywin_inst.exe -> .appveyor.yml # Scripts that run after cloning repository install: - - ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.7.1 + - ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.7.4 - set PATH=%GOROOT%\bin;%PATH% # AppVeyor installed mingw is 32-bit only. - ps: >- diff --git a/.travis.yml b/.travis.yml index ea10e34d9ff..2fe10844006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # Cross-compile for amd64 only to speed up testing. - GOX_FLAGS="-arch amd64" - DOCKER_COMPOSE_VERSION: 1.9.0 - - &go_version 1.7.1 + - &go_version 1.7.4 matrix: include: diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 13f67474c55..ffb20647827 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -52,6 +52,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff] - Support for parsing list and dictionary setting from environment variables. - Added new flags to import_dashboards (-cacert, -cert, -key, -insecure). {pull}3139[3139] {pull}3163[3163] - The limit for the number of fields is increased via the mapping template. {pull}3275[3275] +- Updated to Go 1.7.4. {pull}3277[3277] *Metricbeat* - Kafka module broker matching enhancements. {pull}3129[3129] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e8e12983f68..270b24488a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats. The Beats are Go programs, so install the latest version of [golang](http://golang.org/) if you don't have it already. The current Go version -used for development is Golang 1.7.1. +used for development is Golang 1.7.4. The location where you clone is important. Please clone under the source directory of your `GOPATH`. If you don't have `GOPATH` already set, you can diff --git a/Dockerfile b/Dockerfile index 99e8d9142dc..22d24f42bac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.1 +FROM golang:1.7.4 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile index f258ae96a84..509f94ed9cd 100644 --- a/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile +++ b/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM tudorg/xgo-deb6-1.7.1 +FROM tudorg/xgo-deb6-1.7.4 MAINTAINER Tudor Golubenco diff --git a/dev-tools/packer/docker/xgo-image-deb6/build.sh b/dev-tools/packer/docker/xgo-image-deb6/build.sh index 5d46a4b215c..df68d8af68a 100755 --- a/dev-tools/packer/docker/xgo-image-deb6/build.sh +++ b/dev-tools/packer/docker/xgo-image-deb6/build.sh @@ -1,5 +1,5 @@ #!/bin/sh docker build --rm=true -t tudorg/xgo-deb6-base base/ && \ - docker build --rm=true -t tudorg/xgo-deb6-1.7.1 go-1.7.1/ && + docker build --rm=true -t tudorg/xgo-deb6-1.7.4 go-1.7.4/ && docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder diff --git a/dev-tools/packer/docker/xgo-image-deb6/go-1.7.1/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile similarity index 69% rename from dev-tools/packer/docker/xgo-image-deb6/go-1.7.1/Dockerfile rename to dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile index 137a40045f6..075478f5188 100644 --- a/dev-tools/packer/docker/xgo-image-deb6/go-1.7.1/Dockerfile +++ b/dev-tools/packer/docker/xgo-image-deb6/go-1.7.4/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.7.1 layer +# Go cross compiler (xgo): Go 1.7.4 layer # Copyright (c) 2014 Péter Szilágyi. All rights reserved. # # Released under the MIT license. @@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco # Configure the root Go distribution and bootstrap based on it RUN \ - export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="919ab01305ada0078a9fdf8a12bb56fb0b8a1444" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \ \ $BOOTSTRAP_PURE diff --git a/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile index 48f6ee8c88a..342bb3e051a 100644 --- a/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile +++ b/dev-tools/packer/docker/xgo-image/beats-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM tudorg/xgo-1.7.1 +FROM tudorg/xgo-1.7.4 MAINTAINER Tudor Golubenco diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/docker/xgo-image/build.sh index 8775a9c59e9..6c70b8208f4 100755 --- a/dev-tools/packer/docker/xgo-image/build.sh +++ b/dev-tools/packer/docker/xgo-image/build.sh @@ -1,5 +1,5 @@ #!/bin/sh docker build --rm=true -t tudorg/xgo-base base/ && \ - docker build --rm=true -t tudorg/xgo-1.7.1 go-1.7.1/ && + docker build --rm=true -t tudorg/xgo-1.7.4 go-1.7.4/ && docker build --rm=true -t tudorg/beats-builder beats-builder diff --git a/dev-tools/packer/docker/xgo-image/go-1.7.1/Dockerfile b/dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile similarity index 69% rename from dev-tools/packer/docker/xgo-image/go-1.7.1/Dockerfile rename to dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile index d338bb43d90..4f19a0959c9 100644 --- a/dev-tools/packer/docker/xgo-image/go-1.7.1/Dockerfile +++ b/dev-tools/packer/docker/xgo-image/go-1.7.4/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.7.1 layer +# Go cross compiler (xgo): Go 1.7.4 layer # Copyright (c) 2014 Péter Szilágyi. All rights reserved. # # Released under the MIT license. @@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco # Configure the root Go distribution and bootstrap based on it RUN \ - export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="919ab01305ada0078a9fdf8a12bb56fb0b8a1444" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="2e5baf03d1590e048c84d1d5b4b6f2540efaaea1" && \ \ $BOOTSTRAP_PURE diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 670c938ba46..0cb92d48aec 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.1 +FROM golang:1.7.4 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index 3c4b4283bcd..00f00464696 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,5 +1,5 @@ # Beats dockerfile used for testing -FROM golang:1.7.1 +FROM golang:1.7.4 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 46c31ba39ba..0e21043d6eb 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,3 +1,3 @@ :stack-version: 6.0.0-alpha1 :doc-branch: master -:go-version: 1.7.1 +:go-version: 1.7.4 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 31b6c548d9f..ffcb7bb4dea 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.1 +FROM golang:1.7.4 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 3c128792aac..9716f7ff025 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,5 +1,5 @@ # Beats dockerfile used for testing -FROM golang:1.7.1 +FROM golang:1.7.4 MAINTAINER Nicolas Ruflin RUN set -x && \