diff --git a/sos/policies/distros/redhat.py b/sos/policies/distros/redhat.py index bae5aea1a7..e6beafed81 100644 --- a/sos/policies/distros/redhat.py +++ b/sos/policies/distros/redhat.py @@ -15,7 +15,7 @@ from sos.report.plugins import RedHatPlugin from sos.presets.redhat import (RHEL_PRESETS, RHV, RHEL, CB, RHOSP, - RHOCP, RH_CFME, RH_SATELLITE) + RHOCP, RH_CFME, RH_SATELLITE, AAPEDA) from sos.policies.distros import LinuxPolicy, ENV_HOST_SYSROOT from sos.policies.package_managers.rpm import RpmPackageManager from sos.policies.package_managers.flatpak import FlatpakPackageManager @@ -421,6 +421,10 @@ def probe_preset(self): if self.pkg_by_name("ovirt-engine") is not None or \ self.pkg_by_name("vdsm") is not None: return self.find_preset(RHV) + for pkg in ['automation-eda-controller', + 'automation-eda-controller-server']: + if self.pkg_by_name(pkg) is not None: + return self.find_preset(AAPEDA) # Vanilla RHEL is default return self.find_preset(RHEL) diff --git a/sos/presets/redhat/__init__.py b/sos/presets/redhat/__init__.py index dd6ddc216c..b3508dc9f0 100644 --- a/sos/presets/redhat/__init__.py +++ b/sos/presets/redhat/__init__.py @@ -53,6 +53,17 @@ RH_SATELLITE_DESC = "Red Hat Satellite" SAT_OPTS = SoSOptions(log_size=100, plugopts=['apache.log=on']) +AAPEDA = 'aap_eda' +AAPEDA_DESC = 'Ansible Automation Platform Event Driven Controller' +AAPEDA_OPTS = SoSOptions( + enable_plugins=['containers_common'], + plugopts=[ + 'containers_common.rootlessusers=eda' + ]) +AAPEDA_NOTE = ('Collects \'eda\' user output for the containers_common plugin.' + ' If you need more users, do not forget to add \'eda\' ' + 'to your own list for the \'rootlessusers\' option.') + CB = "cantboot" CB_DESC = "For use when normal system startup fails" CB_OPTS = SoSOptions( @@ -66,6 +77,8 @@ NOTE_SIZE_TIME = "This preset may increase report size and run time" RHEL_PRESETS = { + AAPEDA: PresetDefaults(name=AAPEDA, desc=AAPEDA_DESC, opts=AAPEDA_OPTS, + note=AAPEDA_NOTE), RHV: PresetDefaults(name=RHV, desc=RHV_DESC, note=NOTE_TIME, opts=_opts_verify), RHEL: PresetDefaults(name=RHEL, desc=RHEL_DESC),