valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update get_othermountpoints to find_no_std_mountpoints based on Filesystem Hierarchy Standard

Browse Source
This commit is contained in:
remy.d1 2016-05-31 14:33:47 +02:00
parent b695a65980
commit c8a80bf282
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/modules/mount.py
View File

@ -962,7 +962,7 @@ def is_mounted(name):
return False
def get_othermountpoints(to_ignore=[]):
def find_no_std_mountpoints(list_of_elements=None):
'''
Retrieve non standard mountpoint
@ -970,19 +970,27 @@ def get_othermountpoints(to_ignore=[]):
To get all mountpoint except the standard ones
.. code-block:: bash
salt '*' mount.get_othermountpoints
To get all mountpoint except the [ standard ones + /media/disk1 and /scratch ]
salt '*' mount.find_no_std_mountpoints
To get all mountpoint except the standard ones + /media/disk1 and /scratch
.. code-block:: bash
salt '*' mount.get_othermountpoints "[/media/disk1, /scratch]"
salt '*' mount.find_no_std_mountpoints "/media/disk1 /scratch"
'''
mount_list = active()
to_ignore = []
if list_of_elements is not None:
to_ignore = list_of_elements.split()
mount_list = active()
all_ignore_mountpoints = []
mountnames = []
standard_mountpoints = ['/tmp','/usr','/var','/boot','/opt','/','/proc','/sys','/run','/run/shm','/run/lock','/home','/dev','/dev/pts','/run/user','/sys/fs/cgroup','/sys/fs/pstore','/sys/fs/cgroup/systemd','/sys/fs/fuse/connections','/sys/fs/pstore','/sys/kernel/debug','/sys/kernel/security','/etc','/etc/pve','/proc/vz/beancounter','/proc/vz/container','/proc/vz/fairsched','/var/lib/vz','/var/lib/nfs/rpc_pipefs','/root','/dev/mqueue','/sys/fs/cgroup/blkio','/sys/fs/cgroup/memory','/cgroup/freezer','/cgroup/net_cls','/cgroup/devices','/sys/fs/cgroup/cpu','/sys/fs/cgroup/cpuset','/sys/fs/cgroup/cpuacct','/sys/fs/cgroup/perf_event','/run/rpc_pipefs','/dev/shm','/cgroup/memory','/cgroup/cpu','/proc/fs/nfsd','/cgroup/cpuacct','/var/lib/ganglia/rrds','/sys/kernel/config','/sys/fs/cgroup/devices','/sys/fs/cgroup/net_cls,net_prio','/proc/sys/fs/binfmt_misc','/boot/efi','/cgroup/blkio','/var/lib/docker/aufs','/sys/fs/cgroup/hugetlb','/sys/fs/cgroup/cpu,cpuacct','/sys/fs/cgroup/freezer','/dev/hugepages','/run/cgmanager/fs','/run/vmblock-fuse','/sys/kernel/debug/tracing','/cgroup/cpuset']
all_ignore_mountpoints = standard_mountpoints + to_ignore
standard_mountpoints = ['/tmp', '/lib', '/lib64', '/usr', '/var', '/boot', '/opt', '/', '/proc', '/sys', '/run', '/home', '/dev', '/root', '/etc', '/bin', '/sbin', '/srv', '/media', '/mnt', '/usr/bin', '/usr/include', '/usr/lib', '/usr/lib64', '/usr/bin', '/usr/local', '/usr/sbin', '/usr/src', '/var/cache', '/var/lock', '/dev/pts', '/run/user', '/run/shm', '/run/lock', '/var/run', '/run/tmp', '/var/log', '/var/spool', '/var/mail', '/var/spool/cron', '/var/spool/mail', '/var/spool/mqueue', '/var/tmp', '/usr/X11R6', '/etc/opt', '/etc/X11', '/dev/shm', '/boot/efi']
cgroups_mounts = ['/sys/fs/cgroup', '/sys/fs/cgroup/systemd', '/cgroup/blkio', '/cgroup/memory', '/cgroup/cpu', '/cgroup/cpuacct', '/cgroup/cpuset', '/run/cgmanager/fs', '/sys/fs/cgroup/freezer', '/sys/fs/cgroup/hugetlb', '/sys/fs/cgroup/devices', '/sys/fs/cgroup/net_cls,net_prio', '/sys/fs/cgroup/cpu,cpuacct']
ovz_mounts = ['/sys/fs/cgroup/blkio', '/sys/fs/cgroup/memory', '/cgroup/freezer', '/cgroup/net_cls', '/cgroup/devices', '/sys/fs/cgroup/cpu', '/sys/fs/cgroup/cpuset', '/sys/fs/cgroup/cpuacct', '/sys/fs/cgroup/perf_event', '/proc/vz/beancounter', '/proc/vz/container', '/proc/vz/fairsched', '/var/lib/vz']
lxc_mounts = ['/run/lxcfs/controllers', '/run/lxcfs/controllers/blkio', '/run/lxcfs/controllers/devices', '/run/lxcfs/controllers/freezer', '/run/lxcfs/controllers/perf_event', '/run/lxcfs/controllers/cpuacct', '/var/lib/lxcfs', '/run/lxcfs/controllers/cpu', '/run/lxcfs/controllers/name=systemd', '/run/lxcfs/controllers/hugetlb', '/run/lxcfs/controllers/memory', '/run/lxcfs/controllers/cpuset']
# For ganglia, nfs, fuse, docker...
other_mountpoints = ['/sys/fs/pstore', '/sys/fs/fuse/connections', '/sys/fs/pstore', '/sys/kernel/debug', '/sys/kernel/security', '/etc/pve', '/var/lib/nfs/rpc_pipefs', '/dev/mqueue', '/run/rpc_pipefs', '/proc/fs/nfsd', '/var/lib/ganglia/rrds', '/sys/kernel/config', '/proc/sys/fs/binfmt_misc', '/var/lib/docker/aufs', '/dev/hugepages', '/run/vmblock-fuse', '/sys/kernel/debug/tracing']
all_ignore_mountpoints = standard_mountpoints + cgroups_mounts + ovz_mounts + lxc_mounts + other_mountpoints + to_ignore
for mountname,mountval in mount_list.iteritems():
if mountname not in all_ignore_mountpoints:
mountnames.append(mountname)

2
salt/modules/ps.py
View File

@ -11,6 +11,7 @@ See http://code.google.com/p/psutil.
from __future__ import absolute_import
import time
import datetime
import re
# Import salt libs
from salt.exceptions import SaltInvocationError, CommandExecutionError
@ -684,7 +685,6 @@ def psaux(name):
salt '*' ps.psaux www-data.+apache2
'''
import re
sanitize_name = str(name)
pattern = re.compile(sanitize_name)
ps_aux = __salt__['cmd.run']("ps aux")