Commit 4afa357
authored
feat(monitor): restore Grafana to SPM docker-compose example (ADR-007 Step 1) (#8215)
## Summary
Implements **Step 1** of [ADR-007: Grafana Dashboard
Modernization](https://github.com/jaegertracing/jaeger/blob/main/docs/adr/007-grafana-dashboards-modernization.md)
as directed by @yurishkuro in #5833.
Restores Grafana to the `docker-compose/monitor/` SPM example so the
existing mixin dashboard can be validated against live Jaeger metrics,
and so subsequent steps (Go SDK migration, CI checks) have a working
baseline to validate against.
### Changes
- **`docker-compose/monitor/docker-compose.yml`** — adds `grafana`
service (Grafana 11.6.0) mounting
`monitoring/jaeger-mixin/dashboard-for-grafana.json` directly from its
canonical location (single source of truth, no copy)
-
**`docker-compose/monitor/grafana/provisioning/datasources/prometheus.yml`**
— moves the orphaned `datasource.yml` to its correct Grafana
provisioning path (same content)
-
**`docker-compose/monitor/grafana/provisioning/dashboards/default.yml`**
— new dashboard provider config
- **`docker-compose/monitor/datasource.yml`** — deleted (now at correct
provisioning path)
- **`docker-compose/monitor/README.md`** — notes Grafana is available at
http://localhost:3000 with the mixin dashboard pre-loaded
Anonymous access with `Admin` role is enabled — no login prompt in this
local dev environment. The `:ro` flag prevents Grafana from writing back
to the source file.
Angular deprecation warnings are **expected** at this stage. Grafana
11.x is used intentionally — it is the last series with Angular support
enabled by default. The panel type migration (`graph` → `timeseries` via
`grafana-foundation-sdk`) is Step 2 of the ADR.
### Test plan
- [ ] `docker compose up` in `docker-compose/monitor/`
- [ ] Confirm Grafana loads at http://localhost:3000 with no login
required
- [ ] Confirm "Jaeger" mixin dashboard is pre-provisioned and panels
show data after ~2 minutes of microsim traffic
- [ ] Confirm Angular deprecation warnings appear (expected — will be
fixed in Step 2)
Relates to #5833
Signed-off-by: abhay1999 <abhaychaurasiya19@gmail.com>1 parent c3164c3 commit 4afa357
File tree
5 files changed
+34
-8
lines changed- docker-compose/monitor
- grafana/provisioning
- dashboards
- datasources
5 files changed
+34
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| 96 | + | |
96 | 97 | | |
97 | 98 | | |
98 | 99 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
41 | 56 | | |
42 | 57 | | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
0 commit comments