feature: support logstashPrefix to ClusterOutput (fluent#268)

* feature: support `logstashPrefix` to ClusterOutput Signed-off-by: mango <xu.weiKyrie@foxmail.com>
wenchajun · Apr 25, 2022 · 9ece3a7 · 9ece3a7
1 parent 8a06643
commit 9ece3a7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml
@@ -12,9 +12,31 @@ spec:
   es:
     host: {{ .Values.fluentbit.output.es.host }}
     port: {{ .Values.fluentbit.output.es.port }}
+{{- if .Values.fluentbit.output.es.path }}
+    path: {{ .Values.fluentbit.output.es.path }}
+{{- end }}
+{{- if .Values.fluentbit.output.es.bufferSize }}
+    bufferSize: {{ .Values.fluentbit.output.es.bufferSize }}
+{{- end }}
+{{- if .Values.fluentbit.output.es.index }}
+    index: {{ .Values.fluentbit.output.es.index }}
+{{- end }}
+{{- if .Values.fluentbit.output.es.httpUser }}
+    httpUser:
+{{ toYaml .Values.fluentbit.output.es.httpUser | indent 6 }}
+{{- end }}
+{{- if .Values.fluentbit.output.es.httpPassword }}
+    httpPassword:
+{{ toYaml .Values.fluentbit.output.es.httpPassword | indent 6 }}
+{{- end }}
+    logstashFormat: {{ .Values.fluentbit.output.es.logstashFormat | default true }}
+    logstashPrefix: {{ .Values.fluentbit.output.es.logstashPrefix | default "ks-logstash-log" | quote }}
+    replaceDots: {{ .Values.fluentbit.output.es.replaceDots | default false }}
     generateID: true
-    logstashPrefix: ks-logstash-log
-    logstashFormat: true
     timeKey: "@timestamp"
+{{- if .Values.fluentbit.output.es.enableTLS }}
+    tls:
+{{ toYaml .Values.fluentbit.output.es.tls | indent 6 }}
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -64,6 +64,23 @@ fluentbit:
       host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>"
       port: 9200
       logstashPrefix: ks-logstash-log
+#      path: ""
+#      bufferSize: "4KB"
+#      index: "fluent-bit"
+#      httpUser:
+#      httpPassword:
+#      logstashFormat: true
+#      replaceDots: false
+#      enableTLS: false
+#      tls:
+#        verify: On
+#        debug: 1
+#        caFile: "<Absolute path to CA certificate file>"
+#        caPath: "<Absolute path to scan for certificate files>"
+#        crtFile: "<Absolute path to private Key file>"
+#        keyFile: "<Absolute path to private Key file>"
+#        keyPassword:
+#        vhost: "<Hostname to be used for TLS SNI extension>"
     kafka:
       enable: false
       brokers: "<kafka broker list like xxx.xxx.xxx.xxx:9092,yyy.yyy.yyy.yyy:9092>"