diff --git a/Makefile b/Makefile index a1ad414bf..e0c9941b0 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ PKG_TAG := $(BUILDINFO_TAG) endif GO_BUILDINFO = -X '$(PKG_PREFIX)/lib/buildinfo.Version=$(APP_NAME)-$(DATEINFO_TAG)-$(BUILDINFO_TAG)' +TAR_OWNERSHIP ?= --owner=1000 --group=1000 .PHONY: $(MAKECMDGOALS) @@ -245,7 +246,7 @@ release-victoria-metrics-windows-amd64: release-victoria-metrics-goos-goarch: victoria-metrics-$(GOOS)-$(GOARCH)-prod cd bin && \ - tar --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf victoria-metrics-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ + tar $(TAR_OWNERSHIP) --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf victoria-metrics-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ victoria-metrics-$(GOOS)-$(GOARCH)-prod \ && sha256sum victoria-metrics-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ victoria-metrics-$(GOOS)-$(GOARCH)-prod \ @@ -302,7 +303,7 @@ release-victoria-logs-windows-amd64: release-victoria-logs-goos-goarch: victoria-logs-$(GOOS)-$(GOARCH)-prod cd bin && \ - tar --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf victoria-logs-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ + tar $(TAR_OWNERSHIP) --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf victoria-logs-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ victoria-logs-$(GOOS)-$(GOARCH)-prod \ && sha256sum victoria-logs-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ victoria-logs-$(GOOS)-$(GOARCH)-prod \ @@ -366,7 +367,7 @@ release-vmutils-goos-goarch: \ vmrestore-$(GOOS)-$(GOARCH)-prod \ vmctl-$(GOOS)-$(GOARCH)-prod cd bin && \ - tar --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf vmutils-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ + tar $(TAR_OWNERSHIP) --transform="flags=r;s|-$(GOOS)-$(GOARCH)||" -czf vmutils-$(GOOS)-$(GOARCH)-$(PKG_TAG).tar.gz \ vmagent-$(GOOS)-$(GOARCH)-prod \ vmalert-$(GOOS)-$(GOARCH)-prod \ vmalert-tool-$(GOOS)-$(GOARCH)-prod \ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b5810e82f..886de7e44 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -30,6 +30,7 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/). ## tip **Update note 1: The `external_labels` field in vmalert-tool [test file](https://docs.victoriametrics.com/vmalert-tool/#test-file-format) will be deprecated soon. Please use `-external.label` command-line flag instead, in the same way as vmalert uses it. This change is done for the sake of consistency between vmalert and vmalert-tool configuration. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6735).** + **Update note 2: starting from this release, [vmagent](https://docs.victoriametrics.com/vmagent/) and [Single-node VictoriaMetrics](https://docs.victoriametrics.com/) will no longer add the default port 80/443 for scrape URLs without a specified port. The value of `instance` label for those scrape targets will be changed from `
:<80|443>` to ``, generating new time series. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6792) for details.** @@ -53,6 +54,7 @@ The value of `instance` label for those scrape targets will be changed from `