elastic · ruflin · Feb 13, 2018 · Feb 8, 2018 · Feb 12, 2018 · kvch
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.9.2
+1.9.4
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -75,6 +75,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Fix isolation of modules when merging local and global field settings. {issue}5795[5795]
 - Fix panic when Events containing a float32 value are normalized. {pull}6129[6129]
 - Fix `setup.dashboards.always_kibana` when using Kibana 5.6. {issue}6090[6090]
+- Update Golang 1.9.4 {pull}6326[6326]
 
 *Auditbeat*
 

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2843,8 +2843,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------
 Dependency: github.com/shirou/gopsutil
-Version: v2.17.04
-Revision: 9af92986dda65a8c367157a82b484553e1ec1c55
+Version: v2.18.01
+Revision: c432be29ccce470088d07eea25b3ea7e68a8afbb
 License type (autodetected): BSD-3-Clause
 ./vendor/github.com/shirou/gopsutil/LICENSE:
 --------------------------------------------------------------------

diff --git a/Vagrantfile b/Vagrantfile
@@ -63,7 +63,7 @@ if [ ! -e "~/bin/gvm" ]; then
   chmod +x ~/bin/gvm
   echo 'export GOPATH=$HOME/go' >> ~/.bash_profile
   echo 'export PATH=$HOME/bin:$GOPATH/bin:$PATH' >> ~/.bash_profile
-  echo 'eval "$(gvm 1.9.2)"' >> ~/.bash_profile
+  echo 'eval "$(gvm 1.9.4)"' >> ~/.bash_profile
 fi
 SCRIPT
 

diff --git 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.9.2
+FROM tudorg/xgo-deb6-1.9.4
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git 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.9.2 go-1.9.2/ &&
+    docker build --rm=true -t tudorg/xgo-deb6-1.9.4 go-1.9.4/ &&
     docker build --rm=true -t tudorg/beats-builder-deb6 beats-builder
diff --git a/...docker/xgo-image-deb6/go-1.9.2/Dockerfile → ...docker/xgo-image-deb6/go-1.9.4/Dockerfile b/...docker/xgo-image-deb6/go-1.9.2/Dockerfile → ...docker/xgo-image-deb6/go-1.9.4/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.9.2 layer
+# Go cross compiler (xgo): Go 1.9.4 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779" && \
   \
   $BOOTSTRAP_PURE
diff --git 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.9.2
+FROM tudorg/xgo-1.9.4
 
 MAINTAINER Tudor Golubenco <tudor@elastic.co>
 

diff --git 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.9.2 go-1.9.2/ &&
+    docker build --rm=true -t tudorg/xgo-1.9.4 go-1.9.4/ &&
     docker build --rm=true -t tudorg/beats-builder beats-builder
diff --git a/...cker/docker/xgo-image/go-1.9.2/Dockerfile → ...cker/docker/xgo-image/go-1.9.4/Dockerfile b/...cker/docker/xgo-image/go-1.9.2/Dockerfile → ...cker/docker/xgo-image/go-1.9.4/Dockerfile
@@ -1,4 +1,4 @@
-# Go cross compiler (xgo): Go 1.9.2 layer
+# Go cross compiler (xgo): Go 1.9.4 layer
 # Copyright (c) 2014 Péter Szilágyi. All rights reserved.
 #
 # Released under the MIT license.
@@ -9,7 +9,7 @@ MAINTAINER Tudor Golubenco <tudor@elastic.co>
 
 # Configure the root Go distribution and bootstrap based on it
 RUN \
-  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz" && \
-  export ROOT_DIST_SHA1="94c889e039e3d2e94ed95e8f8cb747c5bc1c2b58" && \
+  export ROOT_DIST="https://storage.googleapis.com/golang/go1.9.4.linux-amd64.tar.gz" && \
+  export ROOT_DIST_SHA1="15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779" && \
   \
   $BOOTSTRAP_PURE
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2
+FROM golang:1.9.4
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/generator/beat/{beat}/.travis.yml b/generator/beat/{beat}/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - 1.9.2
+  - 1.9.4
 
 os:
   - linux

@@ -1,5 +1,5 @@
 # Beats dockerfile used for testing
-FROM golang:1.9.2
+FROM golang:1.9.4
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

@@ -1,6 +1,6 @@
 :stack-version: 7.0.0-alpha1
 :doc-branch: master
-:go-version: 1.9.2
+:go-version: 1.9.4
 :release-state: unreleased
 :python: 2.7.9
 :docker: 1.12

@@ -52,7 +52,7 @@ NOSETESTS_OPTIONS?=--process-timeout=$(TIMEOUT) --with-timer -v --with-xunit --x
 TEST_ENVIRONMENT?=false ## @testing if true, "make testsuite" runs integration tests and system tests in a dockerized test environment
 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
-GOX_OS?=linux darwin windows solaris freebsd netbsd openbsd ## @Building List of all OS to be supported by "make crosscompile".
+GOX_OS?=linux darwin windows freebsd netbsd 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".
 TESTING_ENVIRONMENT?=snapshot## @testing The name of the environment under test

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2
+FROM golang:1.9.4
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/metricbeat/Makefile b/metricbeat/Makefile
@@ -11,7 +11,7 @@ GOPACKAGES=$(shell go list ${BEAT_PATH}/... | grep -v /vendor/)
 ES_BEATS?=..
 
 # Metricbeat can only be cross-compiled on platforms not requiring CGO.
-GOX_OS=solaris netbsd linux windows
+GOX_OS=netbsd linux windows
 GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le"
 
 

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.2
+FROM golang:1.9.4
 
 COPY test/main.go main.go
 

diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin.go
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_cgo.go
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/disk/disk_darwin_nocgo.go
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_fallback.go b/vendor/github.com/shirou/gopsutil/disk/disk_fallback.go
diff --git a/vendor/github.com/shirou/gopsutil/disk/disk_freebsd.go b/vendor/github.com/shirou/gopsutil/disk/disk_freebsd.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: go
     go:
-      - 1.9.2
+      - 1.9.4
     os:
       - linux
@@ Expand Down @@