Skip to content

Commit

Permalink
fix: update fluentd config for v3 k8s metadata filter compatibility
Browse files Browse the repository at this point in the history
fluent-plugin-kubernetes_metadata_filter v3 made some breaking changes.
The one that affects our config is the removal of automatic de-dot
functionality. So this change updates the config to match the new
behaviour.

See this PR for details:
fabric8io/fluent-plugin-kubernetes_metadata_filter#347
  • Loading branch information
smlx committed Nov 29, 2022
1 parent 428577f commit 3045c38
Showing 1 changed file with 3 additions and 3 deletions.
Expand Up @@ -346,7 +346,7 @@ data:
<filter lagoon.*.container>
@type record_modifier
<record>
index_name container-logs-${record.dig('kubernetes','namespace_labels','lagoon_sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon_sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
index_name container-logs-${record.dig('kubernetes','namespace_labels','lagoon.sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon.sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
log ${record['log'] || ""}
</record>
</filter>
Expand All @@ -356,7 +356,7 @@ data:
<filter lagoon.*.application>
@type record_modifier
<record>
index_name application-logs-${record.dig('kubernetes','namespace_labels','lagoon_sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon_sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
index_name application-logs-${record.dig('kubernetes','namespace_labels','lagoon.sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon.sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
</record>
</filter>
#
Expand All @@ -365,7 +365,7 @@ data:
<filter lagoon.*.router.**>
@type record_modifier
<record>
index_name router-logs-${record.dig('kubernetes','namespace_labels','lagoon_sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon_sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
index_name router-logs-${record.dig('kubernetes','namespace_labels','lagoon.sh/project')&.gsub("_", "-") || "#{record.dig('kubernetes','namespace_name') || 'unknown_project'}_#{ENV['CLUSTER_NAME']}"}-_-${record.dig('kubernetes','namespace_labels','lagoon.sh/environmentType') || "unknown_environmenttype"}-_-${Time.at(time).strftime("%Y.%m")}
</record>
</filter>
{{- if .Values.cdnLogsCollector.enabled }}
Expand Down

0 comments on commit 3045c38

Please sign in to comment.