From bdf034276a069b801c42dc09ab99cbc13d2d1963 Mon Sep 17 00:00:00 2001
From: Rob Brackett <rob@robbrackett.com>
Date: Wed, 15 Feb 2023 17:06:48 -0800
Subject: [PATCH] Fix fluentd logging configuration

Note: this also required updating permissions in the role for our cluster nodes in the IAM console.
---
 .../kube-system/fluentd/fluentd.cloudwatch.yaml      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/kubernetes/kube-system/fluentd/fluentd.cloudwatch.yaml b/kubernetes/kube-system/fluentd/fluentd.cloudwatch.yaml
index e422cae..f6d575f 100644
--- a/kubernetes/kube-system/fluentd/fluentd.cloudwatch.yaml
+++ b/kubernetes/kube-system/fluentd/fluentd.cloudwatch.yaml
@@ -27,7 +27,7 @@ metadata:
   namespace: kube-system
 
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: fluentd
@@ -45,7 +45,7 @@ rules:
 
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fluentd
 roleRef:
@@ -100,6 +100,14 @@ spec:
           # EDGI: TODO: are these still needed? Not sure where they are used.
           - name: FLUENT_UID
             value: "0"
+          # EDGI: custom exclude path and parser to work around matching errors
+          # (both `_EXCLUDE_PATH` and `_PARSER_TYPE` below)
+          # https://github.com/fluent/fluentd-kubernetes-daemonset/issues/434
+          - name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
+            value: /var/log/containers/fluent*
+          - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
+            # value: /^(?<time>.+) (?<stream>stdout|stderr)( (?<logtag>.))? (?<log>.*)$/
+            value: cri
           - name: K8S_NODE_NAME
             valueFrom:
               fieldRef: