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

chore(release): 📌 pin 0.7.4 SigNoz version and deployment changes

Browse Source 
Signed-off-by: Prashant Shahi <prashant@signoz.io>
This commit is contained in:
Prashant Shahi 2022-03-29 22:59:32 +05:30
parent 3dc94c8da7
commit 1002ab553e
No known key found for this signature in database
GPG Key ID: 6E62ED14180EB2C0
5 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,19 +17,20 @@ services:
retries: 3 retries: 3
alertmanager: alertmanager:
image: signoz/alertmanager:0.5.0 image: signoz/alertmanager:0.6.0
volumes: volumes:
- ./alertmanager.yml:/prometheus/alertmanager.yml
- ./data/alertmanager:/data - ./data/alertmanager:/data
command: command:
- '--config.file=/prometheus/alertmanager.yml' - --queryService.url=http://query-service:8080
- '--storage.path=/data' - --storage.path=/data
depends_on:
- query-service
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
query-service: query-service:
image: signoz/query-service:0.7.3 image: signoz/query-service:0.7.4
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
ports: ports:
- "8080:8080" - "8080:8080"
@ -48,10 +49,10 @@ services:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
depends_on: depends_on:
- clickhouse - clickhouse
frontend: frontend:
image: signoz/frontend:0.7.3 image: signoz/frontend:0.7.4
depends_on: depends_on:
- query-service - query-service
ports: ports:

17
deploy/docker/clickhouse-setup/docker-compose.arm.yaml
View File

@ -15,16 +15,17 @@ services:
retries: 3 retries: 3
alertmanager: alertmanager:
image: signoz/alertmanager:0.5.0 image: signoz/alertmanager:0.6.0
volumes: volumes:
- ./alertmanager.yml:/prometheus/alertmanager.yml
- ./data/alertmanager:/data - ./data/alertmanager:/data
depends_on:
- query-service
command: command:
- '--config.file=/prometheus/alertmanager.yml' - --queryService.url=http://query-service:8080
- '--storage.path=/data' - --storage.path=/data
query-service: query-service:
image: signoz/query-service:0.7.3 image: signoz/query-service:0.7.4
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
volumes: volumes:
@ -44,7 +45,7 @@ services:
condition: service_healthy condition: service_healthy
frontend: frontend:
image: signoz/frontend:0.7.3 image: signoz/frontend:0.7.4
container_name: frontend container_name: frontend
depends_on: depends_on:
- query-service - query-service
@ -66,7 +67,7 @@ services:
# - "14268:14268" # Jaeger receiver # - "14268:14268" # Jaeger receiver
# - "55678:55678" # OpenCensus receiver # - "55678:55678" # OpenCensus receiver
# - "55679:55679" # zpages extension # - "55679:55679" # zpages extension
# - "55680:55680" # OTLP gRPC legacy port # - "55680:55680" # OTLP gRPC legacy receiver
# - "55681:55681" # OTLP HTTP legacy receiver # - "55681:55681" # OTLP HTTP legacy receiver
mem_limit: 2000m mem_limit: 2000m
restart: on-failure restart: on-failure
@ -93,7 +94,7 @@ services:
max-file: "3" max-file: "3"
command: ["all"] command: ["all"]
environment: environment:
- JAEGER_ENDPOINT=http://otel-collector:14268/api/traces - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
load-hotrod: load-hotrod:
image: "grubykarol/locust:1.2.3-python3.9-alpine3.12" image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"

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

@ -17,20 +17,17 @@ services:
alertmanager: alertmanager:
image: signoz/alertmanager:0.6.0 image: signoz/alertmanager:0.6.0
volumes: volumes:
# we no longer need the config file as query services delivers
# the required config now
# - ./alertmanager.yml:/prometheus/alertmanager.yml
- ./data/alertmanager:/data - ./data/alertmanager:/data
depends_on: depends_on:
- query-service - query-service
command: command:
- '--queryService.url=http://query-service:8080' - --queryService.url=http://query-service:8080
- '--storage.path=/data' - --storage.path=/data
# 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:0.7.3 image: signoz/query-service:0.7.4
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
volumes: volumes:
@ -43,14 +40,13 @@ services:
- GODEBUG=netdns=go - GODEBUG=netdns=go
- TELEMETRY_ENABLED=true - TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-standalone-amd - DEPLOYMENT_TYPE=docker-standalone-amd
restart: on-failure restart: on-failure
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy
frontend: frontend:
image: signoz/frontend:0.7.3 image: signoz/frontend:0.7.4
container_name: frontend container_name: frontend
depends_on: depends_on:
- query-service - query-service
@ -72,7 +68,7 @@ services:
# - "14268:14268" # Jaeger receiver # - "14268:14268" # Jaeger receiver
# - "55678:55678" # OpenCensus receiver # - "55678:55678" # OpenCensus receiver
# - "55679:55679" # zpages extension # - "55679:55679" # zpages extension
# - "55680:55680" # OTLP gRPC legacy port # - "55680:55680" # OTLP gRPC legacy receiver
# - "55681:55681" # OTLP HTTP legacy receiver # - "55681:55681" # OTLP HTTP legacy receiver
mem_limit: 2000m mem_limit: 2000m
restart: on-failure restart: on-failure

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

@ -5,7 +5,6 @@ services:
image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm
volumes: volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- ./data/clickhouse/:/var/lib/clickhouse/
healthcheck: healthcheck:
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'" # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"] test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@ -14,13 +13,12 @@ services:
retries: 3 retries: 3
alertmanager: alertmanager:
image: signoz/alertmanager:0.5.0 image: signoz/alertmanager:0.6.0
volumes: depends_on:
- ./alertmanager.yml:/prometheus/alertmanager.yml - query-service
- ./data/alertmanager:/data
command: command:
- '--config.file=/prometheus/alertmanager.yml' - --queryService.url=http://query-service:8080
- '--storage.path=/data' - --storage.path=/data
query-service: query-service:
image: signoz/query-service:latest image: signoz/query-service:latest
@ -29,9 +27,9 @@ services:
volumes: volumes:
- ./prometheus.yml:/root/config/prometheus.yml - ./prometheus.yml:/root/config/prometheus.yml
- ../dashboards:/root/config/dashboards - ../dashboards:/root/config/dashboards
- ./data/signoz/:/var/lib/signoz/ - ./data:/var/lib/signoz
ports: ports:
- "8180:8080" - "8180:8080"
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000 - ClickHouseUrl=tcp://clickhouse:9000
- STORAGE=clickhouse - STORAGE=clickhouse
@ -72,7 +70,7 @@ services:
max-file: "3" max-file: "3"
command: ["all"] command: ["all"]
environment: environment:
- JAEGER_ENDPOINT=http://otel-collector:14268/api/traces - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
load-hotrod: load-hotrod:
image: "grubykarol/locust:1.2.3-python3.9-alpine3.12" image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
@ -87,4 +85,4 @@ services:
QUIET_MODE: "${QUIET_MODE:-false}" QUIET_MODE: "${QUIET_MODE:-false}"
LOCUST_OPTS: "--headless -u 10 -r 1" LOCUST_OPTS: "--headless -u 10 -r 1"
volumes: volumes:
- ../common/locust-scripts:/locust - ../../../../deploy/docker/common/locust-scripts:/locust

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

@ -13,22 +13,25 @@ services:
retries: 3 retries: 3
alertmanager: alertmanager:
image: signoz/alertmanager:0.5.0 image: signoz/alertmanager:0.6.0
volumes: depends_on:
- ./alertmanager.yml:/prometheus/alertmanager.yml - query-service
command: command:
- '--config.file=/prometheus/alertmanager.yml' - --queryService.url=http://query-service:8080
- '--storage.path=/data' - --storage.path=/data
# 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:latest image: signoz/query-service:latest
container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
volumes: volumes:
- ./prometheus.yml:/root/config/prometheus.yml - ./prometheus.yml:/root/config/prometheus.yml
- ../dashboards:/root/config/dashboards - ../dashboards:/root/config/dashboards
- ./data:/var/lib/signoz
ports:
- "8180:8080"
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000 - ClickHouseUrl=tcp://clickhouse:9000
- STORAGE=clickhouse - STORAGE=clickhouse
@ -37,13 +40,6 @@ services:
depends_on: depends_on:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy
ports:
- "8180:8080"
volumes:
- type: bind
source: ./data
target: /var/lib/signoz
read_only: false
otel-collector: otel-collector:
image: signoz/otelcontribcol:0.43.0 image: signoz/otelcontribcol:0.43.0