From 50487823ab89c9da58df40d279fa5f961f4ee78f Mon Sep 17 00:00:00 2001 From: f41gh7 Date: Mon, 21 Oct 2024 23:42:30 +0200 Subject: [PATCH] deployment: bump VM to v1.105.0 Signed-off-by: f41gh7 --- deployment/docker/docker-compose-cluster.yml | 56 +++++++++---------- .../docker/docker-compose-victorialogs.yml | 8 +-- deployment/docker/docker-compose.yml | 6 +- .../vmanomaly-integration/docker-compose.yml | 7 +-- deployment/logs-benchmark/docker-compose.yml | 18 +++--- 5 files changed, 47 insertions(+), 48 deletions(-) diff --git a/deployment/docker/docker-compose-cluster.yml b/deployment/docker/docker-compose-cluster.yml index 8828adcdb..088bb8681 100644 --- a/deployment/docker/docker-compose-cluster.yml +++ b/deployment/docker/docker-compose-cluster.yml @@ -4,7 +4,7 @@ services: # And forward them to --remoteWrite.url vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.104.0 + image: victoriametrics/vmagent:v1.105.0 depends_on: - "vminsert" ports: @@ -13,8 +13,8 @@ services: - vmagentdata:/vmagentdata - ./prometheus-cluster.yml:/etc/prometheus/prometheus.yml command: - - '--promscrape.config=/etc/prometheus/prometheus.yml' - - '--remoteWrite.url=http://vminsert:8480/insert/0/prometheus/' + - "--promscrape.config=/etc/prometheus/prometheus.yml" + - "--remoteWrite.url=http://vminsert:8480/insert/0/prometheus/" restart: always # Grafana instance configured with VictoriaMetrics as datasource @@ -39,7 +39,7 @@ services: # where N is number of vmstorages (2 in this case). vmstorage-1: container_name: vmstorage-1 - image: victoriametrics/vmstorage:v1.104.0-cluster + image: victoriametrics/vmstorage:v1.105.0-cluster ports: - 8482 - 8400 @@ -47,11 +47,11 @@ services: volumes: - strgdata-1:/storage command: - - '--storageDataPath=/storage' + - "--storageDataPath=/storage" restart: always vmstorage-2: container_name: vmstorage-2 - image: victoriametrics/vmstorage:v1.104.0-cluster + image: victoriametrics/vmstorage:v1.105.0-cluster ports: - 8482 - 8400 @@ -59,20 +59,20 @@ services: volumes: - strgdata-2:/storage command: - - '--storageDataPath=/storage' + - "--storageDataPath=/storage" restart: always # vminsert is ingestion frontend. It receives metrics pushed by vmagent, # pre-process them and distributes across configured vmstorage shards. vminsert: container_name: vminsert - image: victoriametrics/vminsert:v1.104.0-cluster + image: victoriametrics/vminsert:v1.105.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" command: - - '--storageNode=vmstorage-1:8400' - - '--storageNode=vmstorage-2:8400' + - "--storageNode=vmstorage-1:8400" + - "--storageNode=vmstorage-2:8400" ports: - 8480:8480 restart: always @@ -81,27 +81,27 @@ services: # vmselect collects results from configured `--storageNode` shards. vmselect-1: container_name: vmselect-1 - image: victoriametrics/vmselect:v1.104.0-cluster + image: victoriametrics/vmselect:v1.105.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" command: - - '--storageNode=vmstorage-1:8401' - - '--storageNode=vmstorage-2:8401' - - '--vmalert.proxyURL=http://vmalert:8880' + - "--storageNode=vmstorage-1:8401" + - "--storageNode=vmstorage-2:8401" + - "--vmalert.proxyURL=http://vmalert:8880" ports: - 8481 restart: always vmselect-2: container_name: vmselect-2 - image: victoriametrics/vmselect:v1.104.0-cluster + image: victoriametrics/vmselect:v1.105.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" command: - - '--storageNode=vmstorage-1:8401' - - '--storageNode=vmstorage-2:8401' - - '--vmalert.proxyURL=http://vmalert:8880' + - "--storageNode=vmstorage-1:8401" + - "--storageNode=vmstorage-2:8401" + - "--vmalert.proxyURL=http://vmalert:8880" ports: - 8481 restart: always @@ -112,14 +112,14 @@ services: # It can be used as an authentication proxy. vmauth: container_name: vmauth - image: victoriametrics/vmauth:v1.104.0 + image: victoriametrics/vmauth:v1.105.0 depends_on: - "vmselect-1" - "vmselect-2" volumes: - ./auth-cluster.yml:/etc/auth.yml command: - - '--auth.config=/etc/auth.yml' + - "--auth.config=/etc/auth.yml" ports: - 8427:8427 restart: always @@ -127,7 +127,7 @@ services: # vmalert executes alerting and recording rules vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.104.0 + image: victoriametrics/vmalert:v1.105.0 depends_on: - "vmauth" ports: @@ -138,13 +138,13 @@ services: - ./alerts-vmagent.yml:/etc/alerts/alerts-vmagent.yml - ./alerts-vmalert.yml:/etc/alerts/alerts-vmalert.yml command: - - '--datasource.url=http://vmauth:8427/select/0/prometheus' - - '--remoteRead.url=http://vmauth:8427/select/0/prometheus' - - '--remoteWrite.url=http://vminsert:8480/insert/0/prometheus' - - '--notifier.url=http://alertmanager:9093/' - - '--rule=/etc/alerts/*.yml' + - "--datasource.url=http://vmauth:8427/select/0/prometheus" + - "--remoteRead.url=http://vmauth:8427/select/0/prometheus" + - "--remoteWrite.url=http://vminsert:8480/insert/0/prometheus" + - "--notifier.url=http://alertmanager:9093/" + - "--rule=/etc/alerts/*.yml" # display source of alerts in grafana - - '-external.url=http://127.0.0.1:3000' #grafana outside container + - "-external.url=http://127.0.0.1:3000" #grafana outside container - '--external.alert.source=explore?orgId=1&left={"datasource":"VictoriaMetrics","queries":[{"expr":{{.Expr|jsonEscape|queryEscape}},"refId":"A"}],"range":{"from":"{{ .ActiveAt.UnixMilli }}","to":"now"}}' restart: always @@ -156,7 +156,7 @@ services: volumes: - ./alertmanager.yml:/config/alertmanager.yml command: - - '--config.file=/config/alertmanager.yml' + - "--config.file=/config/alertmanager.yml" ports: - 9093:9093 restart: always diff --git a/deployment/docker/docker-compose-victorialogs.yml b/deployment/docker/docker-compose-victorialogs.yml index 3e6ed02d5..b18c05718 100644 --- a/deployment/docker/docker-compose-victorialogs.yml +++ b/deployment/docker/docker-compose-victorialogs.yml @@ -36,8 +36,8 @@ services: networks: - vm_net -# VictoriaLogs instance, a single process responsible for -# storing logs and serving read queries. + # VictoriaLogs instance, a single process responsible for + # storing logs and serving read queries. victorialogs: container_name: victorialogs image: docker.io/victoriametrics/victoria-logs:v0.37.0-victorialogs @@ -55,7 +55,7 @@ services: # scraping, storing metrics and serve read requests. victoriametrics: container_name: victoriametrics - image: victoriametrics/victoria-metrics:v1.104.0 + image: victoriametrics/victoria-metrics:v1.105.0 ports: - 8428:8428 volumes: @@ -72,7 +72,7 @@ services: # vmalert executes alerting and recording rules vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.104.0 + image: victoriametrics/vmalert:v1.105.0 depends_on: - "victoriametrics" - "alertmanager" diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 1b9584191..341b3d321 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -4,7 +4,7 @@ services: # And forward them to --remoteWrite.url vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.104.0 + image: victoriametrics/vmagent:v1.105.0 depends_on: - "victoriametrics" ports: @@ -22,7 +22,7 @@ services: # storing metrics and serve read requests. victoriametrics: container_name: victoriametrics - image: victoriametrics/victoria-metrics:v1.104.0 + image: victoriametrics/victoria-metrics:v1.105.0 ports: - 8428:8428 - 8089:8089 @@ -65,7 +65,7 @@ services: # vmalert executes alerting and recording rules vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.104.0 + image: victoriametrics/vmalert:v1.105.0 depends_on: - "victoriametrics" - "alertmanager" diff --git a/deployment/docker/vmanomaly/vmanomaly-integration/docker-compose.yml b/deployment/docker/vmanomaly/vmanomaly-integration/docker-compose.yml index 75ffe1852..7e78cd604 100644 --- a/deployment/docker/vmanomaly/vmanomaly-integration/docker-compose.yml +++ b/deployment/docker/vmanomaly/vmanomaly-integration/docker-compose.yml @@ -1,7 +1,7 @@ services: vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.104.0 + image: victoriametrics/vmagent:v1.105.0 depends_on: - "victoriametrics" ports: @@ -18,7 +18,7 @@ services: victoriametrics: container_name: victoriametrics - image: victoriametrics/victoria-metrics:v1.104.0 + image: victoriametrics/victoria-metrics:v1.105.0 ports: - 8428:8428 volumes: @@ -48,10 +48,9 @@ services: - vm_net restart: always - vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.104.0 + image: victoriametrics/vmalert:v1.105.0 depends_on: - "victoriametrics" ports: diff --git a/deployment/logs-benchmark/docker-compose.yml b/deployment/logs-benchmark/docker-compose.yml index 4b5ce36f7..aabd0fcf1 100644 --- a/deployment/logs-benchmark/docker-compose.yml +++ b/deployment/logs-benchmark/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: # Run `make package-victoria-logs` to build victoria-logs image @@ -7,7 +7,7 @@ services: volumes: - vlogs:/vlogs ports: - - '9428:9428' + - "9428:9428" command: - -storageDataPath=/vlogs @@ -30,10 +30,10 @@ services: - /sys:/host/sys:ro - /:/rootfs:ro command: - - '--path.procfs=/host/proc' - - '--path.rootfs=/rootfs' - - '--path.sysfs=/host/sys' - - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)' + - "--path.procfs=/host/proc" + - "--path.rootfs=/rootfs" + - "--path.sysfs=/host/sys" + - "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)" du-exporter: image: ghcr.io/dundee/disk_usage_exporter/disk_usage_exporter-c4084307c537335c2ddb6f4b9b527422:latest @@ -43,12 +43,12 @@ services: - /var/lib/docker/volumes:/var/lib/docker/volumes:ro - ./du/config.yml:/config.yml:ro command: - - '--config=/config.yml' + - "--config=/config.yml" vmsingle: - image: victoriametrics/victoria-metrics:v1.104.0 + image: victoriametrics/victoria-metrics:v1.105.0 ports: - - '8428:8428' + - "8428:8428" command: - -storageDataPath=/vmsingle - -promscrape.config=/promscrape.yml