Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make multiline filter first in pipeline #1151

Merged
merged 1 commit into from
Feb 23, 2024
Merged

make multiline filter first in pipeline #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions build/linux/installer/conf/fluent-bit-geneva.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
Log_Level info
Parsers_File /etc/opt/microsoft/docker-cimprov/azm-containers-parser.conf
Log_File /var/opt/microsoft/docker-cimprov/log/fluent-bit-geneva.log
@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-geneva-logs_*.conf
@INCLUDE fluent-bit-internal-metrics.conf

#NOTE: Multiline should be the first filter https://docs.fluentbit.io/manual/pipeline/filters/multiline-stacktrace
#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match geneva.container.log.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}

[FILTER]
Name grep
Expand All @@ -29,8 +33,6 @@
Record Computer ${HOSTNAME}
Record AzureResourceId ${AKS_RESOURCE_ID}

#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match geneva.container.log.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}
@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-geneva-logs_*.conf
@INCLUDE fluent-bit-internal-metrics.conf
17 changes: 9 additions & 8 deletions build/linux/installer/conf/fluent-bit.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
Parsers_File /etc/opt/microsoft/docker-cimprov/azm-containers-parser.conf
Log_File /var/opt/microsoft/docker-cimprov/log/fluent-bit.log

@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-internal-metrics.conf

[INPUT]
Name tail
Alias oms_tail
Expand All @@ -33,14 +30,18 @@
${TAIL_IGNORE_OLDER}
Exclude_Path ${AZMON_CLUSTER_LOG_TAIL_EXCLUDE_PATH}

#NOTE: Multiline should be the first filter https://docs.fluentbit.io/manual/pipeline/filters/multiline-stacktrace
#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match oms.container.log.la.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}

[FILTER]
Name grep
Alias oms_filter
Match oms.container.log.la.*
Exclude stream ${AZMON_LOG_EXCLUSION_REGEX_PATTERN}

#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match oms.container.log.la.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}
@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-internal-metrics.conf
17 changes: 9 additions & 8 deletions build/windows/installer/conf/fluent-bit-geneva.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
Parsers_File /etc/fluent-bit/azm-containers-parser.conf
Log_File /etc/fluent-bit/fluent-bit-geneva.log

@INCLUDE C:\\etc\fluent-bit\\fluent-bit-common.conf
@INCLUDE C:\\etc\fluent-bit\\fluent-bit-geneva-logs_*.conf
@INCLUDE C:\\etc\fluent-bit\\fluent-bit-internal-metrics.conf
#NOTE: Multiline should be the first filter https://docs.fluentbit.io/manual/pipeline/filters/multiline-stacktrace
#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match geneva.container.log.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}

[FILTER]
Name grep
Expand All @@ -27,8 +30,6 @@
Record Computer ${HOSTNAME}
Record AzureResourceId ${AKS_RESOURCE_ID}

#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match geneva.container.log.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}
@INCLUDE C:\\etc\fluent-bit\\fluent-bit-common.conf
@INCLUDE C:\\etc\fluent-bit\\fluent-bit-geneva-logs_*.conf
@INCLUDE C:\\etc\fluent-bit\\fluent-bit-internal-metrics.conf
16 changes: 8 additions & 8 deletions build/windows/installer/conf/fluent-bit.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
Parsers_File /etc/fluent-bit/azm-containers-parser.conf
Log_File /etc/fluent-bit/fluent-bit.log

@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-internal-metrics.conf

[INPUT]
Name tail
Alias oms_tail
Expand All @@ -32,14 +29,17 @@
${TAIL_IGNORE_OLDER}
Exclude_Path ${AZMON_CLUSTER_LOG_TAIL_EXCLUDE_PATH}

#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match oms.container.log.la.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}

[FILTER]
Name grep
Alias oms_filter
Match oms.container.log.la.*
Exclude stream ${AZMON_LOG_EXCLUSION_REGEX_PATTERN}

#${MultilineEnabled}[FILTER]
#${MultilineEnabled} Name multiline
#${MultilineEnabled} Match oms.container.log.la.*
#${MultilineEnabled} multiline.key_content log
#${MultilineEnabled} multiline.parser #${MultilineLanguages}
@INCLUDE fluent-bit-common.conf
@INCLUDE fluent-bit-internal-metrics.conf
Loading