From 4f12f8c85cb5e7fb3843f8b55e032a47165b062e Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 14 Jun 2022 01:09:44 +0530 Subject: [PATCH 1/3] fix: incorrect 5xx rate calculation (#1229) --- pkg/query-service/app/clickhouseReader/reader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index a55977c35f..1258060c41 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -1188,7 +1188,7 @@ func (r *ClickHouseReader) GetServices(ctx context.Context, queryParams *model.G m4xx := make(map[string]uint64) for j := range service4xxItems { - m5xx[service4xxItems[j].ServiceName] = service4xxItems[j].Num4XX + m4xx[service4xxItems[j].ServiceName] = service4xxItems[j].Num4XX } for i := range serviceItems { From 24e84bac2a52f4e6a8c8c6768bf0473d92dfc109 Mon Sep 17 00:00:00 2001 From: Ankit Nayan Date: Tue, 14 Jun 2022 20:50:13 +0530 Subject: [PATCH 2/3] Create codeball.yml --- .github/workflows/codeball.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/codeball.yml diff --git a/.github/workflows/codeball.yml b/.github/workflows/codeball.yml new file mode 100644 index 0000000000..ed69d5c10e --- /dev/null +++ b/.github/workflows/codeball.yml @@ -0,0 +1,17 @@ +name: Codeball +on: [pull_request] + +jobs: + codeball_job: + runs-on: ubuntu-latest + name: Codeball + steps: + # Run Codeball on all new Pull Requests 🚀 + # For customizations and more documentation, see https://github.com/sturdy-dev/codeball-action + - name: Codeball + uses: sturdy-dev/codeball-action@v2 + with: + approvePullRequests: "true" + labelPullRequestsWhenApproved: "true" + labelPullRequestsWhenReviewNeeded: "false" + failJobsWhenReviewNeeded: "false" From 1f2ec0d728f360d945c84afc20a6125c6e4e3cad Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Tue, 14 Jun 2022 18:14:26 +0530 Subject: [PATCH 3/3] =?UTF-8?q?chore(release):=20=F0=9F=93=8C=20pin=20vers?= =?UTF-8?q?ions:=20SigNoz=200.8.2,=20OtelCollector=200.45.1-0.3?= 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 | 8 ++++---- deploy/docker/clickhouse-setup/docker-compose.arm.yaml | 8 ++++---- deploy/docker/clickhouse-setup/docker-compose.yaml | 8 ++++---- .../tests/test-deploy/docker-compose.arm.yaml | 4 ++-- pkg/query-service/tests/test-deploy/docker-compose.yaml | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 8806533caa..bc58e956b5 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -37,7 +37,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.8.1 + image: signoz/query-service:0.8.2 command: ["-config=/root/config/prometheus.yml"] # ports: # - "6060:6060" # pprof port @@ -65,7 +65,7 @@ services: - clickhouse frontend: - image: signoz/frontend:0.8.1 + image: signoz/frontend:0.8.2 deploy: restart_policy: condition: on-failure @@ -78,7 +78,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -104,7 +104,7 @@ services: - clickhouse otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml index e4197cfbc3..c30bf82064 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml @@ -37,7 +37,7 @@ services: query-service: - image: signoz/query-service:0.8.1 + image: signoz/query-service:0.8.2 container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -64,7 +64,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.8.1 + image: signoz/frontend:0.8.2 container_name: frontend restart: on-failure depends_on: @@ -76,7 +76,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -97,7 +97,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index e6d2de2f3c..44a0e25554 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -36,7 +36,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` query-service: - image: signoz/query-service:0.8.1 + image: signoz/query-service:0.8.2 container_name: query-service command: ["-config=/root/config/prometheus.yml"] # ports: @@ -63,7 +63,7 @@ services: condition: service_healthy frontend: - image: signoz/frontend:0.8.1 + image: signoz/frontend:0.8.2 container_name: frontend restart: on-failure depends_on: @@ -75,7 +75,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -96,7 +96,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml 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 387daed353..48a1449fe4 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml @@ -51,7 +51,7 @@ services: condition: service_healthy otel-collector: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -64,7 +64,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index 28bfb726af..4a3ad41870 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -56,7 +56,7 @@ services: condition: service_healthy otel-collector: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml @@ -69,7 +69,7 @@ services: condition: service_healthy otel-collector-metrics: - image: signoz/otelcontribcol:0.45.1-0.2 + image: signoz/otelcontribcol:0.45.1-0.3 command: ["--config=/etc/otel-collector-metrics-config.yaml"] volumes: - ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml