From 3c66f9d2dd49923675e9372994dbd98db7e14afd Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 23 Mar 2022 01:04:31 +0530 Subject: [PATCH 1/4] =?UTF-8?q?chore(test-framework):=20=F0=9F=94=A7=20rem?= =?UTF-8?q?ove=20frontend=20service=20and=20use=20latest=20tag=20from=20ar?= =?UTF-8?q?m=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- .../tests/test-deploy/docker-compose.arm.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml index defed773e8..14c4c32057 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml @@ -23,7 +23,7 @@ services: - '--storage.path=/data' query-service: - image: signoz/query-service:0.7.1 + image: signoz/query-service:latest container_name: query-service command: ["-config=/root/config/prometheus.yml"] volumes: @@ -39,16 +39,6 @@ services: clickhouse: 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: image: signoz/otelcontribcol:0.43.0 command: ["--config=/etc/otel-collector-config.yaml"] From 18cfc40982d22adde680ac215eda0e7764891e75 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 23 Mar 2022 01:25:13 +0530 Subject: [PATCH 2/4] =?UTF-8?q?chore(Makefile):=20=F0=9F=94=A7=20include?= =?UTF-8?q?=20missed=20slash=20and=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 40f697ae09..bf2b038992 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,9 @@ build-push-query-service: @echo "--> Building and pushing query-service docker image" @echo "------------------" @cd $(QUERY_SERVICE_DIRECTORY) && \ - docker buildx build --file Dockerfile --progress plane --no-cache --push --platform linux/arm64,linux/amd64 - --build-arg LD_FLAGS=$(LD_FLAGS) --tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) . + docker buildx build --file Dockerfile --progress plane --no-cache \ + --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 .PHONY: build-flattener-amd64 build-push-flattener @@ -89,7 +90,8 @@ build-push-flattener: @echo "--> Building and pushing flattener docker image" @echo "------------------" @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) . dev-setup: From 8c56d049885eefa362565747e1492f3072297e53 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 23 Mar 2022 10:31:35 +0530 Subject: [PATCH 3/4] =?UTF-8?q?chore(test-framework):=20=F0=9F=94=A7=20exp?= =?UTF-8?q?ose=20query=20service=20port?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/query-service/tests/test-deploy/docker-compose.arm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml index 14c4c32057..d231ab656b 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml @@ -30,6 +30,8 @@ services: - ./prometheus.yml:/root/config/prometheus.yml - ../dashboards:/root/config/dashboards - ./data/signoz/:/var/lib/signoz/ + ports: + - "8180:8080" environment: - ClickHouseUrl=tcp://clickhouse:9000 - STORAGE=clickhouse From 565dfd5b5236b69022c6bc06ace292e91d769463 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Wed, 23 Mar 2022 12:06:14 +0530 Subject: [PATCH 4/4] =?UTF-8?q?chore(release):=20=F0=9F=93=8C=20pin=200.7.?= =?UTF-8?q?2=20SigNoz=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.arm.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index f00a6d3ca0..18e11f17f4 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -29,7 +29,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.7.1 + image: signoz/query-service:0.7.2 command: ["-config=/root/config/prometheus.yml"] ports: - "8080:8080" @@ -51,7 +51,7 @@ services: - clickhouse frontend: - image: signoz/frontend:0.7.1 + image: signoz/frontend:0.7.2 depends_on: - query-service ports: diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml index c6616a10bb..eeca2a87c2 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml @@ -24,7 +24,7 @@ services: - '--storage.path=/data' query-service: - image: signoz/query-service:0.7.1 + image: signoz/query-service:0.7.2 container_name: query-service command: ["-config=/root/config/prometheus.yml"] volumes: @@ -44,7 +44,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.7.1 + image: signoz/frontend:0.7.2 container_name: frontend depends_on: - query-service diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 94f579bc84..b360cfe715 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -27,7 +27,7 @@ services: query-service: - image: signoz/query-service:0.7.1 + image: signoz/query-service:0.7.2 container_name: query-service command: ["-config=/root/config/prometheus.yml"] volumes: @@ -47,7 +47,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.7.1 + image: signoz/frontend:0.7.2 container_name: frontend depends_on: - query-service