From 2a56f79e1d887a0e0ffb989a262d8c39a49df49d Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 28 Feb 2025 10:40:20 +0545 Subject: [PATCH] chore: update restart policy of Docker containers (#7190) ### Summary - update the restart policy of Docker containers --------- Signed-off-by: Prashant Shahi --- deploy/docker-swarm/docker-compose.ha.yaml | 3 +++ deploy/docker-swarm/docker-compose.yaml | 3 +++ deploy/docker/docker-compose.ha.yaml | 4 +++- deploy/docker/docker-compose.testing.yaml | 5 ++++- deploy/docker/docker-compose.yaml | 5 ++++- deploy/docker/generator/hotrod/docker-compose.yaml | 2 +- deploy/docker/generator/infra/docker-compose.yaml | 2 +- pkg/query-service/README.md | 2 +- 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/deploy/docker-swarm/docker-compose.ha.yaml b/deploy/docker-swarm/docker-compose.ha.yaml index 2ec717a381..b98c0d7f93 100644 --- a/deploy/docker-swarm/docker-compose.ha.yaml +++ b/deploy/docker-swarm/docker-compose.ha.yaml @@ -76,6 +76,9 @@ services: wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F$${version}/histogram-quantile_$${node_os}_$${node_arch}.tar.gz" tar -xvzf histogram-quantile.tar.gz mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile + deploy: + restart_policy: + condition: on-failure volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: diff --git a/deploy/docker-swarm/docker-compose.yaml b/deploy/docker-swarm/docker-compose.yaml index eecebcc3dd..9ab1ebe7dc 100644 --- a/deploy/docker-swarm/docker-compose.yaml +++ b/deploy/docker-swarm/docker-compose.yaml @@ -73,6 +73,9 @@ services: wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F$${version}/histogram-quantile_$${node_os}_$${node_arch}.tar.gz" tar -xvzf histogram-quantile.tar.gz mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile + deploy: + restart_policy: + condition: on-failure volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: diff --git a/deploy/docker/docker-compose.ha.yaml b/deploy/docker/docker-compose.ha.yaml index 1310f21cab..227f741a9d 100644 --- a/deploy/docker/docker-compose.ha.yaml +++ b/deploy/docker/docker-compose.ha.yaml @@ -2,7 +2,7 @@ version: "3" x-common: &common networks: - signoz-net - restart: on-failure + restart: unless-stopped logging: options: max-size: 50m @@ -79,6 +79,7 @@ services: wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F$${version}/histogram-quantile_$${node_os}_$${node_arch}.tar.gz" tar -xvzf histogram-quantile.tar.gz mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile + restart: on-failure volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: @@ -277,6 +278,7 @@ services: - async - --dsn=tcp://clickhouse:9000 - --up= + restart: on-failure networks: signoz-net: name: signoz-net diff --git a/deploy/docker/docker-compose.testing.yaml b/deploy/docker/docker-compose.testing.yaml index 93a6fef2dd..8610dde5ed 100644 --- a/deploy/docker/docker-compose.testing.yaml +++ b/deploy/docker/docker-compose.testing.yaml @@ -2,7 +2,7 @@ version: "3" x-common: &common networks: - signoz-net - restart: on-failure + restart: unless-stopped logging: options: max-size: 50m @@ -75,6 +75,7 @@ services: wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F$${version}/histogram-quantile_$${node_os}_$${node_arch}.tar.gz" tar -xvzf histogram-quantile.tar.gz mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile + restart: on-failure volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: @@ -199,6 +200,7 @@ services: depends_on: clickhouse: condition: service_healthy + restart: on-failure schema-migrator-async: !!merge <<: *db-depend image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.29} @@ -207,6 +209,7 @@ services: - async - --dsn=tcp://clickhouse:9000 - --up= + restart: on-failure networks: signoz-net: name: signoz-net diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index 5daf49d1ab..a897837588 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3" x-common: &common networks: - signoz-net - restart: on-failure + restart: unless-stopped logging: options: max-size: 50m @@ -75,6 +75,7 @@ services: wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F$${version}/histogram-quantile_$${node_os}_$${node_arch}.tar.gz" tar -xvzf histogram-quantile.tar.gz mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile + restart: on-failure volumes: - ../common/clickhouse/user_scripts:/var/lib/clickhouse/user_scripts/ zookeeper-1: @@ -197,6 +198,7 @@ services: depends_on: clickhouse: condition: service_healthy + restart: on-failure schema-migrator-async: !!merge <<: *db-depend image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.111.29} @@ -205,6 +207,7 @@ services: - async - --dsn=tcp://clickhouse:9000 - --up= + restart: on-failure networks: signoz-net: name: signoz-net diff --git a/deploy/docker/generator/hotrod/docker-compose.yaml b/deploy/docker/generator/hotrod/docker-compose.yaml index 287d17765d..ac31142551 100644 --- a/deploy/docker/generator/hotrod/docker-compose.yaml +++ b/deploy/docker/generator/hotrod/docker-compose.yaml @@ -8,7 +8,7 @@ x-common: &common options: max-size: 50m max-file: "3" - restart: on-failure + restart: unless-stopped services: hotrod: <<: *common diff --git a/deploy/docker/generator/infra/docker-compose.yaml b/deploy/docker/generator/infra/docker-compose.yaml index 95c1cbd8cb..27343a5bce 100644 --- a/deploy/docker/generator/infra/docker-compose.yaml +++ b/deploy/docker/generator/infra/docker-compose.yaml @@ -8,7 +8,7 @@ x-common: &common options: max-size: 50m max-file: "3" - restart: on-failure + restart: unless-stopped services: otel-agent: <<: *common diff --git a/pkg/query-service/README.md b/pkg/query-service/README.md index 72d9fa2f62..9277400035 100644 --- a/pkg/query-service/README.md +++ b/pkg/query-service/README.md @@ -23,7 +23,7 @@ alertmanager: # depends_on: # query-service: # condition: service_healthy - restart: on-failure + restart: unless-stopped command: - --queryService.url=http://172.17.0.1:8085 - --storage.path=/data