From 447b4cdbe6c01b45e2cb8965f3c18b43524208d7 Mon Sep 17 00:00:00 2001
From: Hiroshi Hatake <cosmo0920.oucc@gmail.com>
Date: Thu, 2 Jan 2020 11:33:12 +0900
Subject: [PATCH] Add TimeZone parameter in docker and helm configurations

---
 docker/configmap.yaml                    | 1 +
 docker/fluent-bit-s3.conf                | 1 +
 helm/README.md                           | 1 +
 helm/fluent-bit/templates/configmap.yaml | 1 +
 helm/fluent-bit/values.yaml              | 1 +
 5 files changed, 5 insertions(+)

diff --git a/docker/configmap.yaml b/docker/configmap.yaml
index fff81e9..5ca2a32 100644
--- a/docker/configmap.yaml
+++ b/docker/configmap.yaml
@@ -59,3 +59,4 @@ data:
         Compress gzip
         AutoCreateBucket true
         LogLevel info
+        TimeZone Asia/Tokyo
diff --git a/docker/fluent-bit-s3.conf b/docker/fluent-bit-s3.conf
index e71e402..423fad8 100644
--- a/docker/fluent-bit-s3.conf
+++ b/docker/fluent-bit-s3.conf
@@ -46,3 +46,4 @@
     Bucket          ${FLUENT_BIT_BUCKET_NAME}
     S3Prefix        ${FLUENT_BIT_S3_PREFIX}
     Region          ${FLUENT_BIT_REGION}
+    # TimeZone       Asia/Tokyo
diff --git a/helm/README.md b/helm/README.md
index 3787728..b142714 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -33,5 +33,6 @@ The following table lists the configurable parameters of the Fluent-Bit chart an
 | `s3.compress`           | Whether compress with gzip or not   | `gzip`                  |
 | `s3.autoCreateBucket`   | Whether auto creating bucket or not | `true`                  |
 | `s3.logLevel`           | Specify logLevel                    | `info`                  |
+| `s3.timeZone`           | Specify TimeZone                    | `Asia/Tokyo`            |
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/helm/fluent-bit/templates/configmap.yaml b/helm/fluent-bit/templates/configmap.yaml
index 4eb68bc..776e05e 100644
--- a/helm/fluent-bit/templates/configmap.yaml
+++ b/helm/fluent-bit/templates/configmap.yaml
@@ -58,3 +58,4 @@ data:
         Compress  {{ .Values.s3.compress }}
         AutoCreateBucket  {{ .Values.s3.autoCreateBucket }}
         LogLevel  {{ .Values.s3.logLevel }}
+        TimeZone  {{ .Values.s3.timeZone }}
diff --git a/helm/fluent-bit/values.yaml b/helm/fluent-bit/values.yaml
index 2a6a392..d6d97b6 100644
--- a/helm/fluent-bit/values.yaml
+++ b/helm/fluent-bit/values.yaml
@@ -62,3 +62,4 @@ s3:
   compress: gzip
   autoCreateBucket: true
   logLevel: info
+  timeZone: "Asia/Tokyo"