[linux] make /proc configurable. #2482
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
| output, _, _ = get_subprocess_output(['grep', 'model name', '/proc/cpuinfo'], log) | ||
| if not proc_path: | ||
| proc_path = "/proc" | ||
| proc_cpuinfo = "{}/cpuinfo".format(proc_path.rstrip('/')) |
There was a problem hiding this comment.
Using os.path.join is usually more reliable for this kind of thing. You would also not have to worry about calling rstrip in a lot of places.
|
A few nits, and hopefully we can move some of the duplicated logic in the mother class. I'm also wondering about these 2:
And the tests are failing on snmpd, I triggered it again in case it's flaky but if it doesn't pass you should have a look. |
| @@ -15,6 +15,7 @@ | |||
| from checks import AgentCheck | |||
| from checks.metric_types import MetricTypes | |||
| from config import _is_affirmative | |||
| from utils.platform import Platform | |||
There was a problem hiding this comment.
You need to remove this import, flake8 is failing on it as it's not used.
truthbk
force-pushed
the
jaime/config_proc
branch
from
fa77905
to
b8c25d5
Compare
|
LGTM |
[procfs] consistent naming with other checks that allow procfs path configuration. [procfs] if set in agentconfig, override everywhere where psutil comes to play too. [procfs] adding procfs_pathoption to example datadog.conf. [procfs] use procfs_path where relevant. [procfs] defer importing get_config to avoid circular dependency ImportError.
truthbk
force-pushed
the
jaime/config_proc
branch
from
6c5819f
to
5f481fc
Compare
Closed
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.
Allows overriding of
/procby definingprocfs_pathindatadog.conf- should be enforcable by usingself.agentConfig.get("procfs_path")from any of the checks. I believe we enforce that pretty much everywhere relevant with this PR.Places where we haven't overriden it just yet: