Skip to content

Commit 61d1b51

Browse files
authored
fix bug as we now introduced AZMON_WINDOWS_FLUENT_BIT_ENABLED, if AZMON_WINDOWS_FLUENT_BIT_ENABLED is true we don't need to enable rs collection win (#1379)
1 parent 972b034 commit 61d1b51

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kubernetes/linux/main.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,8 +1065,8 @@ if [ ! -f /etc/cron.d/ci-agent ]; then
10651065
echo "*/5 * * * * root /usr/sbin/logrotate -s /var/lib/logrotate/ci-agent-status /etc/logrotate.d/ci-agent >/dev/null 2>&1" >/etc/cron.d/ci-agent
10661066
fi
10671067

1068-
setGlobalEnvVar AZMON_RESOURCE_OPTIMIZATION_ENABLED "${AZMON_RESOURCE_OPTIMIZATION_ENABLED}"
1069-
if [ "${AZMON_RESOURCE_OPTIMIZATION_ENABLED}" == "false" ] || [ -z "${AZMON_RESOURCE_OPTIMIZATION_ENABLED}" ] || [ "${USING_AAD_MSI_AUTH}" != "true" ] || [ "${RS_GENEVA_LOGS_INTEGRATION}" == "true" ]; then
1068+
setGlobalEnvVar AZMON_WINDOWS_FLUENT_BIT_ENABLED "${AZMON_WINDOWS_FLUENT_BIT_ENABLED}"
1069+
if [ "${AZMON_WINDOWS_FLUENT_BIT_ENABLED}" == "false" ] || [ -z "${AZMON_WINDOWS_FLUENT_BIT_ENABLED}" ] || [ "${USING_AAD_MSI_AUTH}" != "true" ] || [ "${RS_GENEVA_LOGS_INTEGRATION}" == "true" ]; then
10701070
if [ -e "/etc/config/kube.conf" ]; then
10711071
# Replace a string in the configmap file
10721072
sed -i "s/#@include windows_rs/@include windows_rs/g" /etc/fluent/kube.conf

0 commit comments

Comments
 (0)