Merge branch 'master-1.x' into 18391/cors_v1

.gitignore

@@ -86,4 +86,4 @@ man/*.1.gz
 # 2.0 build artefacts
 /chronograf
 /http
-/ui
+/ui

CHANGELOG.md

@@ -7,6 +7,7 @@ v1.8.1 [unreleased]
 
 -	[#17638](https://github.com/influxdata/influxdb/pull/17638): Verify precision in write requests.
 -	[#18410](https://github.com/influxdata/influxdb/pull/18410): Enable CORS in InfluxDB 2.0 compatibility APIs.
+-	[#18429](https://github.com/influxdata/influxdb/pull/18429): Add option to authenticate prometheus remote read
 
 v1.8.0 [unreleased]
 -------------------

Dockerfile_build_ubuntu64_git

@@ -27,7 +27,7 @@ VOLUME $PROJECT_DIR
 
 
 # Install go
-ENV GO_VERSION 1.12
+ENV GO_VERSION 1.13
 ENV GO_ARCH amd64
 RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \

Dockerfile_build_ubuntu64_go1.12 → Dockerfile_build_ubuntu64_go1.13

@@ -23,7 +23,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN gem install fpm
 
 # setup environment
-ENV GO_VERSION  1.12
+ENV GO_VERSION  1.13
 ENV GOARCH      amd64
 ENV GOROOT      /usr/local/go
 ENV GOPATH      /root/go

Dockerfile_jenkins_ubuntu32

@@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
 # Install go
 ENV GOCACHE=/tmp
 ENV GOPATH /go
-ENV GO_VERSION 1.12
+ENV GO_VERSION 1.13
 ENV GO_ARCH 386
 RUN wget --no-verbose -q https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \

_tools/tmpl/main.go

@@ -248,4 +248,4 @@ func StripComments(raw []byte) []byte {
 	}
 
 	return buf.Bytes()
-}
+}

_tools/tmpl/main_test.go

@@ -54,4 +54,4 @@ func TestStripComments(t *testing.T) {
 			}
 		})
 	}
-}
+}

cmd/influx_inspect/dumptsm/dumptsm.go

@@ -63,8 +63,6 @@ func (cmd *Command) Run(args ...string) error {
 }
 
 func (cmd *Command) dump() error {
-	var errors []error
-
 	f, err := os.Open(cmd.path)
 	if err != nil {
 		return err
@@ -249,15 +247,6 @@ func (cmd *Command) dump() error {
 	fmt.Printf("    Per block: %0.2f bytes/point\n", float64(blockSize)/float64(pointCount))
 	fmt.Printf("    Total: %0.2f bytes/point\n", float64(stat.Size())/float64(pointCount))
 
-	if len(errors) > 0 {
-		println()
-		fmt.Printf("Errors (%d):\n", len(errors))
-		for _, err := range errors {
-			fmt.Printf("  * %v\n", err)
-		}
-		println()
-		return fmt.Errorf("error count %d", len(errors))
-	}
 	return nil
 }
 

cmd/influxd/backup_util/backup_util.go

@@ -6,15 +6,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
+	"path/filepath"
 	"sort"
 	"strings"
 
 	"github.com/gogo/protobuf/proto"
 	internal "github.com/influxdata/influxdb/cmd/influxd/backup_util/internal"
 	"github.com/influxdata/influxdb/services/snapshotter"
-	"io/ioutil"
-	"path/filepath"
 )
 
 //go:generate protoc --gogo_out=. internal/data.proto

etc/config.sample.toml

@@ -301,6 +301,10 @@
   # endpoints. This setting has no effect if auth-enabled is set to false.
   # ping-auth-enabled = false
 
+  # Enables authentication on prometheus remote read api. This setting has no
+  # effect if auth-enabled is set to false.
+  # prom-read-auth-enabled = false
+
   # Determines whether HTTPS is enabled.
   # https-enabled = false