Skip to content

Commit 6903aa4

Browse files
nityanandagohainnityanandagohain
authored
Merge branch 'main' into feat/add-auto-refresh-to-logs-explorer
2 parents 7a61129 + 9d397d0 commit 6903aa4

File tree

608 files changed

+89878
-21500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

608 files changed

+89878
-21500
lines changed

‎.devenv/docker/clickhouse/compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
timeout: 5s
4141
retries: 3
4242
schema-migrator-sync:
43-
image: signoz/signoz-schema-migrator:v0.111.41
43+
image: signoz/signoz-schema-migrator:v0.111.42
4444
container_name: schema-migrator-sync
4545
command:
4646
- sync
@@ -53,7 +53,7 @@ services:
5353
condition: service_healthy
5454
restart: on-failure
5555
schema-migrator-async:
56-
image: signoz/signoz-schema-migrator:v0.111.41
56+
image: signoz/signoz-schema-migrator:v0.111.42
5757
container_name: schema-migrator-async
5858
command:
5959
- async

‎.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
/pkg/factory/ @grandwizard28
1313
/pkg/types/ @grandwizard28
1414
/pkg/sqlmigration/ @vikrantgupta25
15+
.golangci.yml @grandwizard28

‎.github/pull_request_template.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ ex:
3232

3333
> Tag the relevant teams for review:
3434
35-
- [ ] @SigNoz/frontend
36-
- [ ] @SigNoz/backend
37-
- [ ] @SigNoz/devops
35+
- frontend / backend / devops
3836

3937
---
4038

‎.github/workflows/build-enterprise.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ jobs:
6767
echo 'TUNNEL_URL="${{ secrets.TUNNEL_URL }}"' >> frontend/.env
6868
echo 'TUNNEL_DOMAIN="${{ secrets.TUNNEL_DOMAIN }}"' >> frontend/.env
6969
echo 'POSTHOG_KEY="${{ secrets.POSTHOG_KEY }}"' >> frontend/.env
70-
echo 'CUSTOMERIO_ID="${{ secrets.CUSTOMERIO_ID }}"' >> frontend/.env
71-
echo 'CUSTOMERIO_SITE_ID="${{ secrets.CUSTOMERIO_SITE_ID }}"' >> frontend/.env
72-
echo 'USERPILOT_KEY="${{ secrets.USERPILOT_KEY }}"' >> frontend/.env
70+
echo 'PYLON_APP_ID="${{ secrets.PYLON_APP_ID }}"' >> frontend/.env
71+
echo 'APPCUES_APP_ID="${{ secrets.APPCUES_APP_ID }}"' >> frontend/.env
7372
- name: cache-dotenv
7473
uses: actions/cache@v4
7574
with:

‎.github/workflows/build-staging.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ jobs:
6666
echo 'CI=1' > frontend/.env
6767
echo 'TUNNEL_URL="${{ secrets.NP_TUNNEL_URL }}"' >> frontend/.env
6868
echo 'TUNNEL_DOMAIN="${{ secrets.NP_TUNNEL_DOMAIN }}"' >> frontend/.env
69-
echo 'USERPILOT_KEY="${{ secrets.NP_USERPILOT_KEY }}"' >> frontend/.env
69+
echo 'PYLON_APP_ID="${{ secrets.NP_PYLON_APP_ID }}"' >> frontend/.env
70+
echo 'APPCUES_APP_ID="${{ secrets.NP_APPCUES_APP_ID }}"' >> frontend/.env
7071
- name: cache-dotenv
7172
uses: actions/cache@v4
7273
with:

