Skip to content

Commit ce04442

Browse files
vmihailencovmihailenco
committed
chore: update uptrace config
1 parent ddb0bc0 commit ce04442

File tree

2 files changed

+89
-70
lines changed

2 files changed

+89
-70
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ test: testdeps
55
echo "go test in $${dir}"; \
66
(cd "$${dir}" && \
77
go test && \
8-
go test ./... -short -race &&
9-
go test ./... -run=NONE -bench=. -benchmem &&
8+
go test ./... -short -race && \
9+
go test ./... -run=NONE -bench=. -benchmem && \
1010
env GOOS=linux GOARCH=386 go test && \
1111
go vet); \
1212
done

‎example/otel/uptrace.yml‎

Lines changed: 87 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,17 @@
1717
## ClickHouse database credentials.
1818
##
1919
ch:
20-
# Connection string for ClickHouse database. For example:
21-
# clickhouse://<user>:<password>@<host>:<port>/<database>?sslmode=disable
22-
#
23-
# See https://clickhouse.uptrace.dev/guide/golang-clickhouse.html#options
24-
dsn: 'clickhouse://default:@clickhouse:9000/uptrace?sslmode=disable'
20+
addr: clickhouse:9000
21+
user: default
22+
password:
23+
database: uptrace
24+
25+
# TLS configuration. Uncomment to enable.
26+
# tls:
27+
# insecure_skip_verify: true
28+
29+
# Maximum query execution time.
30+
max_execution_time: 30s
2531

2632
##
2733
## A list of pre-configured projects. Each project is fully isolated.
@@ -59,28 +65,19 @@ projects:
5965
## Create metrics from spans and events.
6066
##
6167
metrics_from_spans:
62-
- name: uptrace.tracing.spans_duration
68+
- name: uptrace.tracing.spans
6369
description: Spans duration (excluding events)
6470
instrument: histogram
6571
unit: microseconds
6672
value: span.duration / 1000
6773
attrs:
68-
- span.system as system
69-
- service.name as service
70-
- host.name as host
71-
- span.status_code as status
72-
where: not span.is_event
73-
74-
- name: uptrace.tracing.spans
75-
description: Spans count (excluding events)
76-
instrument: counter
77-
unit: 1
78-
value: span.count
79-
attrs:
80-
- span.system as system
81-
- service.name as service
82-
- host.name as host
83-
- span.status_code as status
74+
- span.system
75+
- span.group_id
76+
- service.name
77+
- host.name
78+
- span.status_code
79+
annotations:
80+
- span.name
8481
where: not span.is_event
8582

8683
- name: uptrace.tracing.events
@@ -89,52 +86,14 @@ metrics_from_spans:
8986
unit: 1
9087
value: span.count
9188
attrs:
92-
- span.system as system
93-
- service.name as service
94-
- host.name as host
89+
- span.system
90+
- span.group_id
91+
- service.name
92+
- host.name
93+
annotations:
94+
- span.event_name
9595
where: span.is_event
9696

97-
##
98-
## To require authentication, uncomment the following section.
99-
##
100-
auth:
101-
# users:
102-
# - username: uptrace
103-
# password: uptrace
104-
# - username: admin
105-
# password: admin
106-
107-
# # Cloudflare user provider: uses Cloudflare Zero Trust Access (Identity)
108-
# # See https://developers.cloudflare.com/cloudflare-one/identity/ for more info.
109-
# cloudflare:
110-
# # The base URL of the Cloudflare Zero Trust team.
111-
# - team_url: https://myteam.cloudflareaccess.com
112-
# # The Application Audience (AUD) Tag for this application.
113-
# # You can retrieve this from the Cloudflare Zero Trust 'Access' Dashboard.
114-
# audience: bea6df23b944e4a0cd178609ba1bb64dc98dfe1f66ae7b918e563f6cf28b37e0
115-
116-
# # OpenID Connect (Single Sign-On)
117-
# oidc:
118-
# # The ID is used in API endpoints, for example, in redirect URL
119-
# # `http://<uptrace-host>/api/v1/sso/<oidc-id>/callback`.
120-
# - id: keycloak
121-
# # Display name for the button in the login form.
122-
# # Default to 'OpenID Connect'
123-
# display_name: Keycloak
124-
# # The base URL for the OIDC provider.
125-
# issuer_url: http://localhost:8080/realms/uptrace
126-
# # The OAuth 2.0 Client ID
127-
# client_id: uptrace
128-
# # The OAuth 2.0 Client Secret
129-
# client_secret: ogbhd8Q0X0e5AZFGSG3m9oirPvnetqkA
130-
# # Additional OAuth 2.0 scopes to request from the OIDC provider.
131-
# # Defaults to 'profile'. 'openid' is requested by default and need not be specified.
132-
# scopes:
133-
# - profile
134-
# # The OIDC UserInfo claim to use as the user's username.
135-
# # Defaults to 'preferred_username'.
136-
# claim: preferred_username
137-
13897
##
13998
## Alerting rules for monitoring metrics.
14099
##
@@ -200,6 +159,47 @@ alertmanager_client:
200159
urls:
201160
- 'http://alertmanager:9093/api/v2/alerts'
202161

