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

Merge branch 'release/v0.7.2' into develop

Browse Source
This commit is contained in:
Ankit Nayan 2022-03-23 12:41:13 +05:30
commit 44d3f35a5f
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -69,8 +69,9 @@ build-push-query-service:
@echo "--> Building and pushing query-service docker image" @echo "--> Building and pushing query-service docker image"
@echo "------------------" @echo "------------------"
@cd $(QUERY_SERVICE_DIRECTORY) && \ @cd $(QUERY_SERVICE_DIRECTORY) && \
docker buildx build --file Dockerfile --progress plane --no-cache --push --platform linux/arm64,linux/amd64 docker buildx build --file Dockerfile --progress plane --no-cache \
--build-arg LD_FLAGS=$(LD_FLAGS) --tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) . --push --platform linux/arm64,linux/amd64 --build-arg LD_FLAGS=$(LD_FLAGS) \
--tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) .
# Steps to build and push docker image of flattener # Steps to build and push docker image of flattener
.PHONY: build-flattener-amd64 build-push-flattener .PHONY: build-flattener-amd64 build-push-flattener
@ -89,7 +90,8 @@ build-push-flattener:
@echo "--> Building and pushing flattener docker image" @echo "--> Building and pushing flattener docker image"
@echo "------------------" @echo "------------------"
@cd $(FLATTENER_DIRECTORY) && \ @cd $(FLATTENER_DIRECTORY) && \
docker buildx build --file Dockerfile --progress plane --no-cache --push --platform linux/arm64,linux/amd64 docker buildx build --file Dockerfile --progress plane \
--no-cache --push --platform linux/arm64,linux/amd64 \
--tag $(REPONAME)/$(FLATTERNER_DOCKER_IMAGE):$(DOCKER_TAG) . --tag $(REPONAME)/$(FLATTERNER_DOCKER_IMAGE):$(DOCKER_TAG) .
dev-setup: dev-setup:

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

@ -29,7 +29,7 @@ services:
condition: on-failure condition: on-failure
query-service: query-service:
image: signoz/query-service:0.7.1 image: signoz/query-service:0.7.2
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
ports: ports:
- "8080:8080" - "8080:8080"
@ -51,7 +51,7 @@ services:
- clickhouse - clickhouse
frontend: frontend:
image: signoz/frontend:0.7.1 image: signoz/frontend:0.7.2
depends_on: depends_on:
- query-service - query-service
ports: ports:

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

@ -24,7 +24,7 @@ services:
- '--storage.path=/data' - '--storage.path=/data'
query-service: query-service:
image: signoz/query-service:0.7.1 image: signoz/query-service:0.7.2
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
volumes: volumes:
@ -44,7 +44,7 @@ services:
condition: service_healthy condition: service_healthy
frontend: frontend:
image: signoz/frontend:0.7.1 image: signoz/frontend:0.7.2
container_name: frontend container_name: frontend
depends_on: depends_on:
- query-service - query-service

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

@ -27,7 +27,7 @@ services:
query-service: query-service:
image: signoz/query-service:0.7.1 image: signoz/query-service:0.7.2
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
volumes: volumes:
@ -47,7 +47,7 @@ services:
condition: service_healthy condition: service_healthy
frontend: frontend:
image: signoz/frontend:0.7.1 image: signoz/frontend:0.7.2
container_name: frontend container_name: frontend
depends_on: depends_on:
- query-service - query-service

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

@ -23,13 +23,15 @@ services:
- '--storage.path=/data' - '--storage.path=/data'
query-service: query-service:
image: signoz/query-service:0.7.1 image: signoz/query-service:latest
container_name: query-service 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/signoz/:/var/lib/signoz/ - ./data/signoz/:/var/lib/signoz/
ports:
- "8180:8080"
environment: environment:
- ClickHouseUrl=tcp://clickhouse:9000 - ClickHouseUrl=tcp://clickhouse:9000
- STORAGE=clickhouse - STORAGE=clickhouse
@ -39,16 +41,6 @@ services:
clickhouse: clickhouse:
condition: service_healthy condition: service_healthy
frontend:
image: signoz/frontend:0.7.1
container_name: frontend
depends_on:
- query-service
ports:
- "3301:3301"
volumes:
- ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector: otel-collector:
image: signoz/otelcontribcol:0.43.0 image: signoz/otelcontribcol:0.43.0
command: ["--config=/etc/otel-collector-config.yaml"] command: ["--config=/etc/otel-collector-config.yaml"]