From 7c65bf49ea7c7b9bd5c292040383ae68925d46a4 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 1 Jul 2025 22:32:15 +1000 Subject: [PATCH 1/3] Deploy graf + loki --- deployments/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 85f0916..c9b6349 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -5,3 +5,4 @@ resources: - operators/prometheus.yaml - operators/mariadb.yaml - dns/bind.yaml + - monitoring/grafana-loki.yaml From f3b551b8b8350895d3c65be86ee632c4460e0477 Mon Sep 17 00:00:00 2001 From: j Date: Tue, 1 Jul 2025 22:32:51 +1000 Subject: [PATCH 2/3] Split into a file each --- deployments/monitoring/grafana.yaml | 35 +++++++++++++++++++ .../{grafana-loki.yaml => loki.yaml} | 35 ------------------- 2 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 deployments/monitoring/grafana.yaml rename deployments/monitoring/{grafana-loki.yaml => loki.yaml} (51%) diff --git a/deployments/monitoring/grafana.yaml b/deployments/monitoring/grafana.yaml new file mode 100644 index 0000000..ba184af --- /dev/null +++ b/deployments/monitoring/grafana.yaml @@ -0,0 +1,35 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: grafana + namespace: observability +spec: + interval: 30m + chart: + spec: + chart: grafana + version: 7.3.0 + sourceRef: + kind: HelmRepository + name: grafana + namespace: flux-system + install: + createNamespace: true + values: + admin: + existingSecret: grafana-admin-secret + userKey: admin-user + passwordKey: admin-password + service: + type: LoadBalancer + datasources: + datasources.yaml: + apiVersion: 1 + datasources: + - name: Loki + type: loki + access: proxy + url: http://loki:3100 + isDefault: true + diff --git a/deployments/monitoring/grafana-loki.yaml b/deployments/monitoring/loki.yaml similarity index 51% rename from deployments/monitoring/grafana-loki.yaml rename to deployments/monitoring/loki.yaml index 395ae01..2364c80 100644 --- a/deployments/monitoring/grafana-loki.yaml +++ b/deployments/monitoring/loki.yaml @@ -41,38 +41,3 @@ spec: replicas: 1 backend: replicas: 1 ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: grafana - namespace: observability -spec: - interval: 30m - chart: - spec: - chart: grafana - version: 7.3.0 - sourceRef: - kind: HelmRepository - name: grafana - namespace: flux-system - install: - createNamespace: true - values: - admin: - existingSecret: grafana-admin-secret - userKey: admin-user - passwordKey: admin-password - service: - type: LoadBalancer - datasources: - datasources.yaml: - apiVersion: 1 - datasources: - - name: Loki - type: loki - access: proxy - url: http://loki:3100 - isDefault: true - From 6efa45ec9a4b2786ee0c88568a1b3f3f5d8803cc Mon Sep 17 00:00:00 2001 From: j Date: Tue, 1 Jul 2025 22:34:05 +1000 Subject: [PATCH 3/3] 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