github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102024 from jeremyje/upgradefb

Browse Source 
GCE Windows: Fix Fluent-bit crashloop on Windows Event Log Ingestion
This commit is contained in:
Kubernetes Prow Robot 2021-05-18 19:14:50 -07:00 committed by GitHub
commit 75ec50bc10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -1653,7 +1653,7 @@ function Install-Pigz {
# TODO(pjh): move the logging agent code below into a separate # TODO(pjh): move the logging agent code below into a separate
# module; it was put here temporarily to avoid disrupting the file layout in # module; it was put here temporarily to avoid disrupting the file layout in
# the K8s release machinery. # the K8s release machinery.
$LOGGINGAGENT_VERSION = '1.7.3' $LOGGINGAGENT_VERSION = '1.7.5'
$LOGGINGAGENT_ROOT = 'C:\fluent-bit' $LOGGINGAGENT_ROOT = 'C:\fluent-bit'
$LOGGINGAGENT_SERVICE = 'fluent-bit' $LOGGINGAGENT_SERVICE = 'fluent-bit'
$LOGGINGAGENT_CMDLINE = '*fluent-bit.exe*' $LOGGINGAGENT_CMDLINE = '*fluent-bit.exe*'
@ -1876,7 +1876,7 @@ $FLUENTBIT_CONFIG = @'
Interval_Sec 2 Interval_Sec 2
# Channels Setup,Windows PowerShell # Channels Setup,Windows PowerShell
Channels application,system,security Channels application,system,security
Tag winevent.raw Tag winevt.raw
DB /var/run/google-fluentbit/pos-files/winlog.db DB /var/run/google-fluentbit/pos-files/winlog.db
# Json Log Example: # Json Log Example:
@ -1959,6 +1959,11 @@ $FLUENTBIT_CONFIG = @'
Match * Match *
Hard_rename log message Hard_rename log message
[FILTER]
Name modify
Match winevt.raw
Hard_rename Message message
[FILTER] [FILTER]
Name parser Name parser
Match kube_* Match kube_*