Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
e744ac89
Unverified
Commit
e744ac89
authored
1 month ago
by
Kevin Aleman
Committed by
GitHub
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
chore: Set `tempo` version to `2.6.1` (#35081)
parent
8bfa650d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
development/docker-compose-monitoring.yml
+17
-17
17 additions, 17 deletions
development/docker-compose-monitoring.yml
with
17 additions
and
17 deletions
development/docker-compose-monitoring.yml
+
17
−
17
View file @
e744ac89
...
@@ -2,27 +2,27 @@ services:
...
@@ -2,27 +2,27 @@ services:
# Tempo runs as user 10001, and docker compose creates the volume as root.
# Tempo runs as user 10001, and docker compose creates the volume as root.
# As such, we need to chown the volume in order for Tempo to start correctly.
# As such, we need to chown the volume in order for Tempo to start correctly.
init
:
init
:
image
:
&tempoImage
grafana/tempo:
latest
image
:
&tempoImage
grafana/tempo:
2.6.1
user
:
root
user
:
root
entrypoint
:
entrypoint
:
-
"
chown
"
-
'
chown
'
-
"
10001:10001
"
-
'
10001:10001
'
-
"
/var/tempo
"
-
'
/var/tempo
'
volumes
:
volumes
:
-
./tempo-data:/var/tempo
-
./tempo-data:/var/tempo
tempo
:
tempo
:
image
:
*tempoImage
image
:
*tempoImage
command
:
[
"
-config.file=/etc/tempo.yaml
"
]
command
:
[
'
-config.file=/etc/tempo.yaml
'
]
volumes
:
volumes
:
-
./tempo.yml:/etc/tempo.yaml
-
./tempo.yml:/etc/tempo.yaml
-
./tempo-data:/var/tempo
-
./tempo-data:/var/tempo
ports
:
ports
:
-
"
14268
"
# jaeger ingest
-
'
14268
'
# jaeger ingest
-
"
3200
"
# tempo
-
'
3200
'
# tempo
-
"
4317
"
# otlp grpc
-
'
4317
'
# otlp grpc
-
"
4318
"
# otlp http
-
'
4318
'
# otlp http
-
"
9411
"
# zipkin2024-04-23T16:16:57+0000
-
'
9411
'
# zipkin2024-04-23T16:16:57+0000
depends_on
:
depends_on
:
-
init
-
init
...
@@ -38,12 +38,12 @@ services:
...
@@ -38,12 +38,12 @@ services:
otel-collector
:
otel-collector
:
image
:
otel/opentelemetry-collector-contrib:0.100.0
image
:
otel/opentelemetry-collector-contrib:0.100.0
command
:
command
:
-
"
--config
"
-
'
--config
'
-
"
/otel-local-config.yaml
"
-
'
/otel-local-config.yaml
'
volumes
:
volumes
:
-
./collector.config.yml:/otel-local-config.yaml
-
./collector.config.yml:/otel-local-config.yaml
ports
:
ports
:
-
"
4317:4317
"
-
'
4317:4317
'
# And put them in a Grafana Agent pipeline...
# And put them in a Grafana Agent pipeline...
agent
:
agent
:
...
@@ -51,8 +51,8 @@ services:
...
@@ -51,8 +51,8 @@ services:
volumes
:
volumes
:
-
./agent.yml:/etc/agent.yaml
-
./agent.yml:/etc/agent.yaml
entrypoint
:
entrypoint
:
-
/bin/agent
-
/bin/agent
-
-config.file=/etc/agent.yaml
-
-config.file=/etc/agent.yaml
prometheus
:
prometheus
:
image
:
prom/prometheus:latest
image
:
prom/prometheus:latest
...
@@ -64,7 +64,7 @@ services:
...
@@ -64,7 +64,7 @@ services:
volumes
:
volumes
:
-
./prometheus.yml:/etc/prometheus.yaml
-
./prometheus.yml:/etc/prometheus.yaml
ports
:
ports
:
-
"
9090:9090
"
-
'
9090:9090
'
grafana
:
grafana
:
image
:
grafana/grafana:11.0.0
image
:
grafana/grafana:11.0.0
...
@@ -76,4 +76,4 @@ services:
...
@@ -76,4 +76,4 @@ services:
-
GF_AUTH_DISABLE_LOGIN_FORM=true
-
GF_AUTH_DISABLE_LOGIN_FORM=true
-
GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
-
GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
ports
:
ports
:
-
"
4001:3000
"
-
'
4001:3000
'
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment