GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-14 03:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Ankit Nayan 2023-09-04 12:26:12 +05:30
commit 59549c36de
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
View File

@ -131,7 +131,7 @@ services:
# - ./data/clickhouse-3/:/var/lib/clickhouse/ # - ./data/clickhouse-3/:/var/lib/clickhouse/
alertmanager: alertmanager:
image: signoz/alertmanager:0.23.2 image: signoz/alertmanager:0.23.3
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
command: command:
@ -144,7 +144,7 @@ services:
condition: on-failure condition: on-failure
query-service: query-service:
image: signoz/query-service:0.27.0 image: signoz/query-service:0.28.0
command: [ "-config=/root/config/prometheus.yml" ] command: [ "-config=/root/config/prometheus.yml" ]
# ports: # ports:
# - "6060:6060" # pprof port # - "6060:6060" # pprof port
@ -180,7 +180,7 @@ services:
<<: *clickhouse-depend <<: *clickhouse-depend
frontend: frontend:
image: signoz/frontend:0.27.0 image: signoz/frontend:0.28.0
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

2
deploy/docker/clickhouse-setup/docker-compose-core.yaml
View File

@ -34,7 +34,7 @@ services:
alertmanager: alertmanager:
container_name: signoz-alertmanager container_name: signoz-alertmanager
image: signoz/alertmanager:0.23.2 image: signoz/alertmanager:0.23.3
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
depends_on: depends_on:

6
deploy/docker/clickhouse-setup/docker-compose.yaml
View File

@ -147,7 +147,7 @@ services:
# - ./user_scripts:/var/lib/clickhouse/user_scripts/ # - ./user_scripts:/var/lib/clickhouse/user_scripts/
alertmanager: alertmanager:
image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.2} image: signoz/alertmanager:${ALERTMANAGER_TAG:-0.23.3}
container_name: signoz-alertmanager container_name: signoz-alertmanager
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
@ -162,7 +162,7 @@ services:
# Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
query-service: query-service:
image: signoz/query-service:${DOCKER_TAG:-0.27.0} image: signoz/query-service:${DOCKER_TAG:-0.28.0}
container_name: signoz-query-service container_name: signoz-query-service
command: [ "-config=/root/config/prometheus.yml" ] command: [ "-config=/root/config/prometheus.yml" ]
# ports: # ports:
@ -197,7 +197,7 @@ services:
<<: *clickhouse-depend <<: *clickhouse-depend
frontend: frontend:
image: signoz/frontend:${DOCKER_TAG:-0.27.0} image: signoz/frontend:${DOCKER_TAG:-0.28.0}
container_name: signoz-frontend container_name: signoz-frontend
restart: on-failure restart: on-failure
depends_on: depends_on:

2
pkg/query-service/README.md
View File

@ -13,7 +13,7 @@ https://github.com/SigNoz/signoz/blob/main/CONTRIBUTING.md#to-run-clickhouse-set
- Change the alertmanager section in `signoz/deploy/docker/clickhouse-setup/docker-compose.yaml` as follows: - Change the alertmanager section in `signoz/deploy/docker/clickhouse-setup/docker-compose.yaml` as follows:
```console ```console
alertmanager: alertmanager:
image: signoz/alertmanager:0.23.2 image: signoz/alertmanager:0.23.3
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data
expose: expose:

2
pkg/query-service/tests/test-deploy/docker-compose.yaml
View File

@ -136,7 +136,7 @@ services:
# - ./data/clickhouse-3/:/var/lib/clickhouse/ # - ./data/clickhouse-3/:/var/lib/clickhouse/
alertmanager: alertmanager:
image: signoz/alertmanager:0.23.2 image: signoz/alertmanager:0.23.3
container_name: signoz-alertmanager container_name: signoz-alertmanager
volumes: volumes:
- ./data/alertmanager:/data - ./data/alertmanager:/data