Merge pull request #33 from kabisa/upgrade/switch-to-new-CloudWatchLogs-collector

Upgrade/switch to new cloud watch logs collector

Author: Glaaj

README.md

@@ -66,6 +66,7 @@ No modules.
 | <a name="input_eks_cluster_name"></a> [eks\_cluster\_name](#input\_eks\_cluster\_name) | Name of the EKS cluster | `string` | n/a | yes |
 | <a name="input_enable_cloudwatch_agent"></a> [enable\_cloudwatch\_agent](#input\_enable\_cloudwatch\_agent) | Boolean to enable cloudwatch agent | `bool` | n/a | yes |
 | <a name="input_enable_fluentbit"></a> [enable\_fluentbit](#input\_enable\_fluentbit) | Boolean to enable fluentbit | `bool` | n/a | yes |
+| <a name="input_fluentbit_full_log"></a> [fluentbit\_full\_log](#input\_fluentbit\_full\_log) | Boolean to output full pod/container logs + kubernetes metadata or just the message | `bool` | n/a | yes |
 | <a name="input_log_preserve_legacy_log_group"></a> [log\_preserve\_legacy\_log\_group](#input\_log\_preserve\_legacy\_log\_group) | When true, preserves the legacy log group. Mainly useful to transition to the new log group format | `bool` | `true` | no |
 | <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | Number of days to retain log events | `number` | `90` | no |
 | <a name="input_oidc_host_path"></a> [oidc\_host\_path](#input\_oidc\_host\_path) | n/a | `string` | n/a | yes |

cloudwatch_agent.tf

@@ -64,7 +64,7 @@ resource "helm_release" "cloudwatch-agent" {
   repository = "https://aws.github.io/eks-charts"
   chart      = "aws-cloudwatch-metrics"
   version    = "0.0.10"
-  # appVersion: 1.247350.0b251780
+  # appVersion: 1.300032.2b361
 
   values = [
     templatefile(

fluentbit.tf

@@ -61,7 +61,7 @@ resource "helm_release" "fluentbit" {
   repository = "https://aws.github.io/eks-charts"
   chart      = "aws-for-fluent-bit"
   version    = "0.1.32"
-  # appVersion: v2.21.5
+  # appVersion: 2.31.12.20231011
 
   values = [
     templatefile(
@@ -71,6 +71,7 @@ resource "helm_release" "fluentbit" {
         iam_role_arn          = aws_iam_role.fluentbit[0].arn
         cluster_name          = var.eks_cluster_name
         log_retention_in_days = var.log_retention_in_days
+        full_log              = var.fluentbit_full_log ? "" : "log"
       }
     )
   ]

variables.tf

@@ -22,6 +22,11 @@ variable "enable_fluentbit" {
   description = "Boolean to enable fluentbit"
 }
 
+variable "fluentbit_full_log" {
+  type        = bool
+  description = "Boolean to output full pod/container logs + kubernetes metadata or just the message"
+}
+
 variable "eks_cluster_name" {
   type        = string
   description = "Name of the EKS cluster"