Skip to content

Commit e803e34

Browse files
authored
fix: Fixing fargate-fluentbit configMap to parse logs correctly (#418)
1 parent 5a91f14 commit e803e34

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

main.tf

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,13 +2585,12 @@ resource "kubernetes_config_map_v1" "aws_logging" {
25852585
var.fargate_fluentbit.parsers_conf,
25862586
<<-EOT
25872587
[PARSER]
2588-
Name regex
2589-
Format regex
2590-
Regex ^(?<time>[^ ]+) (?<stream>[^ ]+) (?<logtag>[^ ]+) (?<message>.+)$
2591-
Time_Key time
2588+
Name crio
2589+
Format Regex
2590+
Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>P|F) (?<log>.*)$
2591+
Time_Key time
25922592
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
25932593
Time_Keep On
2594-
Decode_Field_As json message
25952594
EOT
25962595
)
25972596
"filters.conf" = try(
@@ -2600,22 +2599,35 @@ resource "kubernetes_config_map_v1" "aws_logging" {
26002599
[FILTER]
26012600
Name parser
26022601
Match *
2603-
Key_Name log
2604-
Parser regex
2605-
Preserve_Key True
2606-
Reserve_Data True
2602+
Key_name log
2603+
Parser crio
2604+
[FILTER]
2605+
Name kubernetes
2606+
Match kube.*
2607+
Merge_Log On
2608+
Keep_Log Off
2609+
Buffer_Size 0
2610+
Kube_Meta_Cache_TTL 300s
26072611
EOT
26082612
)
26092613
"output.conf" = try(
26102614
var.fargate_fluentbit.output_conf,
26112615
<<-EOT
2612-
[OUTPUT]
2616+
[OUTPUT]
2617+
Name cloudwatch
2618+
Match kube.*
2619+
region ${local.region}
2620+
log_group_name ${try(var.fargate_fluentbit.cwlog_group, aws_cloudwatch_log_group.fargate_fluentbit[0].name)}
2621+
log_stream_prefix ${local.fargate_fluentbit_cwlog_stream_prefix}
2622+
auto_create_group true
2623+
[OUTPUT]
26132624
Name cloudwatch_logs
26142625
Match *
26152626
region ${local.region}
26162627
log_group_name ${try(var.fargate_fluentbit.cwlog_group, aws_cloudwatch_log_group.fargate_fluentbit[0].name)}
2617-
log_stream_prefix ${local.fargate_fluentbit_cwlog_stream_prefix}
2628+
log_stream_prefix fargate-logs-fluent-bit-
26182629
auto_create_group true
2630+
26192631
EOT
26202632
)
26212633
"flb_log_cw" = try(var.fargate_fluentbit.flb_log_cw, false)

0 commit comments

Comments
 (0)