From e1209446e37e3dc00714d60ab1d453d1c515a5b5 Mon Sep 17 00:00:00 2001
From: Schirrms <schirrms@schirrms.net>
Date: Thu, 8 Dec 2022 13:16:12 +0100
Subject: [PATCH] add 'include_timestamp true' in the elastic part of the
 configmap to actually get the timestamp in elasticsearch

---
 .../logging/fluentd/kubernetes/counter-err.yaml    | 14 ++++++++++++++
 .../fluentd/kubernetes/dockerfiles/dockerfile      |  4 +++-
 .../fluentd/kubernetes/fluentd-configmap.yaml      |  5 +++--
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 monitoring/logging/fluentd/kubernetes/counter-err.yaml

diff --git a/monitoring/logging/fluentd/kubernetes/counter-err.yaml b/monitoring/logging/fluentd/kubernetes/counter-err.yaml
new file mode 100644
index 0000000..be19daf
--- /dev/null
+++ b/monitoring/logging/fluentd/kubernetes/counter-err.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: counter-err
+  labels:
+    app: counter-err
+    version: v1.2
+spec:
+  containers:
+  - name: count
+    image: busybox
+    args: [/bin/sh, -c,
+            'i=0; RANDOM=$$; while true; do R=$(($RANDOM%100)); echo "loop:$i  value:$R"; if [ $R -gt 80 ]; then echo "Warning:$R too high" 1>&2; fi; i=$((i+1)); sleep 1; done']
diff --git a/monitoring/logging/fluentd/kubernetes/dockerfiles/dockerfile b/monitoring/logging/fluentd/kubernetes/dockerfiles/dockerfile
index 9d9e135..8d19789 100644
--- a/monitoring/logging/fluentd/kubernetes/dockerfiles/dockerfile
+++ b/monitoring/logging/fluentd/kubernetes/dockerfiles/dockerfile
@@ -33,10 +33,12 @@ RUN touch /fluentd/etc/disable.conf
 # Copy plugins
 COPY plugins /fluentd/plugins/
 COPY entrypoint.sh /fluentd/entrypoint.sh
+# chmod needed in full Linux env :)
+RUN chmod 755 /fluentd/entrypoint.sh
 
 # Environment variables
 ENV FLUENTD_OPT=""
 ENV FLUENTD_CONF="fluent.conf"
 
 # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib
-ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"]
diff --git a/monitoring/logging/fluentd/kubernetes/fluentd-configmap.yaml b/monitoring/logging/fluentd/kubernetes/fluentd-configmap.yaml
index 027aa7e..3e92c69 100644
--- a/monitoring/logging/fluentd/kubernetes/fluentd-configmap.yaml
+++ b/monitoring/logging/fluentd/kubernetes/fluentd-configmap.yaml
@@ -51,7 +51,7 @@ data:
       <parse>
         @type kubernetes
         @type "#{ENV['FLUENT_CONTAINER_TAIL_PARSER_TYPE'] || 'json'}"
-        time_format %Y-%m-%dT%H:%M:%S.%NZ
+        time_format "%Y-%m-%dT%H:%M:%S.%NZ"
       </parse>
     </source>
 
@@ -78,4 +78,5 @@ data:
       port "#{ENV['FLUENT_ELASTICSEARCH_PORT'] || '9200'}"
       index_name fluentd-k8s
       type_name fluentd
-    </match>
\ No newline at end of file
+      include_timestamp true
+    </match>