Skip to content

fix 2 windows tasks #482

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

Merged
vishiy merged 1 commit into from
Jan 6, 2021
Merged

fix 2 windows tasks #482

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
2 changes: 1 addition & 1 deletion build/common/installer/scripts/tomlparser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def get_command_windows(env_variable_name, env_variable_value)
file.write(commands)
commands = get_command_windows('AZMON_CLUSTER_COLLECT_ALL_KUBE_EVENTS', @collectAllKubeEvents)
file.write(commands)
commands = get_command_windows('AZMON_CONTAINER_LOGS_ROUTE', @containerLogsRoute)
commands = get_command_windows('AZMON_CONTAINER_LOGS_EFFECTIVE_ROUTE', @containerLogsRoute)
file.write(commands)

# Close file after writing all environment variables
Expand Down
24 changes: 8 additions & 16 deletions build/windows/installer/scripts/livenessprobe.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,32 @@
echo "Checking if fluent-bit is running"
REM "Checking if fluent-bit is running"

tasklist /fi "imagename eq fluent-bit.exe" /fo "table" | findstr fluent-bit

IF ERRORLEVEL 1 (
echo "Fluent-Bit is not running" > /dev/termination-log
echo "Fluent-Bit is not running"
exit /b 1
) ELSE (
echo "Fluent-Bit is running"
)

echo "Checking if config map has been updated since agent start"
REM "Checking if config map has been updated since agent start"

IF EXIST C:\etc\omsagentwindows\filesystemwatcher.txt (
echo "Config Map Updated since agent started" > /dev/termination-log
echo "Config Map Updated since agent started"
exit /b 1
) ELSE (
echo "Config Map not Updated since agent start"
)

echo "Checking if certificate needs to be renewed (aka agent restart required)"
REM "Checking if certificate needs to be renewed (aka agent restart required)"

IF EXIST C:\etc\omsagentwindows\renewcertificate.txt (
echo "Certificate needs to be renewed" > /dev/termination-log
echo "Certificate needs to be renewed"
exit /b 1
) ELSE (
echo "Certificate does NOT need to be renewd"
)

echo "Checking if fluentd service is running"
REM "Checking if fluentd service is running"
sc query fluentdwinaks | findstr /i STATE | findstr RUNNING

IF ERRORLEVEL 1 (
echo "Fluentd Service is NOT Running" > /dev/termination-log
echo "Fluentd Service is NOT Running"
exit /b 1
) ELSE (
echo "Fluentd Service is Running"
)

exit /b 0
Expand Down