From 07489346635abad0e49cfa90579b2736cd75f43b Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Tue, 30 Jul 2024 01:49:21 +1000
Subject: [PATCH] fix ns and volumes for logstash

---
 infrastructures/logstash/base/values.yaml     | 24 +++++++++++++------
 .../templates/logstash-data-pv.yaml           |  4 ++--
 .../templates/logstash-data-pvc.yaml          |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/infrastructures/logstash/base/values.yaml b/infrastructures/logstash/base/values.yaml
index 93d49f3..af139ea 100644
--- a/infrastructures/logstash/base/values.yaml
+++ b/infrastructures/logstash/base/values.yaml
@@ -1,16 +1,26 @@
+namespaceOverride: logstash
 clusterDomain: logstash.logstash.svc.cluster.local
-input: ""
-output: ""
+input: null
+filter: null
+output: null
 existingConfiguration: "logstash-pipelines"
 enableMultiplePipelines: true
 extraVolumes:
-  - name: logstash-pipeline-configs
+  - name: logstash-config-http
     hostPath:
-      path: /mnt/nfs/AppData/logstash/config
-      type: Directory
+      path: /mnt/nfs/AppData/logstash/config/http.conf
+      type: File
+      readOnly: true
+  - name: logstash-config-syslog
+    hostPath:
+      path: /mnt/nfs/AppData/logstash/config/syslog.conf
+      type: File
+      readOnly: true
 extraVolumeMounts:
-  - name: logstash-pipeline-configs
-    mountPath: /opt/bitnami/logstash/config/
+  - name: logstash-config-http
+    mountPath: /bitnami/logstash/config/http.conf
+  - name: logstash-config-syslog
+    mountPath: /bitnami/logstash/config/syslog.conf
 containerPorts:
   - name: http
     containerPort: 8080
diff --git a/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pv.yaml b/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pv.yaml
index 7eafc42..d10502c 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pv.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pv.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: logstash-data-pv
-  namespace: argocd
+  namespace: logstash
   labels:
     type: local
 spec:
@@ -19,7 +19,7 @@ spec:
     apiVersion: v1
     kind: PersistentVolumeClaim
     name: logstash-data-pvc
-    namespace: argocd
+    namespace: logstash
   nodeAffinity:
     required:
       nodeSelectorTerms:
diff --git a/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pvc.yaml b/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pvc.yaml
index 937ed81..7c6c524 100644
--- a/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pvc.yaml
+++ b/resources/app-volumes/env/k3s-cluster/templates/logstash-data-pvc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: logstash-data-pvc
-  namespace: argocd
+  namespace: logstash
   labels:
     name: logstash-data-pvc
 spec: