Skip to content

Commit

Permalink
Merge branch 'main' into 3441-fix-rollover-prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
albertteoh authored Dec 21, 2021
2 parents 8bf3a49 + c456653 commit 32c937f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docker-compose/monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ The following diagram illustrates the relationship between these components:
# Getting Started

## Bring up/down the dev environment
```
docker compose up
docker compose down
```bash
docker-compose up
docker-compose down
```

## Example 1
Expand Down
3 changes: 3 additions & 0 deletions docker-compose/monitor/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ services:
networks:
- backend
image: jaegertracing/all-in-one:latest
volumes:
- "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json"
command: --query.ui-config /etc/jaeger/jaeger-ui.json
environment:
- METRICS_STORAGE_TYPE=prometheus
- PROMETHEUS_SERVER_URL=http://prometheus:9090
Expand Down
8 changes: 8 additions & 0 deletions docker-compose/monitor/jaeger-ui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"monitor": {
"menuEnabled": true
},
"dependencies": {
"menuEnabled": true
}
}

0 comments on commit 32c937f

Please sign in to comment.