[disk] Convert /dev/root device to real device path #9577
Merged
+206
−0
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
Backport of upstream PR: giampaolo/psutil#2000 On some Linux setups (eg: default Ubuntu 20.04 AWS instances), psutils would return /dev/root instead of the actual block device (eg: /dev/xvda). When using the `tag_by_label` option, the disk check tries to match the output of psutil with the output of `lsblk` or `blkid` to find disk labels. However, these return the actual path instead of /dev/root, resulting in missing tags.
mx-psi
reviewed
Oct 19, 2021
omnibus/config/patches/datadog-agent-integrations-py2/psutil-pr2000.patch
Show resolved
Hide resolved
mx-psi
reviewed
Oct 19, 2021
omnibus/config/patches/datadog-agent-integrations-py3/psutil-pr2000.patch
Show resolved
Hide resolved
mx-psi
reviewed
Oct 19, 2021
mx-psi
approved these changes
Oct 19, 2021
9 tasks
zandrewitte
pushed a commit
to StackVista/stackstate-agent
that referenced
this pull request
Nov 17, 2022
Backport of upstream PR: giampaolo/psutil#2000 On some Linux setups (eg: default Ubuntu 20.04 AWS instances), psutils would return /dev/root instead of the actual block device (eg: /dev/xvda). When using the tag_by_label option, the disk check tries to match the output of psutil with the output of lsblk or blkid to find disk labels. However, these return the actual path instead of /dev/root, resulting in missing tags.
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?
Backport of upstream PR: giampaolo/psutil#2000
Motivation
On some Linux setups (eg: default Ubuntu 20.04 AWS instances), psutils
would return /dev/root instead of the actual block device (eg: /dev/xvda1).
When using the
tag_by_labeloption, the disk check tries to match theoutput of psutil with the output of
lsblkorblkidto find disk labels.However, these return the actual path instead of /dev/root, resulting in
missing tags.
Describe how to test your changes
Run
import psutil; psutil.disk_partitions()on both the py2 and py3 interpreters of an Agent running on an Ubuntu 20.04 AWS instance. It should list/dev/xvda1with this patch and/dev/rootwithout.