From f7cb850f8dc09d288913465a04ba8aab70608972 Mon Sep 17 00:00:00 2001 From: Yurii Kravets <30324382+YuriKravetc@users.noreply.github.com> Date: Fri, 22 Oct 2021 19:26:02 +0300 Subject: [PATCH] Updated docker-compose.yml (#1730) * Updated docker-compose.yml Added one more Vmstorage to compose and pointed vmselect and vminsert to it. * Update prometheus.yml According to requested changes for new vmstorage * Update docker-compose Added port mapping * Updated docker-compose Set same ports for both storages * Update prometheus.yml Changed target for vmstorage1 * Updated docker compose Changed the flags for vmstorage1 * Update docker compose Changed flags for vmisert and vmselect to point to vmstorage1 * Update docker compose Made the vmstorage names uniform * Update prometheus.ymk * Update docker-compose.yml Removed additional flags as they are using default values. * Update prometheus.yml Put vmstorage targets under the same job * Update prometheus.yml Changed targets format * Update docker-compose.yml Set two different volumes for every vmstorage node * Update deployment/docker/prometheus.yml * Apply suggestions from code review Co-authored-by: Aliaksandr Valialkin --- deployment/docker/docker-compose.yml | 35 ++++++++++++++++++++-------- deployment/docker/prometheus.yml | 2 +- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 7e71458ff2..c45a9ddcbb 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -30,37 +30,51 @@ services: - ./../../dashboards/vmagent.json:/var/lib/grafana/dashboards/vmagent.json - ./../../dashboards/vmalert.json:/var/lib/grafana/dashboards/vmalert.json - vmstorage: - container_name: vmstorage + vmstorage-1: + container_name: vmstorage-1 image: victoriametrics/vmstorage ports: - 8482 - 8400 - 8401 volumes: - - strgdata:/storage + - strgdata-1:/storage + command: + - '--storageDataPath=/storage' + restart: always + vmstorage-2: + container_name: vmstorage-2 + image: victoriametrics/vmstorage + ports: + - 8482 + - 8400 + - 8401 + volumes: + - strgdata-2:/storage command: - '--storageDataPath=/storage' restart: always - vminsert: container_name: vminsert image: victoriametrics/vminsert depends_on: - - "vmstorage" + - "vmstorage-1" + - "vmstorage-2" command: - - '--storageNode=vmstorage:8400' + - '--storageNode=vmstorage-1:8400' + - '--storageNode=vmstorage-2:8400' ports: - 8480 restart: always - vmselect: container_name: vmselect image: victoriametrics/vmselect depends_on: - - "vmstorage" + - "vmstorage-1" + - "vmstorage-2" command: - - '--storageNode=vmstorage:8401' + - '--storageNode=vmstorage-1:8401' + - '--storageNode=vmstorage-2:8401' ports: - 8481:8481 restart: always @@ -99,5 +113,6 @@ services: volumes: vmagentdata: {} - strgdata: {} + strgdata-1: {} + strgdata-2: {} grafanadata: {} diff --git a/deployment/docker/prometheus.yml b/deployment/docker/prometheus.yml index 966da54d67..e2e79aa51b 100644 --- a/deployment/docker/prometheus.yml +++ b/deployment/docker/prometheus.yml @@ -17,4 +17,4 @@ scrape_configs: - targets: ['vmselect:8481'] - job_name: 'vmstorage' static_configs: - - targets: ['vmstorage:8482'] + - targets: ['vmstorage-1:8482', 'vmstorage-2:8482']