162+
##
163+
## To require authentication, uncomment the following section.
164+
##
165+
auth:
166+
# users:
167+
# - username: uptrace
168+
# password: uptrace
169+
# - username: admin
170+
# password: admin
171+
172+
# # Cloudflare user provider: uses Cloudflare Zero Trust Access (Identity)
173+
# # See https://developers.cloudflare.com/cloudflare-one/identity/ for more info.
174+
# cloudflare:
175+
# # The base URL of the Cloudflare Zero Trust team.
176+
# - team_url: https://myteam.cloudflareaccess.com
177+
# # The Application Audience (AUD) Tag for this application.
178+
# # You can retrieve this from the Cloudflare Zero Trust 'Access' Dashboard.
179+
# audience: bea6df23b944e4a0cd178609ba1bb64dc98dfe1f66ae7b918e563f6cf28b37e0
180+
181+
# # OpenID Connect (Single Sign-On)
182+
# oidc:
183+
# # The ID is used in API endpoints, for example, in redirect URL
184+
# # `http://<uptrace-host>/api/v1/sso/<oidc-id>/callback`.
185+
# - id: keycloak
186+
# # Display name for the button in the login form.
187+
# # Default to 'OpenID Connect'
188+
# display_name: Keycloak
189+
# # The base URL for the OIDC provider.
190+
# issuer_url: http://localhost:8080/realms/uptrace
191+
# # The OAuth 2.0 Client ID
192+
# client_id: uptrace
193+
# # The OAuth 2.0 Client Secret
194+
# client_secret: ogbhd8Q0X0e5AZFGSG3m9oirPvnetqkA
195+
# # Additional OAuth 2.0 scopes to request from the OIDC provider.
196+
# # Defaults to 'profile'. 'openid' is requested by default and need not be specified.
197+
# scopes:
198+
# - profile
199+
# # The OIDC UserInfo claim to use as the user's username.
200+
# # Defaults to 'preferred_username'.
201+
# claim: preferred_username
202+
203203
##
204204
## Various options to tweak ClickHouse schema.
205205
## For changes to take effect, you need reset the ClickHouse database with `ch reset`.
@@ -215,14 +215,14 @@ ch_schema:
215215
#cluster: uptrace1
216216

217217
spans:
218-
storage_policy: 'default'
219218
# Delete spans data after 30 days.
220219
ttl_delete: 30 DAY
220+
storage_policy: 'default'
221221

222222
metrics:
223-
storage_policy: 'default'
224223
# Delete metrics data after 90 days.
225224
ttl_delete: 90 DAY
225+
storage_policy: 'default'
226226

227227
##
228228
## Addresses on which Uptrace receives gRPC and HTTP requests.
@@ -290,6 +290,25 @@ db:
290290
# Make sure the directory is writable by Uptrace process.
291291
dsn: 'file:uptrace.sqlite3?_pragma=foreign_keys(1)&_pragma=busy_timeout(1000)'
292292

293+
##
294+
## uptrace-go client configuration.
295+
## Uptrace sends internal telemetry here. Defaults to listen.grpc.addr.
296+
##
297+
uptrace_go:
298+
# dsn: http://project1_secret_token@localhost:14317/1
299+
# tls:
300+
# cert_file: config/tls/uptrace.crt
301+
# key_file: config/tls/uptrace.key
302+
# insecure_skip_verify: true
303+
304+
##
305+
## Logging configuration.
306+
##
307+
logs:
308+
# Zap minimal logging level.
309+
# Valid values: DEBUG, INFO, WARN, ERROR, DPANIC, PANIC, FATAL.
310+
level: INFO
311+
293312
# Secret key that is used to sign JWT tokens etc.
294313
secret_key: 102c1a557c314fc28198acd017960843
295314

0 commit comments

Comments
 (0)