Disable component based on logs profile #1141
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
Contributor
pfrcks
commented
Dec 19, 2023
pfrcks
commented
- Does not start fluentd and telegraf in DS if Logs and Events only profile set
- Updates livenessprobe to check for DCR updates and restart container if the logs profile changes
| @controllerType = ENV['CONTROLLER_TYPE'] | ||
| @containerType = ENV['CONTAINER_TYPE'] | ||
| @daemonset = 'daemonset' | ||
| @dcrConfigFileLocation = '/etc/mdsd.d/config-cache/configchunks/' |
There was a problem hiding this comment.
This one seems not used
| @os_type = ENV['OS_TYPE'] | ||
| @controllerType = ENV['CONTROLLER_TYPE'] | ||
| @containerType = ENV['CONTAINER_TYPE'] | ||
| @daemonset = 'daemonset' |
There was a problem hiding this comment.
if only reference once, might not need global var
There was a problem hiding this comment.
which one in specific are you referring?
| touch /dev/write-to-traces | ||
|
|
||
| if [ "${GENEVA_LOGS_INTEGRATION}" == "true" ] || [ "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" == "true" ]; then | ||
| checkAgentOnboardingStatus $AAD_MSI_AUTH_MODE 30 |
There was a problem hiding this comment.
line 938 and 940 is the same, the if condition can be combined
There was a problem hiding this comment.
this part of code is old i just moved it up.
| fluentd -c /etc/fluent/container.conf -o /var/opt/microsoft/docker-cimprov/log/fluentd.log --log-rotate-age 5 --log-rotate-size 20971520 & | ||
| if [ "$LOGS_AND_EVENTS_ONLY" != "true" ]; then | ||
| echo "*** starting fluentd v1 in daemonset" | ||
| fluentd -c /etc/fluent/container.conf -o /var/opt/microsoft/docker-cimprov/log/fluentd.log --log-rotate-age 5 --log-rotate-size 20971520 & |
There was a problem hiding this comment.
although this is in old code, but where is this 20971520 number coming from? Is it adjustable from configmap?
There was a problem hiding this comment.
i also dont know how this was picked. this part of code is quite old and its not configurable
wanlonghenry
approved these changes
Dec 19, 2023
pfrcks
added a commit
that referenced
this pull request
Jan 11, 2024
* disables fluentd and telegraf in linux ds if logs and events only profile enabled --------- Co-authored-by: Amol Agrawal <amagraw@microsoft.com>
pfrcks
added a commit
that referenced
this pull request
Feb 21, 2024
* disables fluentd and telegraf in linux ds if logs or events only streams enabled --------- Co-authored-by: Amol Agrawal <amagraw@microsoft.com> * address PR comments * added telemetry --------- Co-authored-by: Amol Agrawal <amagraw@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.