diff --git a/.go-version b/.go-version index a8fdfda1c78..a7ee35a3ea7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.8.1 +1.8.3 diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 1c4aa42cfe3..7bc5a713c11 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -56,6 +56,7 @@ https://github.com/elastic/beats/compare/v6.0.0-alpha1...master[Check the HEAD d *Affecting all Beats* +- Upgraded to Golang 1.8.3. {pull}4401[4401] - Added the possibility to set Elasticsearch mapping template settings from the Beat configuration file. {pull}4284[4284] {pull}4317[4317] - Add a variable to the SysV init scripts to make it easier to change the user. {pull}4340[4340] - Add the option to write the generated Elasticsearch mapping template into a file. {pull}4323[4323] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3b5024da97a..834af9dc68e 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.8.1. +used for development is Golang 1.8.3. 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/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/beats-builder/Dockerfile index 7806e249115..86a10029e18 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.8.1 +FROM tudorg/xgo-deb6-1.8.3 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 21317a98872..c6ff338de2f 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.8.1 go-1.8.1/ && + docker build --rm=true -t tudorg/xgo-deb6-1.8.3 go-1.8.3/ && docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder diff --git a/dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile b/dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile similarity index 69% rename from dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile rename to dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile index cedbdc4f30c..55dcc281bf2 100644 --- a/dev-tools/packer/docker/xgo-image-deb6/go-1.8.1/Dockerfile +++ b/dev-tools/packer/docker/xgo-image-deb6/go-1.8.3/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.8.1 layer +# Go cross compiler (xgo): Go 1.8.3 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.8.1.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \ \ $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 31e485d5d87..81c4bf58432 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.8.1 +FROM tudorg/xgo-1.8.3 MAINTAINER Tudor Golubenco diff --git a/dev-tools/packer/docker/xgo-image/build.sh b/dev-tools/packer/docker/xgo-image/build.sh index 8414d4ab566..33f76471d79 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.8.1 go-1.8.1/ && + docker build --rm=true -t tudorg/xgo-1.8.3 go-1.8.3/ && docker build --rm=true -t tudorg/beats-builder beats-builder diff --git a/dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile b/dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile similarity index 69% rename from dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile rename to dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile index 005a4beb702..910878598ba 100644 --- a/dev-tools/packer/docker/xgo-image/go-1.8.1/Dockerfile +++ b/dev-tools/packer/docker/xgo-image/go-1.8.3/Dockerfile @@ -1,4 +1,4 @@ -# Go cross compiler (xgo): Go 1.8.1 layer +# Go cross compiler (xgo): Go 1.8.3 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.8.1.linux-amd64.tar.gz" && \ - export ROOT_DIST_SHA1="a433f76c569055ff8536d796995518dd91a9fa5b" && \ + export ROOT_DIST="https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz" && \ + export ROOT_DIST_SHA1="838c415896ef5ecd395dfabde5e7e6f8ac943c8e" && \ \ $BOOTSTRAP_PURE diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 3ea343f0bbd..477bd0c8772 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.1 +FROM golang:1.8.3 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index bd5fcb308b1..24413143b21 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,5 +1,5 @@ # Beats dockerfile used for testing -FROM golang:1.8.1 +FROM golang:1.8.3 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index b8fc9c9a6a5..8aeccaf7d70 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 6.0.0-alpha1 :doc-branch: master -:go-version: 1.8.1 +:go-version: 1.8.3 :release-state: prerelease :python: 2.7.9 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index c23a651428b..d9c6b797a63 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.1 +FROM golang:1.8.3 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index b99ca4a7734..fbbd40c04e5 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,5 +1,5 @@ # Tomcat is started to fetch Jolokia metrics from it -FROM golang:1.8.1 +FROM golang:1.8.3 COPY test/main.go main.go