(#780) puppetserver: don't purge metrics.conf / Use dedicated parameter for jruby profiler #781
Merged
ekohl merged 3 commits intotheforeman:masterfrom Mar 29, 2021
Merged
Conversation
Member
Author
|
that's my (currently untested) approach to fix #780 . Let me know what you think / if you like two PRs for this. |
bastelfreak
force-pushed
the
do-not-remove-metrics-tmu
branch
2 times, most recently
from
4983f58 to
fe45a60
Compare
Member
|
Other than the failing unit tests, I think this looks good. I already started to change the odd |
This introduces a new parameter to disable the profiling indepently from the metrics. Previously this was enabled by default. However Puppet Inc. disables it in their standard configuration and the profiler causes a significate memory and CPU overhead so I guess we should stick with the upstream default.
This parameter only enables/disables the *http-client* metrics within puppetserver. It's disabled by default in the Puppet Inc. config file.
bastelfreak
force-pushed
the
do-not-remove-metrics-tmu
branch
from
6f37175 to
44a0400
Compare
ekohl
approved these changes
Mar 29, 2021
Member
ekohl
left a comment
ekohl
left a comment
There was a problem hiding this comment.
Looks good to me, let's see if the test agree.
ekohl
approved these changes
Mar 29, 2021
Member
ekohl
left a comment
ekohl
left a comment
There was a problem hiding this comment.
Test failures look unrelated, merging.
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
4 participants
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 introduces a new parameter to disable the profiling indepently from
the metrics. Previously this was enabled by default. However Puppet Inc.
disables it in their standard configuration and the profiler causes a
significate memory and CPU overhead so I guess we should stick with the
upstream default.