From 7f0115fc4ed99ad4ed76bccc4772f54a215c57b5 Mon Sep 17 00:00:00 2001
From: AdheipSingh <adheip1222@gmail.com>
Date: Thu, 19 Dec 2024 15:01:58 +0530
Subject: [PATCH 1/2] helm fixes for warnings and fluentbit configs

---
 helm/templates/ingestor-statefulset.yaml |  2 +-
 helm/templates/querier-statefulset.yaml  |  2 +-
 helm/values.yaml                         | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/helm/templates/ingestor-statefulset.yaml b/helm/templates/ingestor-statefulset.yaml
index 95995685a..684509e1a 100644
--- a/helm/templates/ingestor-statefulset.yaml
+++ b/helm/templates/ingestor-statefulset.yaml
@@ -37,7 +37,7 @@ spec:
       containers:
       - name: {{ .Chart.Name }}
         securityContext:
-          {{- toYaml .Values.parseable.securityContext | nindent 8 }}
+          {{- toYaml .Values.parseable.securityContext | nindent 10 }}
         image: {{ .Values.parseable.image.repository }}:{{ .Values.parseable.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
         args:
diff --git a/helm/templates/querier-statefulset.yaml b/helm/templates/querier-statefulset.yaml
index 7613b9fca..2694eb75f 100644
--- a/helm/templates/querier-statefulset.yaml
+++ b/helm/templates/querier-statefulset.yaml
@@ -40,7 +40,7 @@ spec:
       containers:
       - name: {{ .Chart.Name }}
         securityContext:
-          {{- toYaml .Values.parseable.securityContext | nindent 8 }}
+          {{- toYaml .Values.parseable.securityContext | nindent 10 }}
         image: {{ .Values.parseable.image.repository }}:{{ .Values.parseable.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
         args: ["/usr/bin/parseable", {{ if eq .Values.parseable.store "gcs-store" }}"s3-store"{{ else }}{{ .Values.parseable.store | quote }}{{ end }}]
diff --git a/helm/values.yaml b/helm/values.yaml
index 555cc0c29..713a68892 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -116,7 +116,7 @@ parseable:
           - s3.bucket
           - s3.region
   gcsModeSecret:
-    enabled: false
+    enabled: true
     secrets:
       - name: parseable-env-secret
         prefix: P_
@@ -312,7 +312,11 @@ vector:
 fluent-bit:
   enabled: false
   kind: DaemonSet
-  serverHost: parseable.parseable.svc.cluster.local
+  serverHost: parseable-ingestor-service.parseable.svc.cluster.local
+  serverUsername: admin
+  serverPassword: admin
+  serverStream: $NAMESPACE
+  excludeNamespaces: kube-system, default
   replicaCount: 1
   image:
     repository: parseable/fluent-bit
@@ -399,19 +403,19 @@ fluent-bit:
           Name parseable
           Match kube.*
           Server_Host {{ .Values.serverHost }}
-          Username admin
-          Password admin
+          Username {{ .Values.serverUsername }}
+          Password {{ .Values.serverPassword }}
           Server_Port 80
-          Stream $NAMESPACE
-          Exclude_Namespaces kube-system, default
+          Stream {{ .Values.serverStream }}
+          Exclude_Namespaces {{ .Values.excludeNamespaces }}
 
       [OUTPUT]
           Name parseable
           Match k8s_events
           Server_Host {{ .Values.serverHost }}
           Server_Port 80
-          Username admin
-          Password admin
+          Username {{ .Values.serverUsername }}
+          Password {{ .Values.serverPassword }}
           Stream k8s-events 
 
     upstream: {}

From a921c4e131ce9305a0baab3aa347ad3dac5dd000 Mon Sep 17 00:00:00 2001
From: AdheipSingh <adheip1222@gmail.com>
Date: Thu, 19 Dec 2024 15:02:47 +0530
Subject: [PATCH 2/2] revert gcs store

---
 helm/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/values.yaml b/helm/values.yaml
index 713a68892..1f8c2f5cf 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -116,7 +116,7 @@ parseable:
           - s3.bucket
           - s3.region
   gcsModeSecret:
-    enabled: true
+    enabled: false
     secrets:
       - name: parseable-env-secret
         prefix: P_