Zane/fix fluentd procstat pattern fast test#1663
Closed
zanejohnson-azure wants to merge 4 commits intoci_prodfrom
Closed
Zane/fix fluentd procstat pattern fast test#1663zanejohnson-azure wants to merge 4 commits intoci_prodfrom
zanejohnson-azure wants to merge 4 commits intoci_prodfrom
Conversation
Previously exe=ruby matched both fluentd PIDs (supervisor + worker) since both resolve to /usr/bin/ruby, producing identical metrics. Now uses distinct pattern matching: - fluentd supervisor: pattern = "fluentd(?!.*under-supervisor)" - fluentd worker: pattern = "fluentd.*under-supervisor" Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add volume mounts for telegraf-ama-logs-process-metrics.conf and main.sh via ConfigMap overrides on DS, PrometheusSidecar, and RS containers. main.sh copies conf to writable path before sed (subPath mounts are read-only). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Go regex (used by procstat) does not support lookaheads (?!...). Change supervisor pattern from fluentd(?!.*under-supervisor) to "ruby /usr/bin/fluentd" which only matches the supervisor cmdline (worker has -Eascii-8bit between ruby and /usr/bin/fluentd). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…/worker Use the new [[inputs.procstat.filter]] syntax with process_names to match against /proc/pid/comm instead of /proc/pid/exe. This cleanly separates: - fluentd supervisor (comm=fluentd, ~47MB) - fluentd worker (comm=ruby, ~105MB) Previous approaches failed because: - exe matches /proc/pid/exe symlink (both resolve to /usr/bin/ruby) - Go RE2 regex doesn't support negative lookaheads Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
tested, now values of fluentd and ruby matches what is showing inside container
manual check
fluentd (supervisor): 47.9 MB
ruby: 82.5 MB