Merge branch 'master' into feat/geo-widget-backend

.goreleaser-nightly.yml

@@ -49,18 +49,21 @@ builds:
       pre: make generate
 
 nfpms:
-  -
-    id: "influxdb2"
+  - id: "influxdb2"
     builds: ["influx", "influxd"]
     formats:
       - deb
       - rpm
     bindir: /usr/bin
-    files:
-      "scripts/init.sh": "/usr/lib/influxdb/scripts/init.sh"
-      "scripts/influxdb.service": "/usr/lib/influxdb/scripts/influxdb.service"
-      "scripts/logrotate": "/etc/logrotate.d/influxdb"
-      "scripts/influxdb2-upgrade.sh": "/usr/share/influxdb/influxdb2-upgrade.sh"
+    contents:
+      - src: scripts/init.sh
+        dst: /usr/lib/influxdb/scripts/init.sh
+      - src: scripts/influxdb.service
+        dst: /usr/lib/influxdb/scripts/influxdb.service
+      - src: scripts/logrotate
+        dst: /etc/logrotate.d/influxdb
+      - src: scripts/influxdb2-upgrade.sh
+        dst: /usr/share/influxdb/influxdb2-upgrade.sh
     scripts:
       preinstall:  "scripts/pre-install.sh"
       postinstall: "scripts/post-install.sh"
@@ -108,10 +111,32 @@ dockers:
       - influxd
       - influx
     image_templates:
-      - "quay.io/influxdb/influxdb2:nightly"
+      - "quay.io/influxdb/influxdb-amd64:nightly"
     dockerfile: docker/influxd/Dockerfile
     extra_files:
       - docker/influxd/entrypoint.sh
+    build_flag_templates:
+      - "--platform=linux/amd64"
+    use_buildx: true
+  - goos: linux
+    goarch: arm64
+    binaries:
+      - influxd
+      - influx
+    image_templates:
+      - "quay.io/influxdb/influxdb-arm64v8:nightly"
+    dockerfile: docker/influxd/Dockerfile
+    extra_files:
+      - docker/influxd/entrypoint.sh
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+    use_buildx: true
+
+docker_manifests:
+  - name_template: "quay.io/influxdb/influxdb:nightly"
+    image_templates:
+      - "quay.io/influxdb/influxdb-amd64:nightly"
+      - "quay.io/influxdb/influxdb-arm64v8:nightly"
 
 # Do not make github release
 release:

.goreleaser.yml

@@ -55,11 +55,15 @@ nfpms:
       - deb
       - rpm
     bindir: /usr/bin
-    files:
-      "scripts/init.sh": "/usr/lib/influxdb/scripts/init.sh"
-      "scripts/influxdb.service": "/usr/lib/influxdb/scripts/influxdb.service"
-      "scripts/logrotate": "/etc/logrotate.d/influxdb"
-      "scripts/influxdb2-upgrade.sh": "/usr/share/influxdb/influxdb2-upgrade.sh"
+    contents:
+      - src: scripts/init.sh
+        dst: /usr/lib/influxdb/scripts/init.sh
+      - src: scripts/influxdb.service
+        dst: /usr/lib/influxdb/scripts/influxdb.service
+      - src: scripts/logrotate
+        dst: /etc/logrotate.d/influxdb
+      - src: scripts/influxdb2-upgrade.sh
+        dst: /usr/share/influxdb/influxdb2-upgrade.sh
     scripts:
       preinstall:  "scripts/pre-install.sh"
       postinstall: "scripts/post-install.sh"
@@ -119,14 +123,35 @@ dockers:
       - influxd
       - influx
     image_templates:
-      - "quay.io/influxdb/influxdb2:{{ .Tag }}"
+      - "quay.io/influxdb/influxdb-amd64:{{ .Tag }}"
     dockerfile: docker/influxd/Dockerfile
     extra_files:
       - docker/influxd/entrypoint.sh
+    build_flag_templates:
+      - "--platform=linux/amd64"
+    use_buildx: true
+  - goos: linux
+    goarch: arm64
+    binaries:
+      - influxd
+      - influx
+    image_templates:
+      - "quay.io/influxdb/influxdb-arm64v8:{{ .Tag }}"
+    dockerfile: docker/influxd/Dockerfile
+    extra_files:
+      - docker/influxd/entrypoint.sh
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+    use_buildx: true
+
+docker_manifests:
+  - name_template: "quay.io/influxdb/influxdb:{{ .Tag }}"
+    image_templates:
+      - "quay.io/influxdb/influxdb-amd64:{{ .Tag }}"
+      - "quay.io/influxdb/influxdb-arm64v8:{{ .Tag }}"
 
 signs:
-  -
-    signature: "${artifact}.asc"
+  - signature: "${artifact}.asc"
     cmd: gpg
     args: [ "--passphrase", "{{.Env.PASSPHRASE}}",  "--pinentry-mode=loopback", "--batch", "--armor",  "--detach-sign", "${artifact}"]
     artifacts: all

CHANGELOG.md

@@ -1,5 +1,24 @@
 ## unreleased
 
+### Docker
+
+#### ARM64
+This release extends the Docker builds hosted in `quay.io` to support the `linux/arm64` platform.
+
+#### 2.x nightly images
+Prior to this release, competing nightly builds caused the `nightly` Docker tag to contain outdated
+binaries. This conflict has been fixed, and the image tagged with `nightly` will now contain `2.x`
+binaries built from the `HEAD` of the `master` branch.
+
+### Breaking Changes
+
+#### inmem index option removed
+This release fully removes the `inmem` indexing option, along with the associated config options:
+* `max-series-per-database`
+* `max-values-per-tag`
+
+Replacement `tsi1` indexes will be automatically generated on startup for shards that need it.
+
 ### Bug Fixes
 
 1. [20339](https://github.com/influxdata/influxdb/pull/20339): Include upgrade helper script in goreleaser manifest.
@@ -10,7 +29,12 @@
 1. [20362](https://github.com/influxdata/influxdb/pull/20362): Don't overwrite stack name/description on `influx stack update`.
 1. [20355](https://github.com/influxdata/influxdb/pull/20355): Fix timeout setup for `influxd` graceful shutdown.
 1. [20387](https://github.com/influxdata/influxdb/pull/20387): Improve error message shown when `influx` CLI can't find an org by name.
-1. [20380](https://github.com/influxdata/influxdb/pull/20380): Remove duplication from task error messages
+1. [20380](https://github.com/influxdata/influxdb/pull/20380): Remove duplication from task error messages.
+1. [20313](https://github.com/influxdata/influxdb/pull/20313): Automatically build `tsi1` indexes for shards that need it instead of falling back to `inmem`.
+1. [20313](https://github.com/influxdata/influxdb/pull/20313): Fix logging initialization for storage engine.
+1. [20442](https://github.com/influxdata/influxdb/pull/20442): Don't return 500 codes for partial write failures.
+1. [20440](https://github.com/influxdata/influxdb/pull/20440): Add confirmation step w/ file sizes before copying data files in `influxd upgrade`.
+1. [20409](https://github.com/influxdata/influxdb/pull/20409): Improve messages in DBRP API validation errors.
 
 ## v2.0.3 [2020-12-14]
 

Makefile

@@ -15,6 +15,7 @@
 # It is required that all SUBDIRS have the `all` and `clean` targets.
 SUBDIRS := http ui chronograf storage
 
+export GOPATH=$(shell go env GOPATH)
 export GOOS=$(shell go env GOOS)
 export GOARCH=$(shell go env GOARCH)
 
@@ -46,6 +47,8 @@ endif
 
 # Allow for `go test` to be swapped out by other tooling, i.e. `gotestsum`
 GO_TEST_CMD=go test
+# Allow for a subset of tests to be specified.
+GO_TEST_PATHS=./...
 
 # Test vars can be used by all recursive Makefiles
 export PKG_CONFIG:=$(PWD)/scripts/pkg-config.sh
@@ -149,7 +152,7 @@ test-js: node_modules
 	make -C ui test
 
 test-go:
-	$(GO_TEST) ./...
+	$(GO_TEST) $(GO_TEST_PATHS)
 
 test-influxql-integration:
 	$(GO_TEST) -mod=readonly ./influxql/_v1tests
@@ -159,12 +162,12 @@ test-influxql-validation:
 
 test-integration: GO_TAGS=integration
 test-integration:
-	$(GO_TEST) -count=1 ./...
+	$(GO_TEST) -count=1 $(GO_TEST_PATHS)
 
 test: test-go test-js
 
 test-go-race:
-	$(GO_TEST) -v -race -count=1 ./...
+	$(GO_TEST) -v -race -count=1 $(GO_TEST_PATHS)
 
 vet:
 	$(GO_VET) -v ./...
@@ -214,13 +217,6 @@ run: chronogiraffe
 run-e2e: chronogiraffe
 	./bin/$(GOOS)/influxd --assets-path=ui/build --e2e-testing --store=memory
 
-# assume this is running from circleci
-# TODO: Move this to the CI docker image build?
-protoc:
-	curl -s -L https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip > /tmp/protoc.zip
-	unzip -o -d /go /tmp/protoc.zip
-	chmod +x /go/bin/protoc
-
 # generate feature flags
 flags:
 	$(GO_GENERATE) ./kit/feature