Commit b9515a4
refactor(observability): remove duplicated shared files; give each component its own namespace
Problem 1: the composable split had copy-pasted namespace.yaml,
helm-repositories.yaml, and datasources/ into each component
subdirectory while leaving the originals at the root. That duplicated
~200 lines and caused the root kustomize build to fail on conflicting
resources.
- Deleted the root-level namespace.yaml, helm-repositories.yaml, and
datasources/ directory.
- Kept a single copy of the datasources under grafana/datasources/ (where
the Grafana instance lives).
- Pared each component's helm-repositories.yaml to just the repo that
component actually consumes. Gave loki/tempo distinct HelmRepository
names (loki-charts, tempo-charts) so the composed root kustomize build
does not fail on duplicate source.toolkit.fluxcd.io resources.
- Root components/observability/kustomization.yaml now references the six
component subdirectories only.
- Dropped prometheus-crds/namespace.yaml entirely — the kustomization
only installs cluster-scoped CRDs so no namespace is needed.
Problem 2: everything still deployed to telemetry-system, which defeats
the point of per-component composition. Each component now has its own
namespace so kubectl delete ns <x> cleanly uninstalls it:
- victoria-metrics-system (was telemetry-system)
- grafana-system
- loki-system
- tempo-system
- otel-collector-system
Cross-component references are now fully qualified service DNS names:
- Grafana datasources point at vmsingle/vmalertmanager in
victoria-metrics-system, loki-system-loki in loki-system, and
tempo-system-tempo in tempo-system.
- The OTel Collector's otlp, loki, and prometheusremotewrite exporters
point at the new FQDNs.
- VMAlert's datasource, notifier, and remoteWrite URLs use the new
victoria-metrics-system service names.
- VM defaultDashboards.grafanaOperator.allowCrossNamespaceImport is now
true so dashboards created in victoria-metrics-system can target the
Grafana CR in grafana-system.
Taskfile's per-component waits updated to reference the new namespaces
(vmagent/vmsingle in victoria-metrics-system, otel-collector-collector
DaemonSet in otel-collector-system).
README refreshed to document the subcomponent layout, namespaces, and
removal procedure.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent a3f944a commit b9515a4
32 files changed
Lines changed: 81 additions & 273 deletions
File tree
- components/observability
- datasources
- grafana
- datasources
- loki
- otel-collector
- prometheus-crds
- tempo
- victoria-metrics
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
450 | 450 | | |
451 | 451 | | |
452 | 452 | | |
453 | | - | |
454 | | - | |
| 453 | + | |
| 454 | + | |
455 | 455 | | |
456 | 456 | | |
457 | 457 | | |
| |||
480 | 480 | | |
481 | 481 | | |
482 | 482 | | |
483 | | - | |
| 483 | + | |
484 | 484 | | |
485 | 485 | | |
486 | 486 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
16 | 21 | | |
17 | 22 | | |
18 | 23 | | |
19 | 24 | | |
20 | | - | |
| 25 | + | |
21 | 26 | | |
22 | 27 | | |
23 | 28 | | |
24 | 29 | | |
25 | 30 | | |
26 | 31 | | |
27 | 32 | | |
28 | | - | |
| 33 | + | |
29 | 34 | | |
30 | 35 | | |
31 | 36 | | |
32 | 37 | | |
33 | 38 | | |
34 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
35 | 49 | | |
36 | 50 | | |
37 | 51 | | |
38 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
39 | 59 | | |
40 | 60 | | |
41 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
42 | 64 | | |
Lines changed: 0 additions & 19 deletions
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 0 additions & 54 deletions
This file was deleted.
This file was deleted.
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
0 commit comments