Merge branch 'develop' into dependabot/npm_and_yarn/frontend/axios-1.6.2

SigNoz · Apr 26, 2024 · 0323055 · 0323055
2 parents 6c6bf7d + 706f25c
commit 0323055
Show file tree

Hide file tree

Showing 137 changed files with 20,979 additions and 2,111 deletions.
diff --git a/.github/workflows/jest-coverage-changes.yml b/.github/workflows/jest-coverage-changes.yml
@@ -0,0 +1,31 @@
+name: Jest Coverage - changed files
+
+on:
+ pull_request:
+ branches: develop
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ ref: "refs/heads/develop"
+ token: ${{ secrets.GITHUB_TOKEN }} # Provide the GitHub token for authentication
+
+ - name: Fetch branch
+ run: git fetch origin ${{ github.event.pull_request.head.ref }}
+
+ - run: |
+ git checkout ${{ github.event.pull_request.head.sha }}
+
+ - uses: actions/setup-node@v4
+ with:
+ node-version: lts/*
+
+ - name: Install dependencies
+ run: cd frontend && npm install -g yarn && yarn
+
+ - name: npm run test:changedsince
+ run: cd frontend && npm run i18n:generate-hash && npm run test:changedsince
diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -22,7 +22,7 @@ x-clickhouse-defaults: &clickhouse-defaults
  "wget",
  "--spider",
  "-q",
- "localhost:8123/ping"
+ "0.0.0.0:8123/ping"
  ]
  interval: 30s
  timeout: 5s
@@ -146,7 +146,7 @@ services:
  condition: on-failure
 
  query-service:
- image: signoz/query-service:0.42.0
+ image: signoz/query-service:0.44.0
  command:
  [
  "-config=/root/config/prometheus.yml",
@@ -186,7 +186,7 @@ services:
  <<: *db-depend
 
  frontend:
- image: signoz/frontend:0.42.0
+ image: signoz/frontend:0.44.0
  deploy:
  restart_policy:
  condition: on-failure
@@ -199,7 +199,7 @@ services:
  - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
  otel-collector:
- image: signoz/signoz-otel-collector:0.88.17
+ image: signoz/signoz-otel-collector:0.88.21
  command:
  [
  "--config=/etc/otel-collector-config.yaml",
@@ -237,7 +237,7 @@ services:
  - query-service
 
  otel-collector-migrator:
- image: signoz/signoz-schema-migrator:0.88.17
+ image: signoz/signoz-schema-migrator:0.88.21
  deploy:
  restart_policy:
  condition: on-failure

diff --git a/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml b/deploy/docker-swarm/clickhouse-setup/otel-collector-config.yaml
@@ -111,18 +111,18 @@ processors:
 
 exporters:
  clickhousetraces:
- datasource: tcp://clickhouse:9000/?database=signoz_traces
+ datasource: tcp://clickhouse:9000/signoz_traces
  docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
  low_cardinal_exception_grouping: ${LOW_CARDINAL_EXCEPTION_GROUPING}
  clickhousemetricswrite:
- endpoint: tcp://clickhouse:9000/?database=signoz_metrics
+ endpoint: tcp://clickhouse:9000/signoz_metrics
  resource_to_telemetry_conversion:
  enabled: true
  clickhousemetricswrite/prometheus:
- endpoint: tcp://clickhouse:9000/?database=signoz_metrics
+ endpoint: tcp://clickhouse:9000/signoz_metrics
  # logging: {}
  clickhouselogsexporter:
- dsn: tcp://clickhouse:9000/
+ dsn: tcp://clickhouse:9000/signoz_logs
  docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
  timeout: 10s
 extensions:

diff --git a/deploy/docker-swarm/clickhouse-setup/prometheus.yml b/deploy/docker-swarm/clickhouse-setup/prometheus.yml
@@ -22,4 +22,4 @@ rule_files:
 scrape_configs: []
 
 remote_read:
- - url: tcp://clickhouse:9000/?database=signoz_metrics
+ - url: tcp://clickhouse:9000/signoz_metrics
diff --git a/deploy/docker/clickhouse-setup/docker-compose-core.yaml b/deploy/docker/clickhouse-setup/docker-compose-core.yaml
@@ -46,7 +46,7 @@ services:
  "wget",
  "--spider",
  "-q",
- "localhost:8123/ping"
+ "0.0.0.0:8123/ping"
  ]
  interval: 30s
  timeout: 5s
@@ -66,7 +66,7 @@ services:
  - --storage.path=/data
 
  otel-collector-migrator:
- image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.17}
+ image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.21}
  container_name: otel-migrator
  command:
  - "--dsn=tcp://clickhouse:9000"
@@ -81,7 +81,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`
  otel-collector:
  container_name: signoz-otel-collector
- image: signoz/signoz-otel-collector:0.88.17
+ image: signoz/signoz-otel-collector:0.88.21
  command:
  [
  "--config=/etc/otel-collector-config.yaml",

diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -21,7 +21,7 @@ x-clickhouse-defaults: &clickhouse-defaults
  "wget",
  "--spider",
  "-q",
- "localhost:8123/ping"
+ "0.0.0.0:8123/ping"
  ]
  interval: 30s
  timeout: 5s
@@ -164,7 +164,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:${DOCKER_TAG:-0.42.0}
+ image: signoz/query-service:${DOCKER_TAG:-0.44.0}
  container_name: signoz-query-service
  command:
  [
@@ -203,7 +203,7 @@ services:
  <<: *db-depend
 
  frontend:
- image: signoz/frontend:${DOCKER_TAG:-0.42.0}
+ image: signoz/frontend:${DOCKER_TAG:-0.44.0}
  container_name: signoz-frontend
  restart: on-failure
  depends_on:
@@ -215,7 +215,7 @@ services:
  - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
 
  otel-collector-migrator:
- image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.17}
+ image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.21}
  container_name: otel-migrator
  command:
  - "--dsn=tcp://clickhouse:9000"
@@ -229,7 +229,7 @@ services:
 
 
  otel-collector:
- image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.17}
+ image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.21}
  container_name: signoz-otel-collector
  command:
  [

diff --git a/deploy/docker/clickhouse-setup/otel-collector-config.yaml b/deploy/docker/clickhouse-setup/otel-collector-config.yaml
@@ -122,21 +122,20 @@ extensions:
 
 exporters:
  clickhousetraces:
- datasource: tcp://clickhouse:9000/?database=signoz_traces
+ datasource: tcp://clickhouse:9000/signoz_traces
  docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
  low_cardinal_exception_grouping: ${LOW_CARDINAL_EXCEPTION_GROUPING}
  clickhousemetricswrite:
- endpoint: tcp://clickhouse:9000/?database=signoz_metrics
+ endpoint: tcp://clickhouse:9000/signoz_metrics
  resource_to_telemetry_conversion:
  enabled: true
  clickhousemetricswrite/prometheus:
- endpoint: tcp://clickhouse:9000/?database=signoz_metrics
- # logging: {}
-
+ endpoint: tcp://clickhouse:9000/signoz_metrics
  clickhouselogsexporter:
- dsn: tcp://clickhouse:9000/
+ dsn: tcp://clickhouse:9000/signoz_logs
  docker_multi_node_cluster: ${DOCKER_MULTI_NODE_CLUSTER}
  timeout: 10s
+ # logging: {}
 
 service:
  telemetry:

diff --git a/deploy/docker/clickhouse-setup/prometheus.yml b/deploy/docker/clickhouse-setup/prometheus.yml
@@ -22,4 +22,4 @@ rule_files:
 scrape_configs: []
 
 remote_read:
- - url: tcp://clickhouse:9000/?database=signoz_metrics
+ - url: tcp://clickhouse:9000/signoz_metrics
diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go
@@ -152,7 +152,6 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddlew
  router.HandleFunc("/api/v1/register", am.OpenAccess(ah.registerUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/login", am.OpenAccess(ah.loginUser)).Methods(http.MethodPost)
  router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(ah.searchTraces)).Methods(http.MethodGet)
- router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost)
 
  // PAT APIs
  router.HandleFunc("/api/v1/pats", am.AdminAccess(ah.createPAT)).Methods(http.MethodPost)