Merge pull request #245 from zhu733756/master

chart: add kafka/es buffer
fluent · Mar 23, 2022 · dc48697 · dc48697
2 parents 323c7b8 + f5ce114
commit dc48697
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/charts/fluent-operator/templates/fluentd-output-buffer-example.yaml b/charts/fluent-operator/templates/fluentd-output-buffer-example.yaml
diff --git a/charts/fluent-operator/templates/fluentd-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentd-output-elasticsearch.yaml
@@ -14,6 +14,11 @@ spec:
         port: {{ .Values.fluentd.output.es.port }}
         logstashFormat: true
         logstashPrefix: {{ .Values.fluentd.output.es.logstashPrefix }}
+      {{- if .Values.fluentd.output.es.buffer }}
+      buffer:
+        type: {{ .Values.fluentd.output.es.buffer.type }}
+        path: {{ .Values.fluentd.output.es.buffer.path }}
+      {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentd-output-kafka.yaml b/charts/fluent-operator/templates/fluentd-output-kafka.yaml
@@ -13,6 +13,11 @@ spec:
         brokers: {{.Values.fluentd.output.kafka.brokers }}
         useEventTime: true
         topicKey: {{.Values.fluentd.output.kafka.topicKey }}
+      {{- if .Values.fluentd.output.kafka.buffer }}
+      buffer:
+        type: {{ .Values.fluentd.output.kafka.buffer.type }}
+        path: {{ .Values.fluentd.output.kafka.buffer.path }}
+      {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -98,10 +98,18 @@ fluentd:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
       logstashPrefix: ks-logstash-log
+      buffer:
+        enable: false
+        type: file
+        path: /buffers/es
     kafka:
       enable: false
       brokers: "my-cluster-kafka-bootstrap.default.svc:9091,my-cluster-kafka-bootstrap.default.svc:9092,my-cluster-kafka-bootstrap.default.svc:9093"
       topicKey: kubernetes_ns
+      buffer:
+        enable: false
+        type: file
+        path: /buffers/kafka
 
 nameOverride: ""
 fullnameOverride: ""