Merge branch 'master' into 2.0-check-wal-seg-size

influxdata · Feb 8, 2021 · d14466c · d14466c
2 parents f5c36b0 + 034280e
commit d14466c
Show file tree

Hide file tree

Showing 127 changed files with 3,879 additions and 1,918 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -594,6 +594,8 @@ jobs:
           key: influxdb-build-{{ .Branch }}-{{ .Revision }}
           paths:
             - /tmp/go-cache
+      - store_artifacts:
+          path: bin/linux
       - persist_to_workspace:
           root: .
           paths:
@@ -627,6 +629,15 @@ jobs:
       - install_core_deps
       - run_goreleaser:
           publish_release: false
+      - run:
+          name: Clean up artifacts
+          command: |
+            # goreleaser generates some temp files in the dist/
+            # directory alongside the artifacts we want to save.
+            mkdir artifacts
+            mv dist/influx* artifacts/
+      - store_artifacts:
+          path: artifacts
       - save_cache:
           name: Save GOCACHE
           key: influxdb-cross-build-{{ .Branch }}-{{ .Revision }}
@@ -773,11 +784,12 @@ jobs:
       - attach_workspace:
           at: ~/project
       - quay_login
-      - run: docker run --net host -v /var/run/docker.sock:/var/run/docker.sock -e TEST_RESULTS=~/project quay.io/influxdb/grace:latest
+      - run: mkdir -p ~/project/results
+      - run: docker run --net host -v /var/run/docker.sock:/var/run/docker.sock -v ~/project/results:/grace/test-results/grace-results -e TEST_RESULTS=~/project/results quay.io/influxdb/grace:latest
       - store_artifacts:
-          path: ~/project
+          path: ~/project/results
       - store_test_results:
-          path: ~/project
+          path: ~/project/results
 
   grace_daily:
     machine: true
@@ -788,6 +800,9 @@ jobs:
       - run:
           command: ./bin/linux/influxd --store=memory --log-level=debug
           background: true
-      - run: docker run --net host -v /var/run/docker.sock:/var/run/docker.sock -v ~/project:/grace/test-results/grace-results quay.io/influxdb/grace:daily
+      - run: mkdir -p ~/project/results
+      - run: docker run --net host -v /var/run/docker.sock:/var/run/docker.sock -v ~/project/results:/grace/test-results/grace-results quay.io/influxdb/grace:daily
       - store_artifacts:
-          path: ~/project
+          path: ~/project/results
+      - store_test_results:
+          path: ~/project/results
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -76,7 +76,7 @@ nfpms:
           amd64: x86_64
         file_name_template: "influxdb2-nightly.{{ .Arch }}"
       deb:
-        file_name_template: "influxdb2_nightly_{{ .Arch }}"
+        file_name_template: "influxdb2-nightly-{{ .Arch }}"
     vendor: InfluxData
     homepage: https://influxdata.com
     maintainer: support@influxdb.com
@@ -88,14 +88,14 @@ archives:
     builds: ["influx"]
     format: tar.gz
     wrap_in_directory: true
-    name_template: "influxdb2_client_nightly_{{ .Os }}_{{ .Arch }}"
+    name_template: "influxdb2-client-nightly-{{ .Os }}-{{ .Arch }}"
     files:
       - LICENSE
       - README.md
   - id: influx_and_influxd
     format: tar.gz
     wrap_in_directory: true
-    name_template: "influxdb2_nightly_{{ .Os }}_{{ .Arch }}"
+    name_template: "influxdb2-nightly-{{ .Os }}-{{ .Arch }}"
     files:
       - LICENSE
       - README.md
@@ -107,7 +107,7 @@ blobs:
     folder: "platform/nightlies/"
 
 checksum:
-  name_template: "influxdb2_nightly.sha256"
+  name_template: "influxdb2-nightly.sha256"
   algorithm: sha256
 
 dockers:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,13 +23,22 @@ This release fully removes the `inmem` indexing option, along with the associate
 
 Replacement `tsi1` indexes will be automatically generated on startup for shards that need it.
 
+#### Artifact naming conventions
+
+The names of artifacts produced by our nightly & release builds have been updated according to the
+[Google developer guidelines](https://developers.google.com/style/filenames). Underscores (`_`) have
+been replaced by hyphens (`-`) in nearly all cases; the one exception is the use of `x86_64` in our
+RPM packages, which has been left unchanged.
+
 ### Features
 
 1. [19811](https://github.com/influxdata/influxdb/pull/19811): Add Geo graph type to be able to store in Dashboard cells.
 1. [20473](https://github.com/influxdata/influxdb/pull/20473): Add `--overwrite-existing-v2` flag to `influxd upgrade` to overwrite existing files at output paths (instead of aborting).
 1. [20524](https://github.com/influxdata/influxdb/pull/20524): Add `influxd print-config` command to support automated config inspection.
 1. [20561](https://github.com/influxdata/influxdb/pull/20561): Add `nats-port` config option for `influxd` server.
 1. [20564](https://github.com/influxdata/influxdb/pull/20564): Add `nats-max-payload-bytes` config option for `influxd` server.
+1. [20467](https://github.com/influxdata/influxdb/pull/20467): Add `influxd inspect export-lp` command to extract data in line-protocol format.
+1. [20604](https://github.com/influxdata/influxdb/pull/20604): Update telegraf plugins list in UI to include Beat, Intel PowerStats, and Rienmann.
 
 ### Bug Fixes
 
@@ -56,6 +65,12 @@ Replacement `tsi1` indexes will be automatically generated on startup for shards
 1. [20548](https://github.com/influxdata/influxdb/pull/20548): Prevent panic in `influxd upgrade` when V1 users exist and no V1 config is given.
 1. [20565](https://github.com/influxdata/influxdb/pull/20565): Set correct Content-Type on v1 query responses.
 1. [20565](https://github.com/influxdata/influxdb/pull/20565): Update V1 API spec to document all valid Accept headers and matching Content-Types.
+1. [20578](https://github.com/influxdata/influxdb/pull/20578): Respect the --skip-verify flag when running `influx query`.
+1. [20495](https://github.com/influxdata/influxdb/pull/20495): Update Flux functions list in UI to reflect that `v1` package was renamed to `schema`.
+1. [20669](https://github.com/influxdata/influxdb/pull/20669): Remove blank lines from payloads sent by `influx write`.
+1. [20657](https://github.com/influxdata/influxdb/pull/20657): Allow for creating users without initial passwords in `influx user create`.
+1. [20679](https://github.com/influxdata/influxdb/pull/20679): Fix incorrect "bucket not found" errors when passing `--bucket-id` to `influx write`.
+1. [20702](https://github.com/influxdata/influxdb/pull/20702): Fix loading config when `INFLUXD_CONFIG_PATH` points to a directory with `.` in its name.
 
 ## v2.0.3 [2020-12-14]
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -119,10 +119,10 @@ Currently the project only depends on `git` and `bzr`.
 
 You need a recent stable version of Rust. We recommend using [rustup](https://rustup.rs/) to install Rust.
 
-You also need `protobuf`, `yarn`, and `make` installed.
+You also need `clang`, `make`, `pkg-config`, `protobuf`, and `yarn` installed.
 
-- OSX: `brew install protobuf yarn make`
-- Linux (Arch): `pacman -S protobuf yarn make`
+- OSX: `brew install make pkg-config protobuf yarn`
+- Linux (Arch): `pacman -S clang make pkgconf protobuf yarn`
 - Linux (Ubuntu, RHEL): See below
 
 #### Ubuntu-specific instructions:
@@ -134,7 +134,7 @@ sudo apt remove yarn cmdtest
 wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 sudo apt-add-repository "deb https://dl.yarnpkg.com/debian/ stable main"
 
-sudo apt install protobuf-compiler libprotobuf-dev yarn make
+sudo apt install make clang pkg-config protobuf-compiler libprotobuf-dev yarn
 ```
 
 #### Redhat-specific instructions
@@ -177,14 +177,7 @@ $ ./env go build ./cmd/influxd
 
 Another method is to configure the `pkg-config` utility. Follow the instructions [here](https://github.com/influxdata/flux#getting-started) to install and configure `pkg-config` and then the normal go commands will work.
 
-The first step is to install the `pkg-config` command.
-
-```bash
-# On Debian/Ubuntu
-$ sudo apt-get install -y clang pkg-config
-# On Mac OS X with Homebrew
-$ brew install pkg-config
-```
+You should have already installed the pkg-config commands when doing the regular 'make' build.
 
 Install the `pkg-config` wrapper utility of the same name to a different path that is earlier in the PATH.
 

diff --git a/Makefile b/Makefile
@@ -128,7 +128,7 @@ ui_client:
 #
 
 fmt: $(SOURCES_NO_VENDOR)
-	gofmt -w -s $^
+	./etc/fmt.sh
 
 checkfmt:
 	./etc/checkfmt.sh

diff --git a/chronograf/dist/dist.go b/chronograf/dist/dist.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 )
 
 // DebugAssets serves assets via a specified directory

diff --git a/chronograf/enterprise/meta_test.go b/chronograf/enterprise/meta_test.go
@@ -164,7 +164,7 @@ func TestMetaClient_Users(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -195,7 +195,7 @@ func TestMetaClient_Users(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -297,7 +297,7 @@ func TestMetaClient_User(t *testing.T) {
 			want: &User{
 				Name: "admin",
 				Permissions: map[string][]string{
-					"": []string{
+					"": {
 						"ViewAdmin", "ViewChronograf",
 					},
 				},
@@ -723,7 +723,7 @@ func TestMetaClient_Roles(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -755,7 +755,7 @@ func TestMetaClient_Roles(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -818,7 +818,7 @@ func TestMetaClient_Role(t *testing.T) {
 			want: &Role{
 				Name: "admin",
 				Permissions: map[string][]string{
-					"": []string{
+					"": {
 						"ViewAdmin", "ViewChronograf",
 					},
 				},
@@ -897,12 +897,12 @@ func TestMetaClient_UserRoles(t *testing.T) {
 				name: nil,
 			},
 			want: map[string]Roles{
-				"marty": Roles{
+				"marty": {
 					Roles: []Role{
 						{
 							Name: "timetravelers",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
@@ -911,33 +911,33 @@ func TestMetaClient_UserRoles(t *testing.T) {
 						{
 							Name: "mcfly",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
 							Users: []string{"marty", "george"},
 						},
 					},
 				},
-				"docbrown": Roles{
+				"docbrown": {
 					Roles: []Role{
 						{
 							Name: "timetravelers",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
 							Users: []string{"marty", "docbrown"},
 						},
 					},
 				},
-				"george": Roles{
+				"george": {
 					Roles: []Role{
 						{
 							Name: "mcfly",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},