‎.github/workflows/gor-signoz.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ jobs:
3333
echo 'TUNNEL_URL="${{ secrets.TUNNEL_URL }}"' >> .env
3434
echo 'TUNNEL_DOMAIN="${{ secrets.TUNNEL_DOMAIN }}"' >> .env
3535
echo 'POSTHOG_KEY="${{ secrets.POSTHOG_KEY }}"' >> .env
36-
echo 'CUSTOMERIO_ID="${{ secrets.CUSTOMERIO_ID }}"' >> .env
37-
echo 'CUSTOMERIO_SITE_ID="${{ secrets.CUSTOMERIO_SITE_ID }}"' >> .env
38-
echo 'USERPILOT_KEY="${{ secrets.USERPILOT_KEY }}"' >> .env
36+
echo 'PYLON_APP_ID="${{ secrets.PYLON_APP_ID }}"' >> .env
37+
echo 'APPCUES_APP_ID="${{ secrets.APPCUES_APP_ID }}"' >> .env
3938
- name: build-frontend
4039
run: make js-build
4140
- name: upload-frontend-artifact

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ e2e/.auth
6666
# go
6767
vendor/
6868
**/main/**
69+
__debug_bin**
6970

7071
# git-town
7172
.git-branches.toml

‎.golangci.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
linters:
2+
default: standard
3+
enable:
4+
- bodyclose
5+
- misspell
6+
- nilnil
7+
- sloglint
8+
- depguard
9+
- iface
10+
11+
linters-settings:
12+
sloglint:
13+
no-mixed-args: true
14+
kv-only: true
15+
no-global: all
16+
context: all
17+
static-msg: true
18+
msg-style: lowercased
19+
key-naming-case: snake
20+
depguard:
21+
rules:
22+
nozap:
23+
deny:
24+
- pkg: "go.uber.org/zap"
25+
desc: "Do not use zap logger. Use slog instead."
26+
iface:
27+
enable:
28+
- identical
29+
issues:
30+
exclude-dirs:
31+
- "pkg/query-service"
32+
- "ee/query-service"
33+
- "scripts/"

‎conf/example.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,48 @@ alertmanager:
170170
analytics:
171171
# Whether to enable analytics.
172172
enabled: false
173+
174+
##################### Emailing #####################
175+
emailing:
176+
# Whether to enable emailing.
177+
enabled: false
178+
templates:
179+
# The directory containing the email templates. This directory should contain a list of files defined at pkg/types/emailtypes/template.go.
180+
directory: /opt/signoz/conf/templates/email
181+
smtp:
182+
# The SMTP server address.
183+
address: localhost:25
184+
# The email address to use for the SMTP server.
185+
from:
186+
# The hello message to use for the SMTP server.
187+
hello:
188+
# The static headers to send with the email.
189+
headers: {}
190+
auth:
191+
# The username to use for the SMTP server.
192+
username:
193+
# The password to use for the SMTP server.
194+
password:
195+
# The secret to use for the SMTP server.
196+
secret:
197+
# The identity to use for the SMTP server.
198+
identity:
199+
tls:
200+
# Whether to enable TLS. It should be false in most cases since the authentication mechanism should use the STARTTLS extension instead.
201+
enabled: false
202+
# Whether to skip TLS verification.
203+
insecure_skip_verify: false
204+
# The path to the CA file.
205+
ca_file_path:
206+
# The path to the key file.
207+
key_file_path:
208+
# The path to the certificate file.
209+
cert_file_path:
210+
211+
##################### Sharder (experimental) #####################
212+
sharder:
213+
# Specifies the sharder provider to use.
214+
provider: noop
215+
single:
216+
# The org id to which this instance belongs to.
217+
org_id: org_id

‎deploy/docker-swarm/docker-compose.ha.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ services:
174174
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
175175
signoz:
176176
!!merge <<: *db-depend
177-
image: signoz/signoz:v0.83.0
177+
image: signoz/signoz:v0.85.3
178178
command:
179179
- --config=/root/config/prometheus.yml
180180
ports:
@@ -206,7 +206,7 @@ services:
206206
retries: 3
207207
otel-collector:
208208
!!merge <<: *db-depend
209-
image: signoz/signoz-otel-collector:v0.111.41
209+
image: signoz/signoz-otel-collector:v0.111.42
210210
command:
211211
- --config=/etc/otel-collector-config.yaml
212212
- --manager-config=/etc/manager-config.yaml
@@ -230,7 +230,7 @@ services:
230230
- signoz
231231
schema-migrator:
232232
!!merge <<: *common
233-
image: signoz/signoz-schema-migrator:v0.111.41
233+
image: signoz/signoz-schema-migrator:v0.111.42
234234
deploy:
235235
restart_policy:
236236
condition: on-failure

‎deploy/docker-swarm/docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
111111
signoz:
112112
!!merge <<: *db-depend
113-
image: signoz/signoz:v0.83.0
113+
image: signoz/signoz:v0.85.3
114114
command:
115115
- --config=/root/config/prometheus.yml
116116
ports:
@@ -141,7 +141,7 @@ services:
141141
retries: 3
142142
otel-collector:
143143
!!merge <<: *db-depend
144-
image: signoz/signoz-otel-collector:v0.111.41
144+
image: signoz/signoz-otel-collector:v0.111.42
145145
command:
146146
- --config=/etc/otel-collector-config.yaml
147147
- --manager-config=/etc/manager-config.yaml
@@ -165,7 +165,7 @@ services:
165165
- signoz
166166
schema-migrator:
167167
!!merge <<: *common
168-
image: signoz/signoz-schema-migrator:v0.111.41
168+
image: signoz/signoz-schema-migrator:v0.111.42
169169
deploy:
170170
restart_policy:
171171
condition: on-failure

‎deploy/docker/docker-compose.ha.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ services:
177177
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
178178
signoz:
179179
!!merge <<: *db-depend
180-
image: signoz/signoz:${VERSION:-v0.83.0}
180+
image: signoz/signoz:${VERSION:-v0.85.3}
181181
container_name: signoz
182182
command:
183183
- --config=/root/config/prometheus.yml
@@ -210,7 +210,7 @@ services:
210210
# TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
211211
otel-collector:
212212
!!merge <<: *db-depend
213-
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.111.41}
213+
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.111.42}
214214
container_name: signoz-otel-collector
215215
command:
216216
- --config=/etc/otel-collector-config.yaml
@@ -236,7 +236,7 @@ services:
236236
condition: service_healthy
237237
schema-migrator-sync:
238238
!!merge <<: *common
239-
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.41}
239+
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.42}
240240
container_name: schema-migrator-sync
241241
command:
242242
- sync
@@ -247,7 +247,7 @@ services:
247247
condition: service_healthy
248248
schema-migrator-async:
249249
!!merge <<: *db-depend
250-
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.41}
250+
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.42}
251251
container_name: schema-migrator-async
252252
command:
253253
- async

‎deploy/docker/docker-compose.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
# - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
111111
signoz:
112112
!!merge <<: *db-depend
113-
image: signoz/signoz:${VERSION:-v0.83.0}
113+
image: signoz/signoz:${VERSION:-v0.85.3}
114114
container_name: signoz
115115
command:
116116
- --config=/root/config/prometheus.yml
@@ -142,7 +142,7 @@ services:
142142
retries: 3
143143
otel-collector:
144144
!!merge <<: *db-depend
145-
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.111.41}
145+
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.111.42}
146146
container_name: signoz-otel-collector
147147
command:
148148
- --config=/etc/otel-collector-config.yaml
@@ -164,7 +164,7 @@ services:
164164
condition: service_healthy
165165
schema-migrator-sync:
166166
!!merge <<: *common
167-
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.41}
167+
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.42}
168168
container_name: schema-migrator-sync
169169
command:
170170
- sync
@@ -176,7 +176,7 @@ services:
176176
restart: on-failure
177177
schema-migrator-async:
178178
!!merge <<: *db-depend
179-
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.41}
179+
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.111.42}
180180
container_name: schema-migrator-async
181181
command:
182182
- async

‎ee/http/middleware/pat.go

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)