Merge branch 'master' of github.com:grafana/grafana

CHANGELOG.md

@@ -21,6 +21,10 @@
 ## Minor
 ## Minor
 * **SMTP**: Make it possible to set specific EHLO for smtp client. [#9319](https://github.com/grafana/grafana/issues/9319)
 * **SMTP**: Make it possible to set specific EHLO for smtp client. [#9319](https://github.com/grafana/grafana/issues/9319)
 * **Dataproxy**: Allow grafan to renegotiate tls connection [#9250](https://github.com/grafana/grafana/issues/9250)
 * **Dataproxy**: Allow grafan to renegotiate tls connection [#9250](https://github.com/grafana/grafana/issues/9250)
+* **HTTP**: set net.Dialer.DualStack to true for all http clients [#9367](https://github.com/grafana/grafana/pull/9367)
+
+## Tech
+* **Go**: Grafana is now built using golang 1.9
 
 
 # 4.5.2 (2017-09-22)
 # 4.5.2 (2017-09-22)
 
 

README.md

@@ -24,7 +24,7 @@ the latest master builds [here](https://grafana.com/grafana/download)
 
 
 ### Dependencies
 ### Dependencies
 
 
-- Go 1.8.1
+- Go 1.9
 - NodeJS LTS
 - NodeJS LTS
 
 
 ### Building the backend
 ### Building the backend

appveyor.yml

@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
 environment:
   nodejs_version: "6"
   nodejs_version: "6"
   GOPATH: c:\gopath
   GOPATH: c:\gopath
-  GOVERSION: 1.8
+  GOVERSION: 1.9
 
 
 install:
 install:
   - rmdir c:\go /s /q
   - rmdir c:\go /s /q

circle.yml

@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.8.linux-amd64.tar.gz"
+    GODIST: "go1.9.linux-amd64.tar.gz"
   post:
   post:
     - mkdir -p ~/download
     - mkdir -p ~/download
     - mkdir -p ~/docker
     - mkdir -p ~/docker

docs/sources/project/building_from_source.md

@@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 
 ## Dependencies
 ## Dependencies
 
 
-- [Go 1.8.1](https://golang.org/dl/)
+- [Go 1.9](https://golang.org/dl/)
 - [NodeJS LTS](https://nodejs.org/download/)
 - [NodeJS LTS](https://nodejs.org/download/)
 - [Git](https://git-scm.com/downloads)
 - [Git](https://git-scm.com/downloads)
 
 

pkg/api/app_routes.go

@@ -25,6 +25,7 @@ var pluginProxyTransport = &http.Transport{
 	Dial: (&net.Dialer{
 	Dial: (&net.Dialer{
 		Timeout:   30 * time.Second,
 		Timeout:   30 * time.Second,
 		KeepAlive: 30 * time.Second,
 		KeepAlive: 30 * time.Second,
+		DualStack: true,
 	}).Dial,
 	}).Dial,
 	TLSHandshakeTimeout: 10 * time.Second,
 	TLSHandshakeTimeout: 10 * time.Second,
 }
 }

pkg/api/grafana_com_proxy.go

@@ -19,6 +19,7 @@ var grafanaComProxyTransport = &http.Transport{
 	Dial: (&net.Dialer{
 	Dial: (&net.Dialer{
 		Timeout:   30 * time.Second,
 		Timeout:   30 * time.Second,
 		KeepAlive: 30 * time.Second,
 		KeepAlive: 30 * time.Second,
+		DualStack: true,
 	}).Dial,
 	}).Dial,
 	TLSHandshakeTimeout: 10 * time.Second,
 	TLSHandshakeTimeout: 10 * time.Second,
 }
 }

pkg/cmd/grafana-cli/services/services.go

@@ -30,6 +30,7 @@ func Init(version string) {
 		DialContext: (&net.Dialer{
 		DialContext: (&net.Dialer{
 			Timeout:   30 * time.Second,
 			Timeout:   30 * time.Second,
 			KeepAlive: 30 * time.Second,
 			KeepAlive: 30 * time.Second,
+			DualStack: true,
 		}).DialContext,
 		}).DialContext,
 		MaxIdleConns:          100,
 		MaxIdleConns:          100,
 		IdleConnTimeout:       90 * time.Second,
 		IdleConnTimeout:       90 * time.Second,

pkg/components/imguploader/webdavuploader.go

@@ -25,6 +25,7 @@ var netTransport = &http.Transport{
 	Proxy: http.ProxyFromEnvironment,
 	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
 	Dial: (&net.Dialer{
 		Timeout:   60 * time.Second,
 		Timeout:   60 * time.Second,
+		DualStack: true,
 	}).Dial,
 	}).Dial,
 	TLSHandshakeTimeout: 5 * time.Second,
 	TLSHandshakeTimeout: 5 * time.Second,
 }
 }

pkg/models/datasource_cache.go

@@ -54,6 +54,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 		Dial: (&net.Dialer{
 		Dial: (&net.Dialer{
 			Timeout:   30 * time.Second,
 			Timeout:   30 * time.Second,
 			KeepAlive: 30 * time.Second,
 			KeepAlive: 30 * time.Second,
+			DualStack: true,
 		}).Dial,
 		}).Dial,
 		TLSHandshakeTimeout:   10 * time.Second,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,

pkg/services/notifications/webhook.go

@@ -28,6 +28,7 @@ var netTransport = &http.Transport{
 	Proxy: http.ProxyFromEnvironment,
 	Proxy: http.ProxyFromEnvironment,
 	Dial: (&net.Dialer{
 	Dial: (&net.Dialer{
 		Timeout:   30 * time.Second,
 		Timeout:   30 * time.Second,
+		DualStack: true,
 	}).Dial,
 	}).Dial,
 	TLSHandshakeTimeout: 5 * time.Second,
 	TLSHandshakeTimeout: 5 * time.Second,
 }
 }

pkg/tracing/tracing.go

@@ -80,8 +80,8 @@ func internalInit(settings *TracingSettings) (io.Closer, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	logger.Info("Initialized jaeger tracer", "address", settings.Address)
 	opentracing.InitGlobalTracer(tracer)
 	opentracing.InitGlobalTracer(tracer)
+	logger.Info("Initializing Jaeger tracer", "address", settings.Address)
 	return closer, nil
 	return closer, nil
 }
 }
 
 

scripts/build/Dockerfile

@@ -23,10 +23,10 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
 
 
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
     yum install -y yarn --nogpgcheck && \
     yum install -y yarn --nogpgcheck && \
-    wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
+    wget https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz
 
 
-ENV GOLANG_VERSION 1.8
+ENV GOLANG_VERSION 1.9
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH /usr/local/go/bin:$PATH
 
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go