Update windows_fluent_bit default to disable #1201
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pfrcks
reviewed
Mar 11, 2024
|
can we test these changes with the yaml changes? you can copy the changes to the backdoor ama-logs.yaml you might be using https://msazure.visualstudio.com/CloudNativeCompute/_git/aks-rp/pullrequest/9685117?path=/ccp/charts/kube-control-plane/charts/kube-addons/templates/addons/partner-addons/_omsagent.yaml&_a=files |
pfrcks
approved these changes
Mar 12, 2024
jatakiajanvi12
added a commit
that referenced
this pull request
Apr 15, 2024
* Update the default to disable * Update to use rs for no value of env as well --------- Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>
jatakiajanvi12
added a commit
that referenced
this pull request
Apr 15, 2024
* Update the default to disable * Update to use rs for no value of env as well --------- Co-authored-by: Janvi Jatakia (from Dev Box) <jajataki@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request primarily modifies the handling of the
windows_fluent_bit_disabledvariable in various scripts. The changes primarily involve reversing the logic for this variable, which changes the default behavior of the system.Here are the key changes:
Changes to default values and conditions:
build/common/installer/scripts/tomlparser-agent-config.rb: The default value ofwindows_fluent_bit_disabledis changed fromfalsetotrue. This means that by default, Fluent Bit is disabled on Windows.build/common/installer/scripts/fluent-bit-conf-customizer.rb: The condition forwindows_fluent_bit_disabledin thesubstituteFluentBitPlaceHoldersmethod is adjusted. Now, resource optimization substitution only occurs if Fluent Bit is explicitly enabled on Windows.Changes to value assignment:
build/common/installer/scripts/tomlparser-agent-config.rb: In thepopulateSettingValuesFromConfigMapmethod, the assignment ofwindows_fluent_bit_disabledis reversed. Now,windows_fluent_bit_disabledis set tofalseonly if the parsed configuration explicitly sets it tofalse.Changes to output:
build/common/installer/scripts/tomlparser-agent-config.rb: The conditions for writing theAZMON_WINDOWS_FLUENT_BIT_DISABLEDenvironment variable in thepopulateSettingValuesFromConfigMapandget_command_windowsmethods are reversed. Now, the environment variable is written only if Fluent Bit is not disabled. [1] [2]Changes to configuration:
kubernetes/container-azm-ms-agentconfig.yaml: The commented-out configuration fordisabledunderagent_settings.windows_fluent_bitis changed from"false"to"true". This suggests a recommended change in configuration for users who wish to modify this setting.Changes to script logic:
kubernetes/linux/main.sh: The condition for a block of code is modified to also execute ifAZMON_WINDOWS_FLUENT_BIT_DISABLEDis not set. This ensures that the block of code will execute by default, unless the user explicitly disables Fluent Bit.