From b5d18c0d281b5bcd4dc13cc72d897c38fd4bb374 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 6 Apr 2023 17:08:28 -0700 Subject: [PATCH 1/4] app/vmctl/terminal: fix builds for GOOS=freebsd and GOOS=openbsd This is a follow-up for 8da9502df6bd011ee8bf55c5e22abc9f70d87917 --- app/vmctl/terminal/unix_bsd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/vmctl/terminal/unix_bsd.go b/app/vmctl/terminal/unix_bsd.go index 6e5ebae0e..d46146ca8 100644 --- a/app/vmctl/terminal/unix_bsd.go +++ b/app/vmctl/terminal/unix_bsd.go @@ -1,5 +1,5 @@ -//go:build darwin -// +build darwin +//go:build darwin || freebsd || openbsd +// +build darwin freebsd openbsd package terminal From 05d44525b7999c9b417cbd16c635962d663ca703 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 6 Apr 2023 19:04:13 -0700 Subject: [PATCH 2/4] docs/CHANGELOG.md: formatting fix --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 91e700ea7..8e4b2b392 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -58,7 +58,7 @@ created by v1.90.0 or newer versions. The solution is to upgrade to v1.90.0 or n * BUGFIX: prevent unexpected merges on start-up when `-storage.minFreeDiskSpaceBytes` is set. See [the issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4023). * BUGFIX: properly support comma-separated filters inside [retention filters](https://docs.victoriametrics.com/#retention-filters). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3915). * BUGFIX: verify response code when fetching configuration files via HTTP. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4034). -* BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): replace empty labels with "" instead of "" during templating, as Prometheus does. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4012). +* BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): replace empty labels with `""` instead of `""` during templating, as Prometheus does. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4012). * BUGFIX: [vmctl](https://docs.victoriametrics.com/vmctl.html): properly pass multiple filters from `--vm-native-filter-match` command-line flag to the data source. Previously filters from `--vm-native-filter-match` were only used to discover the metric names, and the metric names like `__name__="metric_name"` has been taken into account, while the remaining filters were ignored. For example `--vm-native-src-addr={foo="bar",baz="abc"}` may found `metric_name{foo="bar",baz="abc"}` and filter was treated as `--vm-native-src-addr={__name__="metrics_name"}`, e.g. `foo="bar",baz="abc"` filter was ignored. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4062). ## [v1.89.1](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.89.1) From 9586dabd948513168e61cf7dab16534306e0972b Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 6 Apr 2023 19:07:38 -0700 Subject: [PATCH 3/4] docs/guides: update VictoriaMetrics from v1.89.1 to v1.90.0 --- .../grafana-vmgateway-openid-configuration.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/guides/grafana-vmgateway-openid-configuration.md b/docs/guides/grafana-vmgateway-openid-configuration.md index 898a87b2a..a8f462643 100644 --- a/docs/guides/grafana-vmgateway-openid-configuration.md +++ b/docs/guides/grafana-vmgateway-openid-configuration.md @@ -229,27 +229,27 @@ services: - grafana_data:/var/lib/grafana/ vmsingle: - image: victoriametrics/victoria-metrics:v1.89.1 + image: victoriametrics/victoria-metrics:v1.90.0 command: - -httpListenAddr=0.0.0.0:8429 vmstorage: - image: victoriametrics/vmstorage:v1.89.1-cluster + image: victoriametrics/vmstorage:v1.90.0-cluster vminsert: - image: victoriametrics/vminsert:v1.89.1-cluster + image: victoriametrics/vminsert:v1.90.0-cluster command: - -storageNode=vmstorage:8400 - -httpListenAddr=0.0.0.0:8480 vmselect: - image: victoriametrics/vmselect:v1.89.1-cluster + image: victoriametrics/vmselect:v1.90.0-cluster command: - -storageNode=vmstorage:8401 - -httpListenAddr=0.0.0.0:8481 vmagent: - image: victoriametrics/vmagent:v1.89.1 + image: victoriametrics/vmagent:v1.90.0 volumes: - ./scrape.yaml:/etc/vmagent/config.yaml command: @@ -258,7 +258,7 @@ services: - -remoteWrite.url=http://vmsingle:8429/api/v1/write vmgateway-cluster: - image: victoriametrics/vmgateway:v1.89.1-enterprise + image: victoriametrics/vmgateway:v1.90.0-enterprise ports: - 8431:8431 command: @@ -271,7 +271,7 @@ services: - -auth.oidcDiscoveryEndpoints=http://keycloak:8080/realms/master/.well-known/openid-configuration vmgateway-single: - image: victoriametrics/vmgateway:v1.89.1-enterprise + image: victoriametrics/vmgateway:v1.90.0-enterprise ports: - 8432:8431 command: From 0e1e0b036a7ed927a4525e5fe4f6f851036d92af Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 6 Apr 2023 19:07:57 -0700 Subject: [PATCH 4/4] deployment: update VictoriaMetrics from v1.89.1 to v1.90.0 See https://docs.victoriametrics.com/CHANGELOG.html#v1900 --- deployment/docker/docker-compose-cluster.yml | 12 ++++++------ deployment/docker/docker-compose.yml | 6 +++--- .../digitialocean/one-click-droplet/RELEASE_GUIDE.md | 2 +- .../files/etc/update-motd.d/99-one-click | 4 ++-- deployment/marketplace/vultr/RELEASE_GUIDE.md | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deployment/docker/docker-compose-cluster.yml b/deployment/docker/docker-compose-cluster.yml index 210e70ec5..2834d6b5f 100644 --- a/deployment/docker/docker-compose-cluster.yml +++ b/deployment/docker/docker-compose-cluster.yml @@ -2,7 +2,7 @@ version: '3.5' services: vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.89.1 + image: victoriametrics/vmagent:v1.90.0 depends_on: - "vminsert" ports: @@ -32,7 +32,7 @@ services: vmstorage-1: container_name: vmstorage-1 - image: victoriametrics/vmstorage:v1.89.1-cluster + image: victoriametrics/vmstorage:v1.90.0-cluster ports: - 8482 - 8400 @@ -44,7 +44,7 @@ services: restart: always vmstorage-2: container_name: vmstorage-2 - image: victoriametrics/vmstorage:v1.89.1-cluster + image: victoriametrics/vmstorage:v1.90.0-cluster ports: - 8482 - 8400 @@ -56,7 +56,7 @@ services: restart: always vminsert: container_name: vminsert - image: victoriametrics/vminsert:v1.89.1-cluster + image: victoriametrics/vminsert:v1.90.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" @@ -68,7 +68,7 @@ services: restart: always vmselect: container_name: vmselect - image: victoriametrics/vmselect:v1.89.1-cluster + image: victoriametrics/vmselect:v1.90.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" @@ -82,7 +82,7 @@ services: vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.89.1 + image: victoriametrics/vmalert:v1.90.0 depends_on: - "vmselect" ports: diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 8b41723de..66f76e727 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.89.1 + image: victoriametrics/vmagent:v1.90.0 depends_on: - "victoriametrics" ports: @@ -18,7 +18,7 @@ services: restart: always victoriametrics: container_name: victoriametrics - image: victoriametrics/victoria-metrics:v1.89.1 + image: victoriametrics/victoria-metrics:v1.90.0 ports: - 8428:8428 - 8089:8089 @@ -56,7 +56,7 @@ services: restart: always vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.89.1 + image: victoriametrics/vmalert:v1.90.0 depends_on: - "victoriametrics" - "alertmanager" diff --git a/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md b/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md index d8753cdcc..63c8a3e5c 100644 --- a/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md +++ b/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md @@ -8,7 +8,7 @@ 4. Set variables `DIGITALOCEAN_API_TOKEN` with `VM_VERSION` for `packer` environment and run make from example below: ```console -make release-victoria-metrics-digitalocean-oneclick-droplet DIGITALOCEAN_API_TOKEN="dop_v23_2e46f4759ceeeba0d0248" VM_VERSION="1.89.1" +make release-victoria-metrics-digitalocean-oneclick-droplet DIGITALOCEAN_API_TOKEN="dop_v23_2e46f4759ceeeba0d0248" VM_VERSION="1.90.0" ``` diff --git a/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click b/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click index d695d5479..e376ddba8 100755 --- a/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click +++ b/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click @@ -19,8 +19,8 @@ On the server: * VictoriaMetrics is running on ports: 8428, 8089, 4242, 2003 and they are bound to the local interface. ******************************************************************************** - # This image includes 1.89.1 version of VictoriaMetrics. - # See Release notes https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.89.1 + # This image includes 1.90.0 version of VictoriaMetrics. + # See Release notes https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.90.0 # Welcome to VictoriaMetrics droplet! diff --git a/deployment/marketplace/vultr/RELEASE_GUIDE.md b/deployment/marketplace/vultr/RELEASE_GUIDE.md index ce29f3edb..44386c3e1 100644 --- a/deployment/marketplace/vultr/RELEASE_GUIDE.md +++ b/deployment/marketplace/vultr/RELEASE_GUIDE.md @@ -8,5 +8,5 @@ 4. Set variables `VULTR_API_KEY` with `VM_VERSION` for `packer` environment and run make from example below: ```console -make release-victoria-metrics-vultr-server VULTR_API_KEY="5FI5J9PZCCN1TAXPHI8UMDH5ZX8JIHJKTSLB" VM_VERSION="1.89.1" +make release-victoria-metrics-vultr-server VULTR_API_KEY="5FI5J9PZCCN1TAXPHI8UMDH5ZX8JIHJKTSLB" VM_VERSION="1.90.0" ```