New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2018.3] beacon diskusage fixes #48718

Merged
merged 2 commits into from Jul 24, 2018

Conversation

Projects
None yet
3 participants
@garethgreenaway
Member

garethgreenaway commented Jul 23, 2018

What does this PR do?

  • Updating psutil.disk_partitions to pull in all mounts not just the physical ones.
  • Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points.
  • Updating tests accordingly.

What issues does this PR fix or reference?

#48536

Tests written?

Yes. Existing tests updated.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

garethgreenaway added some commits Jul 19, 2018

Updating psutil.disk_partitions to pull in all mounts not just the ph…
…ysical ones. Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points. Updating tests accordingly.

@rallytime rallytime merged commit 062fe7c into saltstack:2018.3 Jul 24, 2018

4 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
@ProcenaFr

This comment has been minimized.

ProcenaFr commented on 6ecca16 Aug 20, 2018

Hello, it doesn't work if I use the patern '^/var' to match every mountpoint in /var, like "/var/log"... Because it ends my regular expression.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment