diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 747933aa4b..a227d91837 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,8 @@ jobs: arch: arm - os: linux arch: ppc64le + - os: linux + arch: s390x - os: darwin arch: amd64 - os: darwin diff --git a/Makefile b/Makefile index ebe64e50e8..bad7f6c987 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,7 @@ release-victoria-metrics: \ release-victoria-metrics-linux-amd64 \ release-victoria-metrics-linux-arm \ release-victoria-metrics-linux-arm64 \ + release-victoria-metrics-linux-s390x \ release-victoria-metrics-darwin-amd64 \ release-victoria-metrics-darwin-arm64 \ release-victoria-metrics-freebsd-amd64 \ @@ -275,6 +276,9 @@ release-victoria-metrics-linux-arm: release-victoria-metrics-linux-arm64: GOOS=linux GOARCH=arm64 $(MAKE) release-victoria-metrics-goos-goarch +release-victoria-metrics-linux-s390x: + GOOS=linux GOARCH=s390x $(MAKE) release-victoria-metrics-goos-goarch + release-victoria-metrics-darwin-amd64: GOOS=darwin GOARCH=amd64 $(MAKE) release-victoria-metrics-goos-goarch @@ -314,6 +318,7 @@ release-vmutils: \ release-vmutils-linux-amd64 \ release-vmutils-linux-arm64 \ release-vmutils-linux-arm \ + release-vmutils-linux-s390x \ release-vmutils-darwin-amd64 \ release-vmutils-darwin-arm64 \ release-vmutils-freebsd-amd64 \ @@ -332,6 +337,9 @@ release-vmutils-linux-arm64: release-vmutils-linux-arm: GOOS=linux GOARCH=arm $(MAKE) release-vmutils-goos-goarch +release-vmutils-linux-s390x: + GOOS=linux GOARCH=s390x $(MAKE) release-vmutils-goos-goarch + release-vmutils-darwin-amd64: GOOS=darwin GOARCH=amd64 $(MAKE) release-vmutils-goos-goarch diff --git a/app/victoria-metrics/Makefile b/app/victoria-metrics/Makefile index e7f0f7f27a..d63644bc39 100644 --- a/app/victoria-metrics/Makefile +++ b/app/victoria-metrics/Makefile @@ -27,6 +27,9 @@ victoria-metrics-linux-ppc64le-prod: victoria-metrics-linux-386-prod: APP_NAME=victoria-metrics $(MAKE) app-via-docker-linux-386 +victoria-metrics-linux-s390x-prod: + APP_NAME=victoria-metrics $(MAKE) app-via-docker-linux-s390x + victoria-metrics-darwin-amd64-prod: APP_NAME=victoria-metrics $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmagent/Makefile b/app/vmagent/Makefile index e96a9c221c..9ef12e2c20 100644 --- a/app/vmagent/Makefile +++ b/app/vmagent/Makefile @@ -27,6 +27,9 @@ vmagent-linux-ppc64le-prod: vmagent-linux-386-prod: APP_NAME=vmagent $(MAKE) app-via-docker-linux-386 +vmagent-linux-s390x-prod: + APP_NAME=vmagent $(MAKE) app-via-docker-linux-s390x + vmagent-darwin-amd64-prod: APP_NAME=vmagent $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmalert-tool/Makefile b/app/vmalert-tool/Makefile index d2a5e32b0e..6ed44bc1ca 100644 --- a/app/vmalert-tool/Makefile +++ b/app/vmalert-tool/Makefile @@ -27,6 +27,9 @@ vmalert-tool-linux-ppc64le-prod: vmalert-tool-linux-386-prod: APP_NAME=vmalert-tool $(MAKE) app-via-docker-linux-386 +vmalert-tool-linux-s390x-prod: + APP_NAME=vmalert-tool $(MAKE) app-via-docker-linux-s390x + vmalert-tool-darwin-amd64-prod: APP_NAME=vmalert-tool $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmalert/Makefile b/app/vmalert/Makefile index 93db11c04a..91ec0c70f9 100644 --- a/app/vmalert/Makefile +++ b/app/vmalert/Makefile @@ -27,6 +27,9 @@ vmalert-linux-ppc64le-prod: vmalert-linux-386-prod: APP_NAME=vmalert $(MAKE) app-via-docker-linux-386 +vmalert-linux-s390x-prod: + APP_NAME=vmalert $(MAKE) app-via-docker-linux-s390x + vmalert-darwin-amd64-prod: APP_NAME=vmalert $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmauth/Makefile b/app/vmauth/Makefile index b3420a11cd..7d319264a4 100644 --- a/app/vmauth/Makefile +++ b/app/vmauth/Makefile @@ -27,6 +27,9 @@ vmauth-linux-ppc64le-prod: vmauth-linux-386-prod: APP_NAME=vmauth $(MAKE) app-via-docker-linux-386 +vmauth-linux-s390x-prod: + APP_NAME=vmauth $(MAKE) app-via-docker-linux-s390x + vmauth-darwin-amd64-prod: APP_NAME=vmauth $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmbackup/Makefile b/app/vmbackup/Makefile index b292e44c09..011a48b4b2 100644 --- a/app/vmbackup/Makefile +++ b/app/vmbackup/Makefile @@ -31,6 +31,9 @@ vmbackup-linux-ppc64le-prod: vmbackup-linux-386-prod: APP_NAME=vmbackup EXTRA_GO_BUILD_TAGS=$(VMBACKUP_GO_BUILD_TAGS) $(MAKE) app-via-docker-linux-386 +vmbackup-linux-s390x-prod: + APP_NAME=vmbackup EXTRA_GO_BUILD_TAGS=$(VMBACKUP_GO_BUILD_TAGS) $(MAKE) app-via-docker-linux-s390x + vmbackup-darwin-amd64-prod: APP_NAME=vmbackup EXTRA_GO_BUILD_TAGS=$(VMBACKUP_GO_BUILD_TAGS) $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmctl/Makefile b/app/vmctl/Makefile index 589e405239..216ea502fc 100644 --- a/app/vmctl/Makefile +++ b/app/vmctl/Makefile @@ -27,6 +27,9 @@ vmctl-linux-ppc64le-prod: vmctl-linux-386-prod: APP_NAME=vmctl $(MAKE) app-via-docker-linux-386 +vmctl-linux-s390x-prod: + APP_NAME=vmctl $(MAKE) app-via-docker-linux-s390x + vmctl-darwin-amd64-prod: APP_NAME=vmctl $(MAKE) app-via-docker-darwin-amd64 diff --git a/app/vmrestore/Makefile b/app/vmrestore/Makefile index ac73948714..000cd2178b 100644 --- a/app/vmrestore/Makefile +++ b/app/vmrestore/Makefile @@ -31,6 +31,9 @@ vmrestore-linux-ppc64le-prod: vmrestore-linux-386-prod: APP_NAME=vmrestore EXTRA_GO_BUILD_TAGS=$(VMRESTORE_GO_BUILD_TAGS) $(MAKE) app-via-docker-linux-386 +vmrestore-linux-s390x-prod: + APP_NAME=vmrestore EXTRA_GO_BUILD_TAGS=$(VMRESTORE_GO_BUILD_TAGS) $(MAKE) app-via-docker-linux-s390x + vmrestore-darwin-amd64-prod: APP_NAME=vmrestore EXTRA_GO_BUILD_TAGS=$(VMRESTORE_GO_BUILD_TAGS) $(MAKE) app-via-docker-darwin-amd64 diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 3a2f1cf41e..6300f91748 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -176,6 +176,9 @@ app-via-docker-linux-ppc64le: app-via-docker-linux-386: CGO_ENABLED=0 GOOS=linux GOARCH=386 $(MAKE) app-via-docker-goos-goarch +app-via-docker-linux-s390x: + CGO_ENABLED=0 GOOS=linux GOARCH=s390x $(MAKE) app-via-docker-goos-goarch + app-via-docker-darwin-amd64: CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(MAKE) app-via-docker-goos-goarch diff --git a/docs/victoriametrics/BestPractices.md b/docs/victoriametrics/BestPractices.md index 266e79ee00..f8a67cb43f 100644 --- a/docs/victoriametrics/BestPractices.md +++ b/docs/victoriametrics/BestPractices.md @@ -45,7 +45,7 @@ VictoriaMetrics can also run on macOS for testing and development purposes. ## Supported Architectures -* **Linux**: i386, amd64, arm, arm64, ppc64le +* **Linux**: i386, amd64, arm, arm64, ppc64le, s390x * **FreeBSD**: i386, amd64, arm * **OpenBSD**: i386, amd64, arm * **Solaris/SmartOS**: i386, amd64 diff --git a/docs/victoriametrics/changelog/CHANGELOG.md b/docs/victoriametrics/changelog/CHANGELOG.md index 492d08f245..5ad1887066 100644 --- a/docs/victoriametrics/changelog/CHANGELOG.md +++ b/docs/victoriametrics/changelog/CHANGELOG.md @@ -39,6 +39,7 @@ See also [LTS releases](https://docs.victoriametrics.com/victoriametrics/lts-rel * FEATURE: [VictoriaMetrics enterprise](https://docs.victoriametrics.com/victoriametrics/enterprise/): slow query statistics logging is now enabled by default with `-search.logSlowQueryStats=5s`. This makes it easier to analyze query performance via the [Query Stats dashboard](https://grafana.sandbox.victoriametrics.com/d/feg3od1zt1fy8e/query-stats). See [Query execution stats](https://docs.victoriametrics.com/victoriametrics/enterprise/#query-execution-stats) for more details. * FEATURE: [vmauth](https://docs.victoriametrics.com/victoriametrics/vmauth/): make the load distribution more even among the backends which execute queries with various durations. See [#9712](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9712). * FEATURE: [dashboards/all](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/dashboards): enable column filters in `Non-default flags` panel. See [#9910](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9910). Thanks to @SamarthBagga for enhancement! +* FEATURE: add linux/s390x artifact to releases. See [#9697](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9697) for the details. * BUGFIX: [vmbackup](https://docs.victoriametrics.com/victoriametrics/vmbackup/), [vmrestore](https://docs.victoriametrics.com/victoriametrics/vmrestore/), [vmbackupmanager](https://docs.victoriametrics.com/victoriametrics/vmbackupmanager/): complete a fix of environment variables configuration parsing for connection to AWS S3. Previously, such settings were ignored starting from [v1.115.0](https://docs.victoriametrics.com/victoriametrics/changelog/#v11150) and releases [v1.128.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.128.0), [v1.122.6](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.122.6) and [v1.110.21](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.110.21) did not fix an issue completely. See this issue [#9858](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9858) for details. * BUGFIX: [vmalert](https://docs.victoriametrics.com/victoriametrics/vmalert/): fix search over group names and other attributes in vmalert's WEB UI. This functionality was broken since [v1.117.0](https://docs.victoriametrics.com/CHANGELOG.html#v11170). See [#9886](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/9886) for details.