Skip to content

Commit bdd1237

Browse files
Revert fluent-bit version due to multiline issue cpu in windows pod (#1160)
* revert fluent-bit version due to multiline issue cpu in windows pod * fix the geneva logs multi-tenancy regression in legacy mode (#1161) --------- Co-authored-by: Ganga Mahesh Siddem <gangams@microsoft.com>
1 parent 0aa2290 commit bdd1237

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

kubernetes/windows/main.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,19 @@ if (![string]::IsNullOrEmpty($requiresCertBootstrap) -and `
857857

858858
$isAADMSIAuth = [System.Environment]::GetEnvironmentVariable("USING_AAD_MSI_AUTH")
859859
$isGenevaModeVar = IsGenevaMode
860-
# Geneva mode supported on both AAD MSI Auth and Cert Auth
860+
861861
if ($isGenevaModeVar) {
862862
Write-Host "Starting Windows AMA in 1P Mode"
863863
#start Windows AMA
864864
Start-Job -ScriptBlock { Start-Process -NoNewWindow -FilePath "C:\opt\windowsazuremonitoragent\windowsazuremonitoragent\Monitoring\Agent\MonAgentLauncher.exe" -ArgumentList @("-useenv")}
865+
if (![string]::IsNullOrEmpty($isAADMSIAuth) -and $isAADMSIAuth.ToLower() -eq 'true') {
866+
Write-Host "skipping agent onboarding via cert since AAD MSI Auth configured"
867+
}
868+
else {
869+
Write-Host "Starting Windows in Cert Auth Mode"
870+
Generate-Certificates
871+
Test-CertificatePath
872+
}
865873
}
866874
else {
867875
if (![string]::IsNullOrEmpty($isAADMSIAuth) -and $isAADMSIAuth.ToLower() -eq 'true') {
@@ -877,7 +885,7 @@ else {
877885
Generate-Certificates
878886
Test-CertificatePath
879887
}
880-
}
888+
}
881889

882890

883891
Start-Fluent-Telegraf

kubernetes/windows/setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Write-Host ('Creating folder structure')
2323
Write-Host ('Installing Fluent Bit');
2424

2525
try {
26-
$fluentBitUri='https://releases.fluentbit.io/2.2/fluent-bit-2.2.1-win64.zip'
26+
$fluentBitUri='https://fluentbit.io/releases/2.0/fluent-bit-2.0.14-win64.zip'
2727
Invoke-WebRequest -Uri $fluentBitUri -OutFile /installation/fluent-bit.zip
2828
Expand-Archive -Path /installation/fluent-bit.zip -Destination /installation/fluent-bit
2929
Move-Item -Path /installation/fluent-bit/*/* -Destination /opt/fluent-bit/ -ErrorAction SilentlyContinue

0 commit comments

Comments
 (0)