[psutil] Upgrade to 4.4.1 #2957
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
Previously, psutil didn't take into account root reserved space to compute the `disk.in_use` percentage. PR#1784 implemented a workaround on the disk check so that it would send values that are consistent with `df`'s output. psutil v4.3.0 fixed this issue. Now that we're using psutil 4.4.1, let's revert our workaround. Reference: https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#430
Allows to get rid of WMI in the cpu check. `interrupt` has been added to psutil 4.1.0
olivielpeau
force-pushed
the
olivielpeau/upgrade-psutil-4-4-1
branch
from
1dceba0 to
5d56ed3
Compare
- remove mock of `open` (useless since psutil upgrade) - add `Threads` to mocked `status` file (otherwise psutil crashes), and test related metric
olivielpeau
force-pushed
the
olivielpeau/upgrade-psutil-4-4-1
branch
from
5d56ed3 to
8bc67cd
Compare
remh
reviewed
Oct 26, 2016
| self.counter('system.cpu.system') | ||
| self.counter('system.cpu.interrupt') |
There was a problem hiding this comment.
Basically an old-style-check counters is the equivalent of a rates of a new-style check. It's still stored as a gauge in the backend, so there's no backwards-compatibility issue.
We compute a rate here because psutil.cpu_times returns for interrupt the same kind of value as for the other cpu values, i.e. the total time the cpu(s) spent in the interrupt state since startup, so to get a percentage from this we need to compute the rate divided by the number of cpus and multiply that by 100.
remh
approved these changes
Oct 26, 2016
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.
What does this PR do?
Upgrades psutil to the latest version (
4.4.1), and related changes ondd-agent(see details in commit messages):in_usepercentage provided by psutilpsutilto samplecpu.interrupt: tested on my local windows VM:psutilandWMIsend the same values forcpu.interruptMotivation
The upgrade was requested by a customer so that we ship a version that includes this fix: giampaolo/psutil#761
More generally it's good to keep an up-to-date version.
Testing Guidelines
Went through the changelog of
psutiland through the occurences ofpsutilindd-agentto find things that could be affected. Not sure I've spotted everything but I'll closely monitor the deploy of the updated Agent on our staging infrastructure (especially for thegunicorncheck that could potentially be affected).Additional Notes
Related PR on
omnibus-software: DataDog/omnibus-software#82psutilchangelog: https://github.com/giampaolo/psutil/blob/master/HISTORY.rst