From 521c1467297e27befd06ec25261aa0c162e8347c Mon Sep 17 00:00:00 2001
From: Don Bowman <db@donbowman.ca>
Date: Tue, 23 Oct 2018 11:12:44 -0400
Subject: [PATCH] Add Replace_Dots option to fluent-bit elasticsearch output

This addresses https://github.com/fluent/fluent-bit/issues/854.
Make 'Replace_Dots' settable for fluent-bit elasticsearch
output, and default to 'On'.

Signed-off-by: Don Bowman <db@donbowman.ca>
---
 stable/fluent-bit/README.md             | 1 +
 stable/fluent-bit/templates/config.yaml | 1 +
 stable/fluent-bit/values.yaml           | 1 +
 3 files changed, 3 insertions(+)

diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md
index 0b49710456fd..bf27e9878b26 100644
--- a/stable/fluent-bit/README.md
+++ b/stable/fluent-bit/README.md
@@ -45,6 +45,7 @@ The following table lists the configurable parameters of the Fluent-Bit chart an
 | `backend.es.type`          | Elastic Type name | `flb_type` |
 | `backend.es.time_key`          | Elastic Time Key | `@timestamp` |
 | `backend.es.logstash_prefix`  | Index Prefix. If Logstash_Prefix is equals to 'mydata' your index will become 'mydata-YYYY.MM.DD'. | `kubernetes_cluster` |
+| `backend.es.replace_dots`        | Enable/Disable Replace_Dots option. | `on` |
 | `backend.es.http_user`        | Optional username credential for Elastic X-Pack access. | `` |
 | `backend.es.http_passwd:`     | Password for user defined in HTTP_User. | `` |
 | `backend.es.tls`              | Enable or disable TLS support | `off` |
diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml
index 3bd926e1c401..0c227e83f541 100644
--- a/stable/fluent-bit/templates/config.yaml
+++ b/stable/fluent-bit/templates/config.yaml
@@ -77,6 +77,7 @@ data:
         Host  {{ .Values.backend.es.host }}
         Port  {{ .Values.backend.es.port }}
         Logstash_Format On
+        Replace_Dots {{ .Values.backend.es.replace_dots }}
         Retry_Limit False
         Type  {{ .Values.backend.es.type }}
 {{- if .Values.backend.es.time_key }}
diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml
index 3e8e1f9f3ba5..686fc73b45ef 100644
--- a/stable/fluent-bit/values.yaml
+++ b/stable/fluent-bit/values.yaml
@@ -39,6 +39,7 @@ backend:
     index: kubernetes_cluster
     type: flb_type
     logstash_prefix: kubernetes_cluster
+    replace_dots: "on"
     time_key: "@timestamp"
     # Optional username credential for Elastic X-Pack access
     http_user: