finish

logzio · Mar 24, 2021 · f6d7eb7 · f6d7eb7
1 parent 89b89d8
commit f6d7eb7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/filebeat/README.md b/filebeat/README.md
@@ -103,7 +103,7 @@ logzio-k8s-logs logzio-helm/logzio-k8s-logs
 
 ```shell
 filebeatConfig:
-  customConfig:
+  customConfig: |-
     filebeat.autodiscover:
     #....
       # your autodiscover config

diff --git a/filebeat/templates/configmap.yaml b/filebeat/templates/configmap.yaml
@@ -24,8 +24,8 @@ metadata:
   labels:
     k8s-app: filebeat
 data:
-  # filebeat.yml: |-
-{{- if eq .Values.configType "standard" }}
+  {{- if eq .Values.configType "standard" }}
+  filebeat.yml: |-
     filebeat.inputs:
     - type: container
       paths:
@@ -52,7 +52,8 @@ data:
         hosts: ["${LOGZIO_LOGS_LISTENER_HOST}:5015"]
         ssl:
           certificate_authorities: ['/etc/pki/tls/certs/SectigoRSADomainValidationSecureServerCA.crt']
-{{- else if eq .Values.configType "autodiscover" }}
+  {{- else if eq .Values.configType "autodiscover" }}
+  filebeat.yml: |-
     filebeat.autodiscover:
       providers:
         - type: kubernetes
@@ -79,10 +80,8 @@ data:
         hosts: ["${LOGZIO_LOGS_LISTENER_HOST}:5015"]
         ssl:
           certificate_authorities: ['/etc/pki/tls/certs/SectigoRSADomainValidationSecureServerCA.crt']
-{{- else if eq .Values.configType "custom" }}
-  filebeat.yml: |-
-    {{- range $config := fromYaml .Values.filebeatConfig.customConfig }}
-      {{- toYaml $config | nindent 4 }}
-    {{- end }}
-{{- end }}
+  {{- else if eq .Values.configType "custom" }}
+  filebeat.yml:
+    {{- toYaml .Values.filebeatConfig.customConfig | nindent 4 }}
+  {{- end }}
 {{- end }}
diff --git a/filebeat/values.yaml b/filebeat/values.yaml
@@ -66,11 +66,7 @@ logzioCert:
 configType: standard
 
 filebeatConfig:
-  customConfig:
-    from-values: |-
-      hiri:
-        - biri
-        - hello
+  customConfig: ''
   extraFields:
     # environment: production
     # foo: bar