From 6efa45ec9a4b2786ee0c88568a1b3f3f5d8803cc Mon Sep 17 00:00:00 2001
From: j <repobase@j7b.net>
Date: Tue, 1 Jul 2025 22:34:05 +1000
Subject: [PATCH] Split into file each. Change namespace to monitoring.

---
 deployments/kustomization.yaml       |  4 +++-
 deployments/monitoring/grafana.yaml  |  2 +-
 deployments/monitoring/loki.yaml     | 16 +---------------
 deployments/monitoring/provider.yaml | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 deployments/monitoring/provider.yaml

diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml
index c9b6349..137e5aa 100644
--- a/deployments/kustomization.yaml
+++ b/deployments/kustomization.yaml
@@ -5,4 +5,6 @@ resources:
   - operators/prometheus.yaml
   - operators/mariadb.yaml
   - dns/bind.yaml
-  - monitoring/grafana-loki.yaml
+  - monitoring/provider.yaml
+  - monitoring/grafana.yaml
+  - monitoring/loki.yaml
diff --git a/deployments/monitoring/grafana.yaml b/deployments/monitoring/grafana.yaml
index ba184af..3a45afc 100644
--- a/deployments/monitoring/grafana.yaml
+++ b/deployments/monitoring/grafana.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: grafana
-  namespace: observability
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
diff --git a/deployments/monitoring/loki.yaml b/deployments/monitoring/loki.yaml
index 2364c80..eed52ba 100644
--- a/deployments/monitoring/loki.yaml
+++ b/deployments/monitoring/loki.yaml
@@ -1,23 +1,9 @@
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: observability
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: grafana
-  namespace: flux-system
-spec:
-  url: https://grafana.github.io/helm-charts
-  interval: 1h
----
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: loki
-  namespace: observability
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
diff --git a/deployments/monitoring/provider.yaml b/deployments/monitoring/provider.yaml
new file mode 100644
index 0000000..3e3bd59
--- /dev/null
+++ b/deployments/monitoring/provider.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring
+---
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: grafana
+  namespace: flux-system
+spec:
+  url: https://grafana.github.io/helm-charts
+  interval: 1h