nkshirsagar
commented
1 year ago As of now, files does not take wildcards, since we end up from https://github.com/sosreport/sos/blob/main/sos/report/plugins/__init__.py#L3290 at
def path_exists(path, sysroot):
return _os_wrapper(path, sysroot, 'exists')
and further
def _os_wrapper(path, sysroot, method, module=os.path):
if sysroot and sysroot != os.sep:
if not path.startswith(sysroot):
path = os.path.join(sysroot, path.lstrip('/'))
_meth = getattr(module, method)
return _meth(path)Would something like this in utilities.py
def _os_wrapper(path, sysroot, method, module=os.path):
if sysroot and sysroot != os.sep:
if not path.startswith(sysroot):
path = os.path.join(sysroot, path.lstrip('/'))
_meth = getattr(module, method)
if method == 'exists' and path[-1]='*':
return True if glob.glob(path) else False
return _meth(path)make sense, at least to handle wildcards at the end, so we can pass for eg in files stuff like '/var/lib/ceph/mon/*' to check for non empty folder of mon, for eg to determine its a mon node.
Looks like the wildcard expression for the files trigger isn't working as expected,
If i have,
files = ('/var/lib/ceph/osd/*',)
with the contents of the non empty /var/lib/ceph/osd/ folder as
This does NOT trigger the osd plugin as I would expect.
Also, it seems due to the presense of the empty folders like /var/lib/ceph/osd on mon/mgr nodes, and conversely the presense of empty mon/mgr folders on osd nodes causes the trigger of ceph_mon and ceph_mgr plugins on pure OSD nodes, and same issue for rgw/mgr/mds.
So I think firstly we should not have the files trigger on the folder, but rather non empty folder. But when I tried something as simple as the above code, it did not succeed in triggering the plugin. So I am wondering how to test for non empty folders using wildcards in files.
It seems the ceph plugins are the only ones using wildcards in the files trigger.
ceph_mon, for eg. will trigger like this,
But the empty folder /var/lib/ceph/mon/ does exist on OSD nodes too when I tested a jammy+quincy setup deployed by juju.
The initial commit for the ceph plugins used a overridden check_enabled method since iirc the files trigger did not work with wildcards,
but that was reverted in commit 6b3c84da03fb9be9be22f88c163d18e3e4397b21 which left the files having the folder names
Maybe we can add back the override, and also a call to super(MyPlugin, self).check_enabled() to also trigger the default checks if the override will be triggering the plugin?
Alternately is there a way to make files list work with wildcards? Or then we need some other way to handle this situation where on an OSD node, for eg, the /var/lib/ceph/osd folder contains,
and the parent /var/lib/ceph folder contains,
Note the empty folders,
root@juju-215b2d-quincysos-1:/var/lib/ceph# ls mon root@juju-215b2d-quincysos-1:/var/lib/ceph# ls mgr root@juju-215b2d-quincysos-1:/var/lib/ceph# ls mds root@juju-215b2d-quincysos-1:/var/lib/ceph# ls radosgw/ root@juju-215b2d-quincysos-1:/var/lib/ceph#