Merge pull request #86 from dasmeta/DMVP-3064-fluent-bit-log-group

fix(DMVP-3064): fixed fluent-bit bugs
dasmeta · Nov 10, 2023 · 6e422b2 · 6e422b2
2 parents 15bbc37 + c8decd9
commit 6e422b2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/modules/adot/tests/template_file/README.md b/modules/adot/tests/template_file/README.md
@@ -12,7 +12,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.9.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | n/a |
 | <a name="provider_test"></a> [test](#provider\_test) | n/a |
 
 ## Modules

diff --git a/modules/fluent-bit/iam-policy.json b/modules/fluent-bit/iam-policy.json
@@ -1,26 +1,27 @@
 {
-  "Version": "2012-10-17",
-  "Statement": [
-      {
-          "Effect": "Allow",
-          "Action": [
-              "cloudwatch:PutMetricData",
-              "ec2:DescribeVolumes",
-              "ec2:DescribeTags",
-              "logs:PutLogEvents",
-              "logs:DescribeLogStreams",
-              "logs:DescribeLogGroups",
-              "logs:CreateLogStream",
-              "logs:CreateLogGroup"
-          ],
-          "Resource": "*"
-      },
-      {
-          "Effect": "Allow",
-          "Action": [
-              "ssm:GetParameter"
-          ],
-          "Resource": "arn:aws:ssm:*:*:parameter/AmazonCloudWatch-*"
-      }
-  ]
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "cloudwatch:PutMetricData",
+                "ec2:DescribeVolumes",
+                "ec2:DescribeTags",
+                "logs:PutLogEvents",
+                "logs:DescribeLogStreams",
+                "logs:DescribeLogGroups",
+                "logs:CreateLogStream",
+                "logs:CreateLogGroup",
+                "logs:putRetentionPolicy"
+            ],
+            "Resource": "*"
+        },
+        {
+            "Effect": "Allow",
+            "Action": [
+                "ssm:GetParameter"
+            ],
+            "Resource": "arn:aws:ssm:*:*:parameter/AmazonCloudWatch-*"
+        }
+    ]
 }
diff --git a/modules/fluent-bit/values.yaml.tpl b/modules/fluent-bit/values.yaml.tpl
@@ -68,7 +68,7 @@ config:
         region ${region}
         log_group_name ${system_log_group_name}
         log_stream_prefix eks-
-        auto_create_group Off
+        auto_create_group ${auto_create_group}
         log_retention_days ${log_retention_days}
 
     [OUTPUT]