From eb70e566a327b12445dbba4b6ca05b90772effa0 Mon Sep 17 00:00:00 2001
From: Bob Fahr <bfahr@redhat.com>
Date: Fri, 17 Jul 2020 11:01:15 -0500
Subject: [PATCH] Remove specs not used by any rules (#2663)

* Remove specs not used by any rules

* Prepare specs for core collection
* Remove all default specs that there are not being used to reduce archive size
  requirements
* This includes specs that are not currently being
  collected by the current client and specs that would not be evaluated
  by any rules if collected
* Remove assocated archive specs
* Add all file-like specs to sos_archive specs to allow collection

Signed-off-by: Bob Fahr <bfahr@redhat.com>

* Update docstrings in datasources

Signed-off-by: Bob Fahr <bfahr@redhat.com>

* Update specs catalog documentation

Signed-off-by: Bob Fahr <bfahr@redhat.com>

* Remove commented lines

Signed-off-by: Bob Fahr <bfahr@redhat.com>
---
 insights/specs/__init__.py         |   4 -
 insights/specs/default.py          | 564 +++--------------------------
 insights/specs/insights_archive.py |  93 +----
 insights/specs/sos_archive.py      |  95 ++++-
 insights/util/specs_catalog.py     |   4 +-
 5 files changed, 145 insertions(+), 615 deletions(-)

diff --git a/insights/specs/__init__.py b/insights/specs/__init__.py
index 57bfd448e7..b78440eafa 100644
--- a/insights/specs/__init__.py
+++ b/insights/specs/__init__.py
@@ -211,7 +211,6 @@ class Specs(SpecSet):
     hponcfg_g = RegistryPoint()
     httpd_access_log = RegistryPoint(filterable=True)
     httpd_conf = RegistryPoint(multi_output=True)
-    httpd_conf_sos = RegistryPoint(multi_output=True)
     httpd_conf_scl_httpd24 = RegistryPoint(multi_output=True)
     httpd_conf_scl_jbcs_httpd24 = RegistryPoint(multi_output=True)
     httpd_error_log = RegistryPoint(filterable=True)
@@ -220,7 +219,6 @@ class Specs(SpecSet):
     httpd_limits = RegistryPoint(multi_output=True)
     httpd_M = RegistryPoint(multi_output=True)
     httpd_on_nfs = RegistryPoint()
-    httpd_pid = RegistryPoint()
     httpd_ssl_access_log = RegistryPoint(filterable=True)
     httpd_ssl_error_log = RegistryPoint(filterable=True)
     httpd_V = RegistryPoint(multi_output=True)
@@ -345,7 +343,6 @@ class Specs(SpecSet):
     modinfo = RegistryPoint(multi_output=True)
     modinfo_all = RegistryPoint()
     modprobe = RegistryPoint(multi_output=True)
-    module = RegistryPoint()
     mongod_conf = RegistryPoint(multi_output=True, filterable=True)
     mount = RegistryPoint()
     mounts = RegistryPoint()
@@ -525,7 +522,6 @@ class Specs(SpecSet):
     route = RegistryPoint()
     rpm_V_packages = RegistryPoint()
     rsyslog_conf = RegistryPoint(filterable=True)
-    running_java = RegistryPoint()
     samba = RegistryPoint(filterable=True)
     sap_hdb_version = RegistryPoint(multi_output=True)
     sap_host_profile = RegistryPoint(filterable=True)
diff --git a/insights/specs/default.py b/insights/specs/default.py
index 61d8da5926..2f680c99ba 100644
--- a/insights/specs/default.py
+++ b/insights/specs/default.py
@@ -12,25 +12,16 @@
 import os
 import re
 
-from insights.core.context import ClusterArchiveContext
-from insights.core.context import DockerImageContext
 from insights.core.context import HostContext
-from insights.core.context import HostArchiveContext
-from insights.core.context import OpenShiftContext
 
 from insights.core.dr import SkipComponent
 from insights.core.plugins import datasource
-from insights.core.spec_factory import CommandOutputProvider, ContentException, DatasourceProvider, RawFileProvider
-from insights.core.spec_factory import simple_file, simple_command, glob_file, command_with_args
+from insights.core.spec_factory import RawFileProvider
+from insights.core.spec_factory import simple_file, simple_command, glob_file
 from insights.core.spec_factory import first_of, foreach_collect, foreach_execute
 from insights.core.spec_factory import first_file, listdir
-from insights.parsers.mount import Mount, ProcMounts
-from insights.parsers.dnf_module import DnfModuleList
-from insights.combiners.sap import Sap
 from insights.combiners.cloud_provider import CloudProvider
-from insights.combiners.satellite_version import SatelliteVersion
 from insights.combiners.services import Services
-from insights.components.rhel_version import IsRhel8, IsRhel7
 from insights.specs import Specs
 
 
@@ -43,6 +34,7 @@
 
 
 def get_owner(filename):
+    """ tuple: Return tuple containing uid and gid of file filename """
     st = stat(filename)
     name = getpwuid(st.st_uid).pw_name
     group = getgrgid(st.st_gid).gr_name
@@ -50,21 +42,32 @@ def get_owner(filename):
 
 
 def get_cmd_and_package_in_ps(broker, target_command):
-        ps = broker[DefaultSpecs.ps_auxww].content
-        ctx = broker[HostContext]
-        results = set()
-        for p in ps:
-            p_splits = p.split(None, 10)
-            cmd = p_splits[10].split()[0] if len(p_splits) == 11 else ''
-            which = ctx.shell_out("which {0}".format(cmd)) if target_command in os.path.basename(cmd) else None
-            resolved = ctx.shell_out("readlink -e {0}".format(which[0])) if which else None
-            pkg = ctx.shell_out("/bin/rpm -qf {0}".format(resolved[0])) if resolved else None
-            if cmd and pkg is not None:
-                results.add("{0} {1}".format(cmd, pkg[0]))
-        return results
+    """
+    Search for command in ``ps auxww`` output and determine RPM providing binary
+
+    Arguments:
+        broker(dict): Current state of specs collected by Insights
+        target_command(str): Command name to search for in ps output
+
+    Returns:
+        set: Set including all RPMs that provide the target command
+    """
+    ps = broker[DefaultSpecs.ps_auxww].content
+    ctx = broker[HostContext]
+    results = set()
+    for p in ps:
+        p_splits = p.split(None, 10)
+        cmd = p_splits[10].split()[0] if len(p_splits) == 11 else ''
+        which = ctx.shell_out("which {0}".format(cmd)) if target_command in os.path.basename(cmd) else None
+        resolved = ctx.shell_out("readlink -e {0}".format(which[0])) if which else None
+        pkg = ctx.shell_out("/bin/rpm -qf {0}".format(resolved[0])) if resolved else None
+        if cmd and pkg is not None:
+            results.add("{0} {1}".format(cmd, pkg[0]))
+    return results
 
 
 def _make_rpm_formatter(fmt=None):
+    """ function: Returns function that will format output of rpm query command """
     if fmt is None:
         fmt = [
             '"name":"%{NAME}"',
@@ -96,12 +99,12 @@ class DefaultSpecs(Specs):
     auditctl_status = simple_command("/sbin/auditctl -s")
     auditd_conf = simple_file("/etc/audit/auditd.conf")
     audit_log = simple_file("/var/log/audit/audit.log")
-    autofs_conf = simple_file("/etc/autofs.conf")
     avc_hash_stats = simple_file("/sys/fs/selinux/avc/hash_stats")
     avc_cache_threshold = simple_file("/sys/fs/selinux/avc/cache_threshold")
 
     @datasource(CloudProvider)
     def is_aws(broker):
+        """ bool: Returns True if this node is identified as running in AWS """
         cp = broker[CloudProvider]
         if cp and cp.cloud_provider == CloudProvider.AWS:
             return True
@@ -112,6 +115,7 @@ def is_aws(broker):
 
     @datasource(CloudProvider)
     def is_azure(broker):
+        """ bool: Returns True if this node is identified as running in Azure """
         cp = broker[CloudProvider]
         if cp and cp.cloud_provider == CloudProvider.AZURE:
             return True
@@ -125,10 +129,7 @@ def is_azure(broker):
     boot_loader_entries = glob_file("/boot/loader/entries/*.conf")
     branch_info = simple_file("/branch_info", kind=RawFileProvider)
     brctl_show = simple_command("/usr/sbin/brctl show")
-    candlepin_log = simple_file("/var/log/candlepin/candlepin.log")
-    candlepin_error_log = simple_file("/var/log/candlepin/error.log")
     cgroups = simple_file("/proc/cgroups")
-    checkin_conf = simple_file("/etc/splice/checkin.conf")
     ps_alxwww = simple_command("/bin/ps alxwww")
     ps_aux = simple_command("/bin/ps aux")
     ps_auxcww = simple_command("/bin/ps auxcww")
@@ -138,7 +139,13 @@ def is_azure(broker):
 
     @datasource(ps_auxww)
     def tomcat_base(broker):
-        """Path: Tomcat base path"""
+        """
+        Function to search the output of ``ps auxww`` to find all running tomcat
+        processes and extract the base path where the process was started.
+
+        Returns:
+            list: List of the paths to each running process
+        """
         ps = broker[DefaultSpecs.ps_auxww].content
         results = []
         findall = re.compile(r"\-Dcatalina\.base=(\S+)").findall
@@ -150,21 +157,18 @@ def tomcat_base(broker):
         return list(set(results))
 
     catalina_out = foreach_collect(tomcat_base, "%s/catalina.out")
-    catalina_server_log = foreach_collect(tomcat_base, "%s/catalina*.log")
     cciss = glob_file("/proc/driver/cciss/cciss*")
     cdc_wdm = simple_file("/sys/bus/usb/drivers/cdc_wdm/module/refcnt")
-    ceilometer_central_log = simple_file("/var/log/ceilometer/central.log")
     ceilometer_collector_log = first_file(["/var/log/containers/ceilometer/collector.log", "/var/log/ceilometer/collector.log"])
     ceilometer_compute_log = first_file(["/var/log/containers/ceilometer/compute.log", "/var/log/ceilometer/compute.log"])
     ceilometer_conf = first_file(["/var/lib/config-data/puppet-generated/ceilometer/etc/ceilometer/ceilometer.conf", "/etc/ceilometer/ceilometer.conf"])
-    ceph_socket_files = listdir("/var/run/ceph/ceph-*.*.asok", context=HostContext)
     ceph_conf = first_file(["/var/lib/config-data/puppet-generated/ceph/etc/ceph/ceph.conf", "/etc/ceph/ceph.conf"])
-    ceph_config_show = foreach_execute(ceph_socket_files, "/usr/bin/ceph daemon %s config show")
     ceph_df_detail = simple_command("/usr/bin/ceph df detail -f json")
     ceph_health_detail = simple_command("/usr/bin/ceph health detail -f json")
 
     @datasource(ps_auxww)
     def is_ceph_monitor(broker):
+        """ bool: Returns True if ceph monitor process ceph-mon is running on this node """
         ps = broker[DefaultSpecs.ps_auxww].content
         findall = re.compile(r"ceph\-mon").findall
         if any(findall(p) for p in ps):
@@ -174,9 +178,7 @@ def is_ceph_monitor(broker):
     ceph_insights = simple_command("/usr/bin/ceph insights", deps=[is_ceph_monitor])
     ceph_log = glob_file(r"var/log/ceph/ceph.log*")
     ceph_osd_dump = simple_command("/usr/bin/ceph osd dump -f json")
-    ceph_osd_df = simple_command("/usr/bin/ceph osd df -f json")
     ceph_osd_ec_profile_ls = simple_command("/usr/bin/ceph osd erasure-code-profile ls")
-    ceph_osd_ec_profile_get = foreach_execute(ceph_osd_ec_profile_ls, "/usr/bin/ceph osd erasure-code-profile get %s -f json")
     ceph_osd_log = glob_file(r"var/log/ceph/ceph-osd*.log")
     ceph_osd_tree = simple_command("/usr/bin/ceph osd tree -f json")
     ceph_s = simple_command("/usr/bin/ceph -s -f json")
@@ -193,33 +195,15 @@ def is_ceph_monitor(broker):
     cloud_init_log = simple_file("/var/log/cloud-init.log")
     cluster_conf = simple_file("/etc/cluster/cluster.conf")
     cmdline = simple_file("/proc/cmdline")
-    cni_podman_bridge_conf = simple_file("/etc/cni/net.d/87-podman-bridge.conflist")
-    cpe = simple_file("/etc/system-release-cpe")
-    # are these locations for different rhel versions?
     cobbler_settings = first_file(["/etc/cobbler/settings", "/conf/cobbler/settings"])
     cobbler_modules_conf = first_file(["/etc/cobbler/modules.conf", "/conf/cobbler/modules.conf"])
     corosync = simple_file("/etc/sysconfig/corosync")
-
-    @datasource([IsRhel7, IsRhel8])
-    def corosync_cmapctl_cmd_list(broker):
-        if broker.get(IsRhel7):
-            return ["/usr/sbin/corosync-cmapctl", 'corosync-cmapctl -d runtime.schedmiss.timestamp', 'corosync-cmapctl -d runtime.schedmiss.delay']
-        if broker.get(IsRhel8):
-            return ["/usr/sbin/corosync-cmapctl", '/usr/sbin/corosync-cmapctl -m stats', '/usr/sbin/corosync-cmapctl -C schedmiss']
-        raise SkipComponent()
-    corosync_cmapctl = foreach_execute(corosync_cmapctl_cmd_list, "%s")
     corosync_conf = simple_file("/etc/corosync/corosync.conf")
     cpu_cores = glob_file("sys/devices/system/cpu/cpu[0-9]*/online")
     cpu_siblings = glob_file("sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list")
     cpu_smt_active = simple_file("sys/devices/system/cpu/smt/active")
-    cpu_smt_control = simple_file("sys/devices/system/cpu/smt/control")
     cpu_vulns = glob_file("sys/devices/system/cpu/vulnerabilities/*")
-    cpu_vulns_meltdown = simple_file("sys/devices/system/cpu/vulnerabilities/meltdown")
-    cpu_vulns_spectre_v1 = simple_file("sys/devices/system/cpu/vulnerabilities/spectre_v1")
-    cpu_vulns_spectre_v2 = simple_file("sys/devices/system/cpu/vulnerabilities/spectre_v2")
-    cpu_vulns_spec_store_bypass = simple_file("sys/devices/system/cpu/vulnerabilities/spec_store_bypass")
     cpuinfo = simple_file("/proc/cpuinfo")
-    cpuinfo_max_freq = simple_file("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
     cpupower_frequency_info = simple_command("/usr/bin/cpupower -c all frequency-info")
     cpuset_cpus = simple_file("/sys/fs/cgroup/cpuset/cpuset.cpus")
     cron_daily_rhsmd = simple_file("/etc/cron.daily/rhsmd")
@@ -229,88 +213,23 @@ def corosync_cmapctl_cmd_list(broker):
     crypto_policies_bind = simple_file("/etc/crypto-policies/back-ends/bind.config")
     current_clocksource = simple_file("/sys/devices/system/clocksource/clocksource0/current_clocksource")
     date = simple_command("/bin/date")
-    date_iso = simple_command("/bin/date --iso-8601=seconds")
     date_utc = simple_command("/bin/date --utc")
     df__al = simple_command("/bin/df -al")
     df__alP = simple_command("/bin/df -alP")
     df__li = simple_command("/bin/df -li")
-    dig = simple_command("/usr/bin/dig +dnssec . DNSKEY")
     dig_dnssec = simple_command("/usr/bin/dig +dnssec . SOA")
     dig_edns = simple_command("/usr/bin/dig +edns=0 . SOA")
     dig_noedns = simple_command("/usr/bin/dig +noedns . SOA")
-    dirsrv = simple_file("/etc/sysconfig/dirsrv")
-    dirsrv_access = glob_file("var/log/dirsrv/*/access*")
     dirsrv_errors = glob_file("var/log/dirsrv/*/errors*")
-    display_java = simple_command("/usr/sbin/alternatives --display java")
     dmesg = simple_command("/bin/dmesg")
     dmesg_log = simple_file("/var/log/dmesg")
     dmidecode = simple_command("/usr/sbin/dmidecode")
-    dmsetup_info = simple_command("/usr/sbin/dmsetup info -C")
-    dnf_modules = glob_file("/etc/dnf/modules.d/*.module")
-    dnf_module_list = simple_command("/usr/bin/dnf -C --noplugins module list", deps=[IsRhel8])
-
-    @datasource(DnfModuleList)
-    def dnf_module_names(broker):
-        dml = broker[DnfModuleList]
-        if dml:
-            return (' ').join(dml)
-        raise SkipComponent()
-
-    dnf_module_info = command_with_args("/usr/bin/dnf -C --noplugins module info %s", dnf_module_names, deps=[IsRhel8])
-    dnsmasq_config = glob_file(["/etc/dnsmasq.conf", "/etc/dnsmasq.d/*.conf"])
     docker_info = simple_command("/usr/bin/docker info")
     docker_list_containers = simple_command("/usr/bin/docker ps --all --no-trunc")
     docker_list_images = simple_command("/usr/bin/docker images --all --no-trunc --digests")
-
-    @datasource(docker_list_images)
-    def docker_image_ids(broker):
-        """Command: docker_image_ids"""
-        images = broker[DefaultSpecs.docker_list_images]
-        try:
-            result = set()
-            for l in images.content[1:]:
-                result.add(l.split(None)[3].strip())
-        except:
-            raise ContentException("No docker images.")
-        if result:
-            return list(result)
-        raise ContentException("No docker images.")
-
-    # TODO: This parsing is broken.
-    @datasource(docker_list_containers)
-    def docker_container_ids(broker):
-        """Command: docker_container_ids"""
-        containers = broker[DefaultSpecs.docker_list_containers]
-        try:
-            result = set()
-            for l in containers.content[1:]:
-                result.add(l.split(None)[3].strip())
-        except:
-            raise ContentException("No docker containers.")
-        if result:
-            return list(result)
-        raise ContentException("No docker containers.")
-
-    docker_host_machine_id = simple_file("/etc/redhat-access-insights/machine-id")
-    docker_image_inspect = foreach_execute(docker_image_ids, "/usr/bin/docker inspect %s")
-    docker_container_inspect = foreach_execute(docker_container_ids, "/usr/bin/docker inspect %s")
-    docker_network = simple_file("/etc/sysconfig/docker-network")
-    docker_storage = simple_file("/etc/sysconfig/docker-storage")
     docker_storage_setup = simple_file("/etc/sysconfig/docker-storage-setup")
     docker_sysconfig = simple_file("/etc/sysconfig/docker")
-
-    @datasource(ProcMounts)
-    def dumpdev(broker):
-        mnt = broker[ProcMounts]
-        mounted_dev = [m.mounted_device for m in mnt if m.mount_type in ('ext2', 'ext3', 'ext4')]
-        if mounted_dev:
-            return mounted_dev
-        raise SkipComponent()
-
     dracut_kdump_capture_service = simple_file("/usr/lib/dracut/modules.d/99kdumpbase/kdump-capture.service")
-    du_dirs = foreach_execute(['/var/lib/candlepin/activemq-artemis'], "/bin/du -s -k %s")
-    dumpe2fs_h = foreach_execute(dumpdev, "/sbin/dumpe2fs -h %s")
-    engine_config_all = simple_command("/usr/bin/engine-config --all")
     engine_db_query_vdsm_version = simple_command('engine-db-query --statement "SELECT vs.vds_name, rpm_version FROM vds_dynamic vd, vds_static vs WHERE vd.vds_id = vs.vds_id;" --json')
     engine_log = simple_file("/var/log/ovirt-engine/engine.log")
     etc_journald_conf = simple_file(r"etc/systemd/journald.conf")
@@ -318,43 +237,24 @@ def dumpdev(broker):
     etc_machine_id = simple_file("/etc/machine-id")
     etcd_conf = simple_file("/etc/etcd/etcd.conf")
     ethernet_interfaces = listdir("/sys/class/net", context=HostContext)
-    dcbtool_gc_dcb = foreach_execute(ethernet_interfaces, "/sbin/dcbtool gc %s dcb")
     ethtool = foreach_execute(ethernet_interfaces, "/sbin/ethtool %s")
     ethtool_S = foreach_execute(ethernet_interfaces, "/sbin/ethtool -S %s")
     ethtool_T = foreach_execute(ethernet_interfaces, "/sbin/ethtool -T %s")
-    ethtool_a = foreach_execute(ethernet_interfaces, "/sbin/ethtool -a %s")
-    ethtool_c = foreach_execute(ethernet_interfaces, "/sbin/ethtool -c %s")
     ethtool_g = foreach_execute(ethernet_interfaces, "/sbin/ethtool -g %s")
     ethtool_i = foreach_execute(ethernet_interfaces, "/sbin/ethtool -i %s")
     ethtool_k = foreach_execute(ethernet_interfaces, "/sbin/ethtool -k %s")
-    exim_conf = simple_file("etc/exim.conf")
     facter = simple_command("/usr/bin/facter")
     fc_match = simple_command("/bin/fc-match -sv 'sans:regular:roman' family fontformat")
     fcoeadm_i = simple_command("/usr/sbin/fcoeadm -i")
-    fdisk_l = simple_command("/sbin/fdisk -l")
     findmnt_lo_propagation = simple_command("/bin/findmnt -lo+PROPAGATION")
     firewall_cmd_list_all_zones = simple_command("/usr/bin/firewall-cmd --list-all-zones")
     firewalld_conf = simple_file("/etc/firewalld/firewalld.conf")
-    foreman_production_log = simple_file("/var/log/foreman/production.log")
-    foreman_proxy_conf = simple_file("/etc/foreman-proxy/settings.yml")
-    foreman_proxy_log = simple_file("/var/log/foreman-proxy/proxy.log")
-    foreman_satellite_log = simple_file("/var/log/foreman-installer/satellite.log")
-    foreman_ssl_access_ssl_log = simple_file("var/log/httpd/foreman-ssl_access_ssl.log")
-    foreman_rake_db_migrate_status = simple_command('/usr/sbin/foreman-rake db:migrate:status')
-    foreman_tasks_config = first_file(["/etc/sysconfig/foreman-tasks", "/etc/sysconfig/dynflowd"])
-    freeipa_healthcheck_log = simple_file("/var/log/ipa/healthcheck/healthcheck.log")
     fstab = simple_file("/etc/fstab")
     galera_cnf = first_file(["/var/lib/config-data/puppet-generated/mysql/etc/my.cnf.d/galera.cnf", "/etc/my.cnf.d/galera.cnf"])
     getconf_page_size = simple_command("/usr/bin/getconf PAGE_SIZE")
     getenforce = simple_command("/usr/sbin/getenforce")
     getsebool = simple_command("/usr/sbin/getsebool -a")
-    glance_api_conf = first_file(["/var/lib/config-data/puppet-generated/glance_api/etc/glance/glance-api.conf", "/etc/glance/glance-api.conf"])
-    glance_api_log = first_file(["/var/log/containers/glance/api.log", "/var/log/glance/api.log"])
-    glance_cache_conf = first_file(["/var/lib/config-data/puppet-generated/glance_api/etc/glance/glance-cache.conf", "/etc/glance/glance-cache.conf"])
-    glance_registry_conf = simple_file("/etc/glance/glance-registry.conf")
     gluster_v_info = simple_command("/usr/sbin/gluster volume info")
-    gluster_v_status = simple_command("/usr/sbin/gluster volume status")
-    gluster_peer_status = simple_command("/usr/sbin/gluster peer status")
     gnocchi_conf = first_file(["/var/lib/config-data/puppet-generated/gnocchi/etc/gnocchi/gnocchi.conf", "/etc/gnocchi/gnocchi.conf"])
     gnocchi_metricd_log = first_file(["/var/log/containers/gnocchi/gnocchi-metricd.log", "/var/log/gnocchi/metricd.log"])
     grub_conf = simple_file("/boot/grub/grub.conf")
@@ -365,20 +265,14 @@ def dumpdev(broker):
     grub2_efi_cfg = simple_file("boot/efi/EFI/redhat/grub.cfg")
     grubby_default_index = simple_command("/usr/sbin/grubby --default-index")  # only RHEL7 and updwards
     grubby_default_kernel = simple_command("/sbin/grubby --default-kernel")
-    hammer_ping = simple_command("/usr/bin/hammer ping")
     hammer_task_list = simple_command("/usr/bin/hammer --config /root/.hammer/cli.modules.d/foreman.yml --output csv task list --search 'state=running AND ( label=Actions::Candlepin::ListenOnCandlepinEvents OR label=Actions::Katello::EventQueue::Monitor )'")
     haproxy_cfg = first_file(["/var/lib/config-data/puppet-generated/haproxy/etc/haproxy/haproxy.cfg", "/etc/haproxy/haproxy.cfg"])
     heat_api_log = first_file(["/var/log/containers/heat/heat_api.log", "/var/log/heat/heat-api.log", "/var/log/heat/heat_api.log"])
     heat_conf = first_file(["/var/lib/config-data/puppet-generated/heat/etc/heat/heat.conf", "/etc/heat/heat.conf"])
-    heat_crontab = simple_command("/usr/bin/crontab -l -u heat")
-    heat_crontab_container = simple_command("docker exec heat_api_cron /usr/bin/crontab -l -u heat")
-    heat_engine_log = first_file(["/var/log/containers/heat/heat-engine.log", "/var/log/heat/heat-engine.log"])
     hostname = simple_command("/bin/hostname -f")
     hostname_default = simple_command("/bin/hostname")
     hostname_short = simple_command("/bin/hostname -s")
     hosts = simple_file("/etc/hosts")
-    hponcfg_g = simple_command("/sbin/hponcfg -g")
-    httpd_access_log = simple_file("/var/log/httpd/access_log")
     httpd_conf = glob_file(
         [
             "/etc/httpd/conf/httpd.conf",
@@ -406,22 +300,17 @@ def dumpdev(broker):
     httpd_error_log = simple_file("var/log/httpd/error_log")
     httpd24_httpd_error_log = simple_file("/opt/rh/httpd24/root/etc/httpd/logs/error_log")
     jbcs_httpd24_httpd_error_log = simple_file("/opt/rh/jbcs-httpd24/root/etc/httpd/logs/error_log")
-    httpd_pid = simple_command("/usr/bin/pgrep -o httpd")
-    httpd_limits = foreach_collect(httpd_pid, "/proc/%s/limits")
-
-    @datasource(SatelliteVersion)
-    def is_sat(broker):
-        sat = broker[SatelliteVersion]
-        if sat:
-            return True
-        raise SkipComponent()
-
-    satellite_enabled_features = simple_command("/usr/bin/curl -sk https://localhost:9090/features --connect-timeout 5", deps=[is_sat])
     virt_uuid_facts = simple_file("/etc/rhsm/facts/virt_uuid.facts")
 
     @datasource(ps_auxww)
     def httpd_cmd(broker):
-        """Command: httpd_command"""
+        """
+        Function to search the output of ``ps auxww`` to find all running Apache
+        webserver processes and extract the binary path.
+
+        Returns:
+            list: List of the binary paths to each running process
+        """
         ps = broker[DefaultSpecs.ps_auxww].content
         ps_httpds = set()
         for p in ps:
@@ -437,39 +326,11 @@ def httpd_cmd(broker):
         # https://access.redhat.com/solutions/21680
         return list(ps_httpds)
 
-    @datasource(Mount)
-    def httpd_on_nfs(broker):
-        import json
-        mnt = broker[Mount]
-        mps = mnt.search(mount_type='nfs4')
-        # get nfs 4.0 mount points
-        nfs_mounts = [m.mount_point for m in mps if m['mount_options'].get("vers") == "4.0"]
-        if nfs_mounts:
-            # get all httpd ps
-            httpd_pids = broker[HostContext].shell_out("pgrep httpd")
-            if httpd_pids:
-                open_nfs_files = 0
-                lsof_cmds = ["lsof -p {}".format(pid) for pid in httpd_pids if pid]
-                # maybe there are thousands open files
-                httpd_open_files = broker[HostContext].shell_out(lsof_cmds)
-                for line in httpd_open_files:
-                    items = line.split()
-                    if len(items) > 8 and items[8].startswith(tuple(nfs_mounts)):
-                        open_nfs_files += 1
-                result_dict = {"http_ids": httpd_pids, "nfs_mounts": nfs_mounts, "open_nfs_files": open_nfs_files}
-                return DatasourceProvider(content=json.dumps(result_dict), relative_path="httpd_open_nfsV4_files")
-        raise SkipComponent()
-
     httpd_M = foreach_execute(httpd_cmd, "%s -M")
-    httpd_ssl_access_log = simple_file("/var/log/httpd/ssl_access_log")
-    httpd_ssl_error_log = simple_file("/var/log/httpd/ssl_error_log")
     httpd_V = foreach_execute(httpd_cmd, "%s -V")
     ifcfg = glob_file("/etc/sysconfig/network-scripts/ifcfg-*")
     ifcfg_static_route = glob_file("/etc/sysconfig/network-scripts/route-*")
-    ifconfig = simple_command("/sbin/ifconfig -a")
     imagemagick_policy = glob_file(["/etc/ImageMagick/policy.xml", "/usr/lib*/ImageMagick-6.5.4/config/policy.xml"])
-    init_ora = simple_file("${ORACLE_HOME}/dbs/init.ora")
-    initscript = glob_file(r"etc/rc.d/init.d/*")
     init_process_cgroup = simple_file("/proc/1/cgroup")
     interrupts = simple_file("/proc/interrupts")
     ip_addr = simple_command("/sbin/ip addr")
@@ -480,40 +341,17 @@ def httpd_on_nfs(broker):
     ipcs_m = simple_command("/usr/bin/ipcs -m")
     ipcs_m_p = simple_command("/usr/bin/ipcs -m -p")
     ipcs_s = simple_command("/usr/bin/ipcs -s")
-
-    @datasource(ipcs_s)
-    def semid(broker):
-        """Command: semids"""
-        source = broker[DefaultSpecs.ipcs_s].content
-        results = set()
-        for s in source:
-            s_splits = s.split()
-            # key        semid      owner      perms      nsems
-            # 0x00000000 65536      apache     600        1
-            if len(s_splits) == 5 and s_splits[1].isdigit():
-                results.add(s_splits[1])
-        return results
-
-    ipcs_s_i = foreach_execute(semid, "/usr/bin/ipcs -s -i %s")
     iptables = simple_command("/sbin/iptables-save")
     iptables_permanent = simple_file("etc/sysconfig/iptables")
     ip6tables = simple_command("/sbin/ip6tables-save")
-    ip6tables_permanent = simple_file("etc/sysconfig/ip6tables")
     ipv4_neigh = simple_command("/sbin/ip -4 neighbor show nud all")
     ipv6_neigh = simple_command("/sbin/ip -6 neighbor show nud all")
     ironic_inspector_log = simple_file("/var/log/ironic-inspector/ironic-inspector.log")
-    ironic_conf = first_file(["/var/lib/config-data/puppet-generated/ironic/etc/ironic/ironic.conf", "/etc/ironic/ironic.conf"])
     iscsiadm_m_session = simple_command("/usr/sbin/iscsiadm -m session")
-    katello_service_status = simple_command("/usr/bin/katello-service status")
     kdump_conf = simple_file("/etc/kdump.conf")
-    kerberos_kdc_log = simple_file("var/log/krb5kdc.log")
     kernel_config = glob_file("/boot/config-*")
-    kexec_crash_loaded = simple_file("/sys/kernel/kexec_crash_loaded")
     kexec_crash_size = simple_file("/sys/kernel/kexec_crash_size")
-    keystone_conf = first_file(["/var/lib/config-data/puppet-generated/keystone/etc/keystone/keystone.conf", "/etc/keystone/keystone.conf"])
     keystone_crontab = simple_command("/usr/bin/crontab -l -u keystone")
-    keystone_crontab_container = simple_command("docker exec keystone_cron /usr/bin/crontab -l -u keystone")
-    keystone_log = first_file(["/var/log/containers/keystone/keystone.log", "/var/log/keystone/keystone.log"])
     kpatch_list = simple_command("/usr/sbin/kpatch list")
     krb5 = glob_file([r"etc/krb5.conf", r"etc/krb5.conf.d/*"])
     ksmstate = simple_file("/sys/kernel/mm/ksm/run")
@@ -523,17 +361,13 @@ def semid(broker):
     libkeyutils = simple_command("/usr/bin/find -L /lib /lib64 -name 'libkeyutils.so*'")
     libkeyutils_objdumps = simple_command('/usr/bin/find -L /lib /lib64 -name libkeyutils.so.1 -exec objdump -x "{}" \;')
     libvirtd_log = simple_file("/var/log/libvirt/libvirtd.log")
-    libvirtd_qemu_log = glob_file(r"/var/log/libvirt/qemu/*.log")
     limits_conf = glob_file(["/etc/security/limits.conf", "/etc/security/limits.d/*.conf"])
-    locale = simple_command("/usr/bin/locale")
     localtime = simple_command("/usr/bin/file -L /etc/localtime")
     logrotate_conf = glob_file(["/etc/logrotate.conf", "/etc/logrotate.d/*"])
     lpstat_p = simple_command("/usr/bin/lpstat -p")
     ls_boot = simple_command("/bin/ls -lanR /boot")
     ls_dev = simple_command("/bin/ls -lanR /dev")
     ls_disk = simple_command("/bin/ls -lanR /dev/disk")
-    ls_docker_volumes = simple_command("/bin/ls -lanR /var/lib/docker/volumes")
-    ls_edac_mc = simple_command("/bin/ls -lan /sys/devices/system/edac/mc")
     etc_and_sub_dirs = sorted(["/etc", "/etc/pki/tls/private", "/etc/pki/tls/certs",
         "/etc/pki/ovirt-vmconsole", "/etc/nova/migration", "/etc/sysconfig",
         "/etc/cloud/cloud.cfg.d"])
@@ -545,8 +379,8 @@ def semid(broker):
     ls_run_systemd_generator = simple_command("/bin/ls -lan /run/systemd/generator")
     ls_R_var_lib_nova_instances = simple_command("/bin/ls -laR /var/lib/nova/instances")
     ls_sys_firmware = simple_command("/bin/ls -lanR /sys/firmware")
+    ls_tmp = simple_command("/bin/ls -la /tmp")
     ls_usr_lib64 = simple_command("/bin/ls -lan /usr/lib64")
-    ls_usr_sbin = simple_command("/bin/ls -ln /usr/sbin")
     ls_var_lib_mongodb = simple_command("/bin/ls -la /var/lib/mongodb")
     ls_var_lib_nova_instances = simple_command("/bin/ls -laRZ /var/lib/nova/instances")
     ls_var_log = simple_command("/bin/ls -la /var/log /var/log/audit")
@@ -557,32 +391,18 @@ def semid(broker):
     ls_var_tmp = simple_command("/bin/ls -ln /var/tmp")
     ls_var_run = simple_command("/bin/ls -lnL /var/run")
     ls_var_www = simple_command("/bin/ls -la /dev/null /var/www")  # https://github.com/RedHatInsights/insights-core/issues/827
-    ls_tmp = simple_command("/bin/ls -la /tmp")
     lsblk = simple_command("/bin/lsblk")
     lsblk_pairs = simple_command("/bin/lsblk -P -o NAME,KNAME,MAJ:MIN,FSTYPE,MOUNTPOINT,LABEL,UUID,RA,RO,RM,MODEL,SIZE,STATE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE,TYPE,DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO")
     lscpu = simple_command("/usr/bin/lscpu")
-    lsinitrd = simple_command("/usr/bin/lsinitrd")
-    lsinitrd_lvm_conf = first_of([
-                                 simple_command("/sbin/lsinitrd -f /etc/lvm/lvm.conf"),
-                                 simple_command("/usr/bin/lsinitrd -f /etc/lvm/lvm.conf")
-                                 ])
     lsmod = simple_command("/sbin/lsmod")
     lsof = simple_command("/usr/sbin/lsof")
     lspci = simple_command("/sbin/lspci -k")
     lssap = simple_command("/usr/sap/hostctrl/exe/lssap")
     lsscsi = simple_command("/usr/bin/lsscsi")
-    lvdisplay = simple_command("/sbin/lvdisplay")
     lvm_conf = simple_file("/etc/lvm/lvm.conf")
-    lvmconfig = first_of([
-        simple_command("/usr/sbin/lvmconfig --type full"),
-        simple_command("/usr/sbin/lvm dumpconfig --type full"),
-    ])
-    lvs = None  # simple_command('/sbin/lvs -a -o +lv_tags,devices --config="global{locking_type=0}"')
     lvs_noheadings = simple_command("/sbin/lvs --nameprefixes --noheadings --separator='|' -a -o lv_name,lv_size,lv_attr,mirror_log,vg_name,devices,region_size,data_percent,metadata_percent,segtype,seg_monitor --config=\"global{locking_type=0}\"")
-    lvs_noheadings_all = simple_command("/sbin/lvs --nameprefixes --noheadings --separator='|' -a -o lv_name,lv_size,lv_attr,mirror_log,vg_name,devices,region_size,data_percent,metadata_percent,segtype --config='global{locking_type=0} devices{filter=[\"a|.*|\"]}'")
     mac_addresses = glob_file("/sys/class/net/*/address")
     machine_id = first_file(["etc/insights-client/machine-id", "etc/redhat-access-insights/machine-id", "etc/redhat_access_proactive/machine-id"])
-    manila_conf = first_file(["/var/lib/config-data/puppet-generated/manila/etc/manila/manila.conf", "/etc/manila/manila.conf"])
     mariadb_log = simple_file("/var/log/mariadb/mariadb.log")
     max_uid = simple_command("/bin/awk -F':' '{ if($3 > max) max = $3 } END { print max }' /etc/passwd")
     md5chk_files = foreach_execute(
@@ -591,62 +411,32 @@ def semid(broker):
     mdstat = simple_file("/proc/mdstat")
     meminfo = first_file(["/proc/meminfo", "/meminfo"])
     messages = simple_file("/var/log/messages")
-    metadata_json = simple_file("metadata.json", context=ClusterArchiveContext, kind=RawFileProvider)
-    mistral_executor_log = simple_file("/var/log/mistral/executor.log")
-    mlx4_port = glob_file("/sys/bus/pci/devices/*/mlx4_port[0-9]")
     modinfo_i40e = simple_command("/sbin/modinfo i40e")
     modinfo_igb = simple_command("/sbin/modinfo igb")
     modinfo_ixgbe = simple_command("/sbin/modinfo ixgbe")
     modinfo_veth = simple_command("/sbin/modinfo veth")
     modinfo_vmxnet3 = simple_command("/sbin/modinfo vmxnet3")
-
-    @datasource(lsmod, context=HostContext)
-    def lsmod_only_names(broker):
-        lsmod = broker[DefaultSpecs.lsmod].content
-        # skip the title
-        return [line.split()[0] for line in lsmod[1:] if line.strip()]
-
-    modinfo = foreach_execute(lsmod_only_names, "modinfo %s")
-
-    @datasource(lsmod_only_names, context=HostContext)
-    def lsmod_all_names(broker):
-        mod_list = broker[DefaultSpecs.lsmod_only_names]
-        if mod_list:
-            return ' '.join(mod_list)
-        raise SkipComponent()
-
-    modinfo_all = command_with_args("modinfo %s", lsmod_all_names)
-
     modprobe = glob_file(["/etc/modprobe.conf", "/etc/modprobe.d/*.conf"])
-    sysconfig_mongod = glob_file([
-                                 "etc/sysconfig/mongod",
-                                 "etc/opt/rh/rh-mongodb26/sysconfig/mongod"
-                                 ])
     mongod_conf = glob_file([
                             "/etc/mongod.conf",
                             "/etc/mongodb.conf",
                             "/etc/opt/rh/rh-mongodb26/mongod.conf"
                             ])
     mount = simple_command("/bin/mount")
-    mounts = simple_file("/proc/mounts")
     mssql_conf = simple_file("/var/opt/mssql/mssql.conf")
     multicast_querier = simple_command("/usr/bin/find /sys/devices/virtual/net/ -name multicast_querier -print -exec cat {} \;")
     multipath_conf = simple_file("/etc/multipath.conf")
     multipath_conf_initramfs = simple_command("/bin/lsinitrd -f /etc/multipath.conf")
     multipath__v4__ll = simple_command("/sbin/multipath -v4 -ll")
-    mysqladmin_status = simple_command("/bin/mysqladmin status")
     mysqladmin_vars = simple_command("/bin/mysqladmin variables")
     mysql_log = glob_file([
                           "/var/log/mysql/mysqld.log",
                           "/var/log/mysql.log",
                           "/var/opt/rh/rh-mysql*/log/mysql/mysqld.log"
                           ])
-    mysqld_pid = simple_command("/usr/bin/pgrep -n mysqld")
-    mysqld_limits = foreach_collect(mysqld_pid, "/proc/%s/limits")
     named_checkconf_p = simple_command("/usr/sbin/named-checkconf -p")
     namespace = simple_command("/bin/ls /var/run/netns")
     ndctl_list_Ni = simple_command("/usr/bin/ndctl list -Ni")
-    ip_netns_exec_namespace_lsof = foreach_execute(namespace, "/sbin/ip netns exec %s lsof -i")
     netconsole = simple_file("/etc/sysconfig/netconsole")
     netstat = simple_command("/bin/netstat -neopa")
     netstat_agn = simple_command("/bin/netstat -agn")
@@ -659,10 +449,8 @@ def lsmod_all_names(broker):
     neutron_l3_agent_log = simple_file("/var/log/neutron/l3-agent.log")
     neutron_metadata_agent_ini = first_file(["/var/lib/config-data/puppet-generated/neutron/etc/neutron/metadata_agent.ini", "/etc/neutron/metadata_agent.ini"])
     neutron_metadata_agent_log = first_file(["/var/log/containers/neutron/metadata-agent.log", "/var/log/neutron/metadata-agent.log"])
-    neutron_ml2_conf = first_file(["/var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini", "/etc/neutron/plugins/ml2/ml2_conf.ini"])
     neutron_ovs_agent_log = first_file(["/var/log/containers/neutron/openvswitch-agent.log", "/var/log/neutron/openvswitch-agent.log"])
     neutron_plugin_ini = first_file(["/var/lib/config-data/puppet-generated/neutron/etc/neutron/plugin.ini", "/etc/neutron/plugin.ini"])
-    neutron_server_log = first_file(["/var/log/containers/neutron/server.log", "/var/log/neutron/server.log"])
     nfnetlink_queue = simple_file("/proc/net/netfilter/nfnetlink_queue")
     nfs_exports = simple_file("/etc/exports")
     nfs_exports_d = glob_file("/etc/exports.d/*.exports")
@@ -681,98 +469,42 @@ def lsmod_all_names(broker):
                            "/etc/nova/nova.conf"
                            ])
     nova_crontab = simple_command("/usr/bin/crontab -l -u nova")
-    nova_crontab_container = simple_command("docker exec nova_api_cron /usr/bin/crontab -l -u nova")
     nova_uid = simple_command("/usr/bin/id -u nova")
-    nova_migration_uid = simple_command("/usr/bin/id -u nova_migration")
     nscd_conf = simple_file("/etc/nscd.conf")
     nsswitch_conf = simple_file("/etc/nsswitch.conf")
     ntp_conf = simple_file("/etc/ntp.conf")
     ntpq_leap = simple_command("/usr/sbin/ntpq -c 'rv 0 leap'")
-    ntpq_pn = simple_command("/usr/sbin/ntpq -pn")
     ntptime = simple_command("/usr/sbin/ntptime")
     numa_cpus = glob_file("/sys/devices/system/node/node[0-9]*/cpulist")
     numeric_user_group_name = simple_command("/bin/grep -c '^[[:digit:]]' /etc/passwd /etc/group")
     nvme_core_io_timeout = simple_file("/sys/module/nvme_core/parameters/io_timeout")
-    oc_get_bc = simple_command("/usr/bin/oc get bc -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_build = simple_command("/usr/bin/oc get build -o yaml --all-namespaces", context=OpenShiftContext)
     oc_get_clusterrole_with_config = simple_command("/usr/bin/oc get clusterrole --config /etc/origin/master/admin.kubeconfig")
     oc_get_clusterrolebinding_with_config = simple_command("/usr/bin/oc get clusterrolebinding --config /etc/origin/master/admin.kubeconfig")
-    oc_get_dc = simple_command("/usr/bin/oc get dc -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_egressnetworkpolicy = simple_command("/usr/bin/oc get egressnetworkpolicy -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_endpoints = simple_command("/usr/bin/oc get endpoints -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_event = simple_command("/usr/bin/oc get event -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_node = simple_command("/usr/bin/oc get nodes -o yaml", context=OpenShiftContext)
-    oc_get_pod = simple_command("/usr/bin/oc get pod -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_project = simple_command("/usr/bin/oc get project -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_pv = simple_command("/usr/bin/oc get pv -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_pvc = simple_command("/usr/bin/oc get pvc -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_rc = simple_command("/usr/bin/oc get rc -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_role = simple_command("/usr/bin/oc get role -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_rolebinding = simple_command("/usr/bin/oc get rolebinding -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_route = simple_command("/usr/bin/oc get route -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_service = simple_command("/usr/bin/oc get service -o yaml --all-namespaces", context=OpenShiftContext)
-    oc_get_configmap = simple_command("/usr/bin/oc get configmap -o yaml --all-namespaces", context=OpenShiftContext)
-    octavia_conf = simple_file("/var/lib/config-data/puppet-generated/octavia/etc/octavia/octavia.conf")
     odbc_ini = simple_file("/etc/odbc.ini")
     odbcinst_ini = simple_file("/etc/odbcinst.ini")
-    crt = simple_command("/usr/bin/find /etc/origin/node /etc/origin/master -type f -path '*.crt'")
-    openshift_certificates = foreach_execute(crt, "/usr/bin/openssl x509 -noout -enddate -in %s")
-    openshift_fluentd_pid = simple_command("/usr/bin/pgrep -n fluentd")
-    openshift_fluentd_environ = foreach_collect(openshift_fluentd_pid, "/proc/%s/environ")
     openshift_hosts = simple_file("/root/.config/openshift/hosts")
     openshift_router_pid = simple_command("/usr/bin/pgrep -n openshift-route")
     openshift_router_environ = foreach_collect(openshift_router_pid, "/proc/%s/environ")
     openvswitch_other_config = simple_command("/usr/bin/ovs-vsctl -t 5 get Open_vSwitch . other_config")
-    openvswitch_server_log = simple_file('/var/log/openvswitch/ovsdb-server.log')
-    openvswitch_daemon_log = simple_file('/var/log/openvswitch/ovs-vswitchd.log')
     os_release = simple_file("etc/os-release")
-    osa_dispatcher_log = first_file([
-                                    "/var/log/rhn/osa-dispatcher.log",
-                                    "/rhn-logs/rhn/osa-dispatcher.log"
-                                    ])
     ose_master_config = simple_file("/etc/origin/master/master-config.yaml")
     ose_node_config = simple_file("/etc/origin/node/node-config.yaml")
-    ovirt_engine_confd = glob_file("/etc/ovirt-engine/engine.conf.d/*")
     ovirt_engine_server_log = simple_file("/var/log/ovirt-engine/server.log")
     ovirt_engine_ui_log = simple_file("/var/log/ovirt-engine/ui.log")
-    ovirt_engine_boot_log = simple_file("/var/log/ovirt-engine/boot.log")
-    ovirt_engine_console_log = simple_file("/var/log/ovirt-engine/console.log")
-    ovs_vsctl_list_br = simple_command("/usr/bin/ovs-vsctl list-br")
-    ovs_appctl_fdb_show_bridge = foreach_execute(ovs_vsctl_list_br, "/usr/bin/ovs-appctl fdb/show %s")
-    ovs_ofctl_dump_flows = foreach_execute(ovs_vsctl_list_br, "/usr/bin/ovs-ofctl dump-flows %s")
     ovs_vsctl_list_bridge = simple_command("/usr/bin/ovs-vsctl list bridge")
     ovs_vsctl_show = simple_command("/usr/bin/ovs-vsctl show")
-    ovs_vswitchd_pid = simple_command("/usr/bin/pgrep -o ovs-vswitchd")
-    ovs_vswitchd_limits = foreach_collect(ovs_vswitchd_pid, "/proc/%s/limits")
     pacemaker_log = first_file(["/var/log/pacemaker.log", "/var/log/pacemaker/pacemaker.log"])
     pci_rport_target_disk_paths = simple_command("/usr/bin/find /sys/devices/ -maxdepth 10 -mindepth 9 -name stat -type f")
 
     @datasource(Services, context=HostContext)
     def pcp_enabled(broker):
+        """ bool: Returns True if pmproxy service is on in services """
         if not broker[Services].is_on("pmproxy"):
             raise SkipComponent("pmproxy not enabled")
 
     pcp_metrics = simple_command("/usr/bin/curl -s http://127.0.0.1:44322/metrics --connect-timeout 5", deps=[pcp_enabled])
-
-    @datasource(ps_auxww, context=HostContext)
-    def package_and_java(broker):
-        """Command: package_and_java"""
-        return get_cmd_and_package_in_ps(broker, 'java')
-
-    package_provides_java = foreach_execute(package_and_java, "echo %s")
-
-    @datasource(ps_auxww, context=HostContext)
-    def package_and_httpd(broker):
-        """Command: package_and_httpd"""
-        return get_cmd_and_package_in_ps(broker, 'httpd')
-
-    package_provides_httpd = foreach_execute(package_and_httpd, "echo %s")
-    pam_conf = simple_file("/etc/pam.conf")
-    parted__l = simple_command("/sbin/parted -l -s")
-    partitions = simple_file("/proc/partitions")
     passenger_status = simple_command("/usr/bin/passenger-status")
     password_auth = simple_file("/etc/pam.d/password-auth")
-    pcs_config = simple_command("/usr/sbin/pcs config")
     pcs_quorum_status = simple_command("/usr/sbin/pcs quorum status")
     pcs_status = simple_command("/usr/sbin/pcs status")
     pluginconf_d = glob_file("/etc/yum/pluginconf.d/*.conf")
@@ -787,28 +519,19 @@ def package_and_httpd(broker):
                               glob_file("/database/postgresql-*.log")
                               ])
     puppetserver_config = simple_file("/etc/sysconfig/puppetserver")
-    prev_uploader_log = simple_file("var/log/redhat-access-insights/redhat-access-insights.log.1")
     proc_netstat = simple_file("proc/net/netstat")
     proc_slabinfo = simple_file("proc/slabinfo")
     proc_snmp_ipv4 = simple_file("proc/net/snmp")
     proc_snmp_ipv6 = simple_file("proc/net/snmp6")
     proc_stat = simple_file("proc/stat")
     pulp_worker_defaults = simple_file("etc/default/pulp_workers")
-    pvs = simple_command('/sbin/pvs -a -v -o +pv_mda_free,pv_mda_size,pv_mda_count,pv_mda_used_count,pe_count --config="global{locking_type=0}"')
     pvs_noheadings = simple_command("/sbin/pvs --nameprefixes --noheadings --separator='|' -a -o pv_all,vg_name --config=\"global{locking_type=0}\"")
-    pvs_noheadings_all = simple_command("/sbin/pvs --nameprefixes --noheadings --separator='|' -a -o pv_all,vg_name --config='global{locking_type=0} devices{filter=[\"a|.*|\"]}'")
     qemu_conf = simple_file("/etc/libvirt/qemu.conf")
     qemu_xml = glob_file(r"/etc/libvirt/qemu/*.xml")
     qpid_stat_g = simple_command("/usr/bin/qpid-stat -g --ssl-certificate=/etc/pki/katello/qpid_client_striped.crt -b amqps://localhost:5671")
-    qpid_stat_q = simple_command("/usr/bin/qpid-stat -q --ssl-certificate=/etc/pki/katello/qpid_client_striped.crt -b amqps://localhost:5671")
-    qpid_stat_u = simple_command("/usr/bin/qpid-stat -u --ssl-certificate=/etc/pki/katello/qpid_client_striped.crt -b amqps://localhost:5671")
     qpidd_conf = simple_file("/etc/qpid/qpidd.conf")
     rabbitmq_env = simple_file("/etc/rabbitmq/rabbitmq-env.conf")
-    rabbitmq_logs = glob_file("/var/log/rabbitmq/rabbit@*.log", ignore=".*rabbit@.*(?<!-sasl).log$")
-    rabbitmq_policies = simple_command("/usr/sbin/rabbitmqctl list_policies")
-    rabbitmq_queues = simple_command("/usr/sbin/rabbitmqctl list_queues name messages consumers auto_delete")
     rabbitmq_report = simple_command("/usr/sbin/rabbitmqctl report")
-    rabbitmq_startup_err = simple_file("/var/log/rabbitmq/startup_err")
     rabbitmq_startup_log = simple_file("/var/log/rabbitmq/startup_log")
     rabbitmq_users = simple_command("/usr/sbin/rabbitmqctl list_users")
     rc_local = simple_file("/etc/rc.d/rc.local")
@@ -818,77 +541,24 @@ def package_and_httpd(broker):
     readlink_e_shift_cert_server = simple_command("/usr/bin/readlink -e /etc/origin/node/certificates/kubelet-server-current.pem")
     redhat_release = simple_file("/etc/redhat-release")
     resolv_conf = simple_file("/etc/resolv.conf")
-    rhosp_release = simple_file("/etc/rhosp-release")
-
-    @datasource(HostContext)
-    def rhev_data_center(broker):
-        import json
-        root = broker[HostContext].root
-        relative_path = "rhev/data-center"
-        path = os.path.join(root, relative_path)
-        bad_apples = []
-        for dirpath, dirnames, filenames in os.walk(path):
-            for p in dirnames + filenames:
-                tmp = os.path.join(dirpath, p)
-                try:
-                    name, group = get_owner(tmp)
-                    good = ("vdsm", "kvm")
-                    if (name, group) != good:
-                        bad_apples.append({"name": name, "group": group, "path": tmp})
-                except:
-                    logger.error(tmp)
-        if bad_apples:
-            return DatasourceProvider(content=json.dumps(bad_apples), relative_path=relative_path)
-        raise SkipComponent()
-
-    rhv_log_collector_analyzer = simple_command("rhv-log-collector-analyzer --json")
-    rhn_charsets = simple_command("/usr/bin/rhn-charsets")
     rhn_conf = first_file(["/etc/rhn/rhn.conf", "/conf/rhn/rhn/rhn.conf"])
     rhn_entitlement_cert_xml = first_of([glob_file("/etc/sysconfig/rhn/rhn-entitlement-cert.xml*"),
                                    glob_file("/conf/rhn/sysconfig/rhn/rhn-entitlement-cert.xml*")])
-    rhn_hibernate_conf = first_file(["/usr/share/rhn/config-defaults/rhn_hibernate.conf", "/config-defaults/rhn_hibernate.conf"])
-    rhn_schema_stats = simple_command("/usr/bin/rhn-schema-stats -")
     rhn_schema_version = simple_command("/usr/bin/rhn-schema-version")
-    rhn_server_satellite_log = simple_file("var/log/rhn/rhn_server_satellite.log")
-    rhn_server_xmlrpc_log = first_file(["/var/log/rhn/rhn_server_xmlrpc.log",
-                                           "/rhn-logs/rhn/rhn_server_xmlrpc.log"])
-    rhn_search_daemon_log = first_file(["/var/log/rhn/search/rhn_search_daemon.log",
-                                           "/rhn-logs/rhn/search/rhn_search_daemon.log"])
     rhn_taskomatic_daemon_log = first_file(["/var/log/rhn/rhn_taskomatic_daemon.log",
                                                "rhn-logs/rhn/rhn_taskomatic_daemon.log"])
     rhsm_conf = simple_file("/etc/rhsm/rhsm.conf")
     rhsm_log = simple_file("/var/log/rhsm/rhsm.log")
     rhsm_releasever = simple_file('/var/lib/rhsm/cache/releasever.json')
     rndc_status = simple_command("/usr/sbin/rndc status")
-    root_crontab = simple_command("/usr/bin/crontab -l -u root")
-    route = simple_command("/sbin/route -n")
     rpm_V_packages = simple_command("/bin/rpm -V coreutils procps procps-ng shadow-utils passwd sudo chrony", keep_rc=True)
     rsyslog_conf = simple_file("/etc/rsyslog.conf")
     samba = simple_file("/etc/samba/smb.conf")
-
-    @datasource(Sap)
-    def sap_sid(broker):
-        sap = broker[Sap]
-        return [sap.sid(i).lower() for i in sap.local_instances]
-
-    @datasource(Sap)
-    def sap_sid_num(broker):
-        sap = broker[Sap]
-        return [(sap.sid(i).lower(), sap.number(i)) for i in sap.local_instances]
-
-    sap_hdb_version = foreach_execute(sap_sid, "/usr/bin/sudo -iu %sadm HDB version", keep_rc=True)
-    sap_host_profile = simple_file("/usr/sap/hostctrl/exe/host_profile")
-    sapcontrol_getsystemupdatelist = foreach_execute(sap_sid_num, "/usr/bin/sudo -iu %sadm sapcontrol -nr %s -function GetSystemUpdateList", keep_rc=True)
     saphostctl_getcimobject_sapinstance = simple_command("/usr/sap/hostctrl/exe/saphostctrl -function GetCIMObject -enuminstances SAPInstance")
-    saphostexec_status = simple_command("/usr/sap/hostctrl/exe/saphostexec -status")
-    saphostexec_version = simple_command("/usr/sap/hostctrl/exe/saphostexec -version")
     sat5_insights_properties = simple_file("/etc/redhat-access/redhat-access-insights.properties")
     satellite_mongodb_storage_engine = simple_command("/usr/bin/mongo pulp_database --eval 'db.serverStatus().storageEngine'")
     satellite_version_rb = simple_file("/usr/share/foreman/lib/satellite/version.rb")
     satellite_custom_hiera = simple_file("/etc/foreman-installer/custom-hiera.yaml")
-    block_devices = listdir("/sys/block")
-    scheduler = foreach_collect(block_devices, "/sys/block/%s/queue/scheduler")
-    sched_rt_runtime_us = simple_file("/proc/sys/kernel/sched_rt_runtime_us")
     scsi = simple_file("/proc/scsi/scsi")
     scsi_eh_deadline = glob_file('/sys/class/scsi_host/host[0-9]*/eh_deadline')
     scsi_fwver = glob_file('/sys/class/scsi_host/host[0-9]*/fwrev')
@@ -896,47 +566,25 @@ def sap_sid_num(broker):
     sctp_eps = simple_file('/proc/net/sctp/eps')
     sctp_snmp = simple_file('/proc/net/sctp/snmp')
     sealert = simple_command('/usr/bin/sealert -l "*"')
-    secure = simple_file("/var/log/secure")
     selinux_config = simple_file("/etc/selinux/config")
     sestatus = simple_command("/usr/sbin/sestatus -b")
     setup_named_chroot = simple_file("/usr/libexec/setup-named-chroot.sh")
-
-    @datasource(HostContext)
-    def block(broker):
-        """Path: /sys/block directories starting with . or ram or dm- or loop"""
-        remove = (".", "ram", "dm-", "loop")
-        tmp = "/dev/%s"
-        return[(tmp % f) for f in os.listdir("/sys/block") if not f.startswith(remove)]
-
     smbstatus_p = simple_command("/usr/bin/smbstatus -p")
-    smbstatus_S = simple_command("/usr/bin/smbstatus -S")
-    smartctl = foreach_execute(block, "/sbin/smartctl -a %s", keep_rc=True)
     smartpdc_settings = simple_file("/etc/smart_proxy_dynflow_core/settings.yml")
     sockstat = simple_file("/proc/net/sockstat")
     softnet_stat = simple_file("proc/net/softnet_stat")
     software_collections_list = simple_command('/usr/bin/scl --list')
-    spfile_ora = glob_file("${ORACLE_HOME}/dbs/spfile*.ora")
     ss = simple_command("/usr/sbin/ss -tupna")
     ssh_config = simple_file("/etc/ssh/ssh_config")
-    ssh_foreman_config = simple_file("/usr/share/foreman/.ssh/ssh_config")
     ssh_foreman_proxy_config = simple_file("/usr/share/foreman-proxy/.ssh/ssh_config")
     sshd_config = simple_file("/etc/ssh/sshd_config")
     sshd_config_perms = simple_command("/bin/ls -l /etc/ssh/sshd_config")
     sssd_config = simple_file("/etc/sssd/sssd.conf")
     subscription_manager_id = simple_command("/usr/sbin/subscription-manager identity")  # use "/usr/sbin" here, BZ#1690529
-    subscription_manager_installed_product_ids = simple_command("/usr/bin/find /etc/pki/product-default/ /etc/pki/product/ -name '*pem' -exec rct cat-cert --no-content '{}' \;")
-    subscription_manager_release_show = simple_command('/usr/sbin/subscription-manager release --show')  # use "/usr/sbin" here, BZ#1690529
-    swift_conf = first_file(["/var/lib/config-data/puppet-generated/swift/etc/swift/swift.conf", "/etc/swift/swift.conf"])
-    swift_log = first_file(["/var/log/containers/swift/swift.log", "/var/log/swift/swift.log"])
     swift_object_expirer_conf = first_file(["/var/lib/config-data/puppet-generated/swift/etc/swift/object-expirer.conf", "/etc/swift/object-expirer.conf"])
     swift_proxy_server_conf = first_file(["/var/lib/config-data/puppet-generated/swift/etc/swift/proxy-server.conf", "/etc/swift/proxy-server.conf"])
-    sys_kernel_sched_features = simple_file("/sys/kernel/debug/sched_features")
-    sysconfig_chronyd = simple_file("/etc/sysconfig/chronyd")
-    sysconfig_httpd = simple_file("/etc/sysconfig/httpd")
-    sysconfig_irqbalance = simple_file("etc/sysconfig/irqbalance")
     sysconfig_kdump = simple_file("etc/sysconfig/kdump")
     sysconfig_libvirt_guests = simple_file("etc/sysconfig/libvirt-guests")
-    sysconfig_memcached = first_file(["/var/lib/config-data/puppet-generated/memcached/etc/sysconfig/memcached", "/etc/sysconfig/memcached"])
     sysconfig_network = simple_file("etc/sysconfig/network")
     sysconfig_ntpd = simple_file("/etc/sysconfig/ntpd")
     sysconfig_prelink = simple_file("/etc/sysconfig/prelink")
@@ -944,8 +592,6 @@ def block(broker):
     sysconfig_virt_who = simple_file("/etc/sysconfig/virt-who")
     sysctl = simple_command("/sbin/sysctl -a")
     sysctl_conf = simple_file("/etc/sysctl.conf")
-    sysctl_conf_files = listdir("/boot/initramfs-*kdump.img")
-    sysctl_conf_initramfs = foreach_execute(sysctl_conf_files, "/bin/lsinitrd /boot/%s -f /etc/sysctl.conf /etc/sysctl.d/*.conf")
     systemctl_cat_rpcbind_socket = simple_command("/bin/systemctl cat rpcbind.socket")
     systemctl_cinder_volume = simple_command("/bin/systemctl show openstack-cinder-volume")
     systemctl_httpd = simple_command("/bin/systemctl show httpd")
@@ -953,9 +599,6 @@ def block(broker):
     systemctl_list_unit_files = simple_command("/bin/systemctl list-unit-files")
     systemctl_list_units = simple_command("/bin/systemctl list-units")
     systemctl_mariadb = simple_command("/bin/systemctl show mariadb")
-    systemctl_pulp_workers = simple_command("/bin/systemctl show pulp_workers")
-    systemctl_pulp_resmg = simple_command("/bin/systemctl show pulp_resource_manager")
-    systemctl_pulp_celerybeat = simple_command("/bin/systemctl show pulp_celerybeat")
     systemctl_qpidd = simple_command("/bin/systemctl show qpidd")
     systemctl_qdrouterd = simple_command("/bin/systemctl show qdrouterd")
     systemctl_show_all_services = simple_command("/bin/systemctl show *.service")
@@ -966,64 +609,33 @@ def block(broker):
     systemd_logind_conf = simple_file("/etc/systemd/logind.conf")
     systemd_openshift_node = simple_command("/usr/bin/systemctl cat atomic-openshift-node.service")
     systemd_system_conf = simple_file("/etc/systemd/system.conf")
-    systemd_system_origin_accounting = simple_file("/etc/systemd/system.conf.d/origin-accounting.conf")
     systemid = first_of([
         simple_file("/etc/sysconfig/rhn/systemid"),
         simple_file("/conf/rhn/sysconfig/rhn/systemid")
     ])
     systool_b_scsi_v = simple_command("/bin/systool -b scsi -v")
     tags = simple_file("/tags.json", kind=RawFileProvider)
-    teamdctl_config_dump = foreach_execute(ethernet_interfaces, "/usr/bin/teamdctl %s config dump")
-    teamdctl_state_dump = foreach_execute(ethernet_interfaces, "/usr/bin/teamdctl %s state dump")
     thp_use_zero_page = simple_file("/sys/kernel/mm/transparent_hugepage/use_zero_page")
     thp_enabled = simple_file("/sys/kernel/mm/transparent_hugepage/enabled")
     tmpfilesd = glob_file(["/etc/tmpfiles.d/*.conf", "/usr/lib/tmpfiles.d/*.conf", "/run/tmpfiles.d/*.conf"])
-    tomcat_web_xml = first_of([glob_file("/etc/tomcat*/web.xml"),
-                                  glob_file("/conf/tomcat/tomcat*/web.xml")])
-    tomcat_server_xml = first_of([foreach_collect(tomcat_base, "%s/conf/server.xml"),
-                                     glob_file("conf/tomcat/tomcat*/server.xml", context=HostArchiveContext)])
-
-    @datasource(ps_auxww)
-    def tomcat_home_base(broker):
-        """Command: tomcat_home_base_paths"""
-        ps = broker[DefaultSpecs.ps_auxww].content
-        results = []
-        findall = re.compile(r"\-Dcatalina\.(home|base)=(\S+)").findall
-        for p in ps:
-            found = findall(p)
-            if found:
-                # Only get the path which is absolute
-                results.extend(f[1] for f in found if f[1][0] == '/')
-        return list(set(results))
-
-    tomcat_vdc_targeted = foreach_execute(tomcat_home_base, "/bin/grep -R -s 'VirtualDirContext' --include '*.xml' %s")
     tomcat_vdc_fallback = simple_command("/usr/bin/find /usr/share -maxdepth 1 -name 'tomcat*' -exec /bin/grep -R -s 'VirtualDirContext' --include '*.xml' '{}' +")
     tuned_adm = simple_command("/usr/sbin/tuned-adm list")
-    tuned_conf = simple_file("/etc/tuned.conf")
-    udev_persistent_net_rules = simple_file("/etc/udev/rules.d/70-persistent-net.rules")
     udev_fc_wwpn_id_rules = simple_file("/usr/lib/udev/rules.d/59-fc-wwpn-id.rules")
     uname = simple_command("/usr/bin/uname -a")
     up2date = simple_file("/etc/sysconfig/rhn/up2date")
     up2date_log = simple_file("/var/log/up2date")
-    uploader_log = simple_file("/var/log/redhat-access-insights/redhat-access-insights.log")
     uptime = simple_command("/usr/bin/uptime")
     usr_journald_conf_d = glob_file(r"usr/lib/systemd/journald.conf.d/*.conf")  # note that etc_journald.conf.d also exists
     vdo_status = simple_command("/usr/bin/vdo status")
     vgdisplay = simple_command("/sbin/vgdisplay")
-    vdsm_conf = simple_file("etc/vdsm/vdsm.conf")
-    vdsm_id = simple_file("etc/vdsm/vdsm.id")
     vdsm_log = simple_file("var/log/vdsm/vdsm.log")
     vdsm_logger_conf = simple_file("etc/vdsm/logger.conf")
     vma_ra_enabled = simple_file("/sys/kernel/mm/swap/vma_ra_enabled")
-    vmware_tools_conf = simple_file("etc/vmware-tools/tools.conf")
-    vgs = None  # simple_command('/sbin/vgs -v -o +vg_mda_count,vg_mda_free,vg_mda_size,vg_mda_used_count,vg_tags --config="global{locking_type=0}"')
     vgs_noheadings = simple_command("/sbin/vgs --nameprefixes --noheadings --separator='|' -a -o vg_all --config=\"global{locking_type=0}\"")
-    vgs_noheadings_all = simple_command("/sbin/vgs --nameprefixes --noheadings --separator='|' -a -o vg_all --config='global{locking_type=0} devices{filter=[\"a|.*|\"]}'")
     virsh_list_all = simple_command("/usr/bin/virsh --readonly list --all")
     virt_what = simple_command("/usr/sbin/virt-what")
     virt_who_conf = glob_file([r"etc/virt-who.conf", r"etc/virt-who.d/*.conf"])
     virtlogd_conf = simple_file("/etc/libvirt/virtlogd.conf")
-    vmcore_dmesg = glob_file("/var/crash/*/vmcore-dmesg.txt")
     vsftpd = simple_file("/etc/pam.d/vsftpd")
     vsftpd_conf = simple_file("/etc/vsftpd/vsftpd.conf")
     woopsie = simple_command(r"/usr/bin/find /var/crash /var/tmp -path '*.reports-*/whoopsie-report' -print -quit")
@@ -1031,95 +643,11 @@ def tomcat_home_base(broker):
     x86_ibpb_enabled = simple_file("sys/kernel/debug/x86/ibpb_enabled")
     x86_ibrs_enabled = simple_file("sys/kernel/debug/x86/ibrs_enabled")
     x86_retp_enabled = simple_file("sys/kernel/debug/x86/retp_enabled")
-
-    @datasource(Mount)
-    def xfs_mounts(broker):
-        mnt = broker[Mount]
-        mps = mnt.search(mount_type='xfs')
-        return [m.mount_point for m in mps]
-
-    xfs_info = foreach_execute(xfs_mounts, "/usr/sbin/xfs_info %s")
     xinetd_conf = glob_file(["/etc/xinetd.conf", "/etc/xinetd.d/*"])
     yum_conf = simple_file("/etc/yum.conf")
     yum_list_available = simple_command("yum -C --noplugins list available")
-    yum_list_installed = simple_command("yum -C --noplugins list installed")
-    yum_log = simple_file("/var/log/yum.log")
     yum_repolist = simple_command("/usr/bin/yum -C --noplugins repolist")
     yum_repos_d = glob_file("/etc/yum.repos.d/*")
-    zdump_v = simple_command("/usr/sbin/zdump -v /etc/localtime -c 2019,2039")
     zipl_conf = simple_file("/etc/zipl.conf")
-
     rpm_format = format_rpm()
-
-    host_installed_rpms = simple_command("/bin/rpm -qa --qf '%s'" % rpm_format, context=HostContext)
-
-    @datasource(DockerImageContext)
-    def docker_installed_rpms(broker):
-        """ Command: /bin/rpm -qa --root `%s` --qf `%s`"""
-        ctx = broker[DockerImageContext]
-        root = ctx.root
-        fmt = DefaultSpecs.rpm_format
-        cmd = "/bin/rpm -qa --root %s --qf '%s'" % (root, fmt)
-        result = ctx.shell_out(cmd)
-        return CommandOutputProvider(cmd, ctx, content=result)
-
-    # unify the different installed rpm provider types
-    installed_rpms = first_of([host_installed_rpms, docker_installed_rpms])
-
-    @datasource(ps_auxww, context=HostContext)
-    def jboss_home(broker):
-        """Command: JBoss home progress command content paths"""
-        ps = broker[DefaultSpecs.ps_auxww].content
-        results = []
-        findall = re.compile(r"\-Djboss\.home\.dir=(\S+)").findall
-        # JBoss progress command content should contain jboss.home.dir
-        # and any of string ['-D[Standalone]', '-D[Host Controller]', '-D[Server:']
-        for p in ps:
-            if any(i in p for i in ['-D[Standalone]', '-D[Host Controller]', '-D[Server:']):
-                found = findall(p)
-                if found:
-                    # Only get the path which is absolute
-                    results.extend(f for f in found if f[0] == '/')
-        return list(set(results))
-
-    jboss_version = foreach_collect(jboss_home, "%s/version.txt")
-
-    @datasource(ps_auxww, context=HostContext, multi_output=True)
-    def jboss_domain_server_log_dir(broker):
-        """Command: JBoss domain server log directory"""
-        ps = broker[DefaultSpecs.ps_auxww].content
-        results = []
-        findall = re.compile(r"\-Djboss\.server\.log\.dir=(\S+)").findall
-        # JBoss domain server progress command content should contain jboss.server.log.dir
-        for p in ps:
-            if '-D[Server:' in p:
-                found = findall(p)
-                if found:
-                    # Only get the path which is absolute
-                    results.extend(f for f in found if f[0] == '/')
-        return list(set(results))
-
-    jboss_domain_server_log = foreach_collect(jboss_domain_server_log_dir, "%s/server.log*")
-
-    @datasource(ps_auxww, context=HostContext, multi_output=True)
-    def jboss_standalone_main_config_files(broker):
-        """Command: JBoss standalone main config files"""
-        ps = broker[DefaultSpecs.ps_auxww].content
-        results = []
-        search = re.compile(r"\-Djboss\.server\.base\.dir=(\S+)").search
-        # JBoss progress command content should contain jboss.home.dir
-        for p in ps:
-            if '-D[Standalone]' in p:
-                match = search(p)
-                # Only get the path which is absolute
-                if match and match.group(1)[0] == "/":
-                    main_config_path = match.group(1)
-                    main_config_file = "standalone.xml"
-                    if " -c " in p:
-                        main_config_file = p.split(" -c ")[1].split()[0]
-                    elif "--server-config" in p:
-                        main_config_file = p.split("--server-config=")[1].split()[0]
-                    results.append(main_config_path + "/" + main_config_file)
-        return list(set(results))
-
-    jboss_standalone_main_config = foreach_collect(jboss_standalone_main_config_files, "%s")
+    installed_rpms = simple_command("/bin/rpm -qa --qf '%s'" % rpm_format, context=HostContext)
diff --git a/insights/specs/insights_archive.py b/insights/specs/insights_archive.py
index 147bafbceb..f35ae6aad5 100644
--- a/insights/specs/insights_archive.py
+++ b/insights/specs/insights_archive.py
@@ -14,7 +14,6 @@ class InsightsArchiveSpecs(Specs):
     auditctl_status = simple_file("insights_commands/auditctl_-s")
     aws_instance_id_doc = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_aws_instance_id_doc")
     aws_instance_id_pkcs7 = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_aws_instance_id_pkcs7")
-    aws_instance_type = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_aws_instance_type")
     azure_instance_type = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_azure_instance_type")
     bios_uuid = simple_file("insights_commands/dmidecode_-s_system-uuid")
     blkid = simple_file("insights_commands/blkid_-c_.dev.null")
@@ -22,10 +21,7 @@ class InsightsArchiveSpecs(Specs):
     ceph_df_detail = first_file(["insights_commands/ceph_df_detail_-f_json-pretty", "insights_commands/ceph_df_detail_-f_json"])
     ceph_health_detail = first_file(["insights_commands/ceph_health_detail_-f_json-pretty", "insights_commands/ceph_health_detail_-f_json"])
     ceph_insights = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_ceph_insights")
-    ceph_osd_df = first_file(["insights_commands/ceph_osd_df_-f_json-pretty", "insights_commands/ceph_osd_df_-f_json"])
     ceph_osd_dump = first_file(["insights_commands/ceph_osd_dump_-f_json-pretty", "insights_commands/ceph_osd_dump_-f_json"])
-    ceph_osd_ec_profile_ls = simple_file("insights_commands/ceph_osd_erasure-code-profile_ls")
-    ceph_osd_ec_profile_get = simple_file("insights_commands/ceph_osd_erasure-code-profile_get_s_-f_json")
     ceph_osd_tree = first_file(["insights_commands/ceph_osd_tree_-f_json-pretty", "insights_commands/ceph_osd_tree_-f_json"])
     ceph_s = first_file(["insights_commands/ceph_-s_-f_json-pretty", "insights_commands/ceph_-s_-f_json"])
     ceph_v = simple_file("insights_commands/ceph_-v")
@@ -33,47 +29,32 @@ class InsightsArchiveSpecs(Specs):
     chkconfig = simple_file("insights_commands/chkconfig_--list")
     chronyc_sources = simple_file("insights_commands/chronyc_sources")
     cpupower_frequency_info = simple_file("insights_commands/cpupower_-c_all_frequency-info")
-    corosync_cmapctl = glob_file("insights_commands/corosync-cmapctl*")
-    crt = simple_file("insights_commands/find_.etc.origin.node_.etc.origin.master_-type_f_-path_.crt")
     date = simple_file("insights_commands/date")
-    date_iso = simple_file("insights_commands/date_--iso-8601_seconds")
     date_utc = simple_file("insights_commands/date_--utc")
     df__al = simple_file("insights_commands/df_-al")
     df__alP = simple_file("insights_commands/df_-alP")
     df__li = simple_file("insights_commands/df_-li")
-    dig = simple_file("insights_commands/dig_dnssec_._DNSKEY")
     dig_dnssec = simple_file("insights_commands/dig_dnssec_._SOA")
     dig_edns = simple_file("insights_commands/dig_edns_0_._SOA")
     dig_noedns = simple_file("insights_commands/dig_noedns_._SOA")
-    display_java = simple_file("insights_commands/alternatives_--display_java")
     display_name = simple_file("display_name")
     dmesg = simple_file("insights_commands/dmesg")
     dmidecode = simple_file("insights_commands/dmidecode")
-    dmsetup_info = simple_file("insights_commands/dmsetup_info_-C")
-    dnf_module_list = simple_file("insights_commands/dnf_-C_--noplugins_module_list")
-    dnf_module_info = glob_file("insights_commands/dnf_-C_--noplugins_module_info_*")
     docker_info = simple_file("insights_commands/docker_info")
     docker_list_containers = simple_file("insights_commands/docker_ps_--all_--no-trunc")
     docker_list_images = simple_file("insights_commands/docker_images_--all_--no-trunc_--digests")
-    du_dirs = glob_file("insights_commands/du_-s_-k_*")
-    engine_config_all = simple_file("insights_commands/engine-config_--all")
     engine_db_query_vdsm_version = simple_file("insights_commands/engine-db-query_-s_SELECT_vs.vds_name_rpm_version_FROM_vds_dynamic_vd_vds_static_vs_WHERE_vd.vds_id_vs.vds_id_--json")
     ethtool = glob_file("insights_commands/ethtool_*", ignore="ethtool_-.*")
     ethtool_S = glob_file("insights_commands/ethtool_-S_*")
     ethtool_T = glob_file("insights_commands/ethtool_-T_*")
-    ethtool_a = glob_file("insights_commands/ethtool_-a_*")
-    ethtool_c = glob_file("insights_commands/ethtool_-c_*")
     ethtool_g = glob_file("insights_commands/ethtool_-g_*")
     ethtool_i = glob_file("insights_commands/ethtool_-i_*")
     ethtool_k = glob_file("insights_commands/ethtool_-k_*")
     facter = simple_file("insights_commands/facter")
     fc_match = simple_file("insights_commands/fc-match_-sv_sans_regular_roman_family_fontformat")
     fcoeadm_i = simple_file("insights_commands/fcoeadm_-i")
-    fdisk_l = simple_file("insights_commands/fdisk_-l")
     findmnt_lo_propagation = simple_file("insights_commands/findmnt_-lo_PROPAGATION")
     firewall_cmd_list_all_zones = simple_file("insights_commands/firewall-cmd_--list-all-zones")
-    foreman_rake_db_migrate_status = simple_file('insights_commands/foreman-rake_db_migrate_status')
-    getcert_list = simple_file("insights_commands/getcert_list")
     getconf_page_size = simple_file("insights_commands/getconf_PAGE_SIZE")
     getenforce = simple_file("insights_commands/getenforce")
     getsebool = simple_file("insights_commands/getsebool_-a")
@@ -82,22 +63,14 @@ class InsightsArchiveSpecs(Specs):
     grubby_default_index = simple_file("insights_commands/grubby_--default-index")
     grubby_default_kernel = simple_file("insights_commands/grubby_--default-kernel")
     gluster_v_info = simple_file("insights_commands/gluster_volume_info")
-    gluster_v_status = simple_file("insights_commands/gluster_volume_status")
-    gluster_peer_status = simple_file("insights_commands/gluster_peer_status")
-    hammer_ping = simple_file("insights_commands/hammer_ping")
     hammer_task_list = simple_file("insights_commands/hammer_--config_.root..hammer.cli.modules.d.foreman.yml_--output_csv_task_list_--search_state_running_AND_label_Actions_Candlepin_ListenOnCandlepinEvents_OR_label_Actions_Katello_EventQueue_Monitor")
-    heat_crontab = simple_file("insights_commands/crontab_-l_-u_heat")
-    heat_crontab_container = simple_file("insights_commands/docker_exec_heat_api_cron_.usr.bin.crontab_-l_-u_heat")
     installed_rpms = head(all_installed_rpms)
     hostname = simple_file("insights_commands/hostname_-f")
     hostname_default = simple_file("insights_commands/hostname")
     hostname_short = simple_file("insights_commands/hostname_-s")
-    hponcfg_g = simple_file("insights_commands/hponcfg_-g")
     httpd_M = glob_file("insights_commands/*httpd*_-M")
     httpd_on_nfs = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_httpd_on_nfs")
-    httpd_pid = simple_file("insights_commands/pgrep_-o_httpd")
     httpd_V = glob_file("insights_commands/*httpd*_-V")
-    ifconfig = simple_file("insights_commands/ifconfig_-a")
     ip6tables = simple_file("insights_commands/ip6tables-save")
     ip_addr = simple_file("insights_commands/ip_addr")
     ip_addresses = simple_file("insights_commands/hostname_-I")
@@ -109,22 +82,16 @@ class InsightsArchiveSpecs(Specs):
     iptables = simple_file("insights_commands/iptables-save")
     ipv4_neigh = simple_file("insights_commands/ip_-4_neighbor_show_nud_all")
     ipv6_neigh = simple_file("insights_commands/ip_-6_neighbor_show_nud_all")
-    ip_netns_exec_namespace_lsof = glob_file("insights_commands/ip_netns_exec_*_lsof_-i")
     iscsiadm_m_session = simple_file("insights_commands/iscsiadm_-m_session")
-    katello_service_status = simple_file("insights_commands/katello-service_status")
     keystone_crontab = simple_file("insights_commands/crontab_-l_-u_keystone")
-    keystone_crontab_container = simple_file("insights_commands/docker_exec_keystone_cron_.usr.bin.crontab_-l_-u_keystone")
     kpatch_list = simple_file("insights_commands/kpatch_list")
     libkeyutils = simple_file("insights_commands/find_-L_.lib_.lib64_-name_libkeyutils.so")
     libkeyutils_objdumps = simple_file("insights_commands/find_-L_.lib_.lib64_-name_libkeyutils.so.1_-exec_objdump_-x")
-    locale = simple_file("insights_commands/locale")
     localtime = simple_file("insights_commands/file_-L_.etc.localtime")
     lpstat_p = simple_file("insights_commands/lpstat_-p")
     ls_boot = simple_file("insights_commands/ls_-lanR_.boot")
     ls_dev = simple_file("insights_commands/ls_-lanR_.dev")
     ls_disk = simple_file("insights_commands/ls_-lanR_.dev.disk")
-    ls_docker_volumes = simple_file("insights_commands/ls_-lanR_.var.lib.docker.volumes")
-    ls_edac_mc = simple_file("insights_commands/ls_-lan_.sys.devices.system.edac.mc")
     ls_etc = simple_file("insights_commands/ls_-lan_.etc_.etc.cloud.cloud.cfg.d_.etc.nova.migration_.etc.pki.ovirt-vmconsole_.etc.pki.tls.certs_.etc.pki.tls.private_.etc.sysconfig")
     ls_lib_firmware = simple_file("insights_commands/ls_-lanR_.lib.firmware")
     ls_ocp_cni_openshift_sdn = simple_file("insights_commands/ls_-l_.var.lib.cni.networks.openshift-sdn")
@@ -133,8 +100,8 @@ class InsightsArchiveSpecs(Specs):
     ls_run_systemd_generator = simple_file("insights_commands/ls_-lan_.run.systemd.generator")
     ls_R_var_lib_nova_instances = simple_file("insights_commands/ls_-laR_.var.lib.nova.instances")
     ls_sys_firmware = simple_file("insights_commands/ls_-lanR_.sys.firmware")
+    ls_tmp = simple_file("insights_commands/ls_-la_.tmp")
     ls_usr_lib64 = simple_file("insights_commands/ls_-lan_.usr.lib64")
-    ls_usr_sbin = simple_file("insights_commands/ls_-ln_.usr.sbin")
     ls_var_lib_mongodb = simple_file("insights_commands/ls_-la_.var.lib.mongodb")
     ls_var_lib_nova_instances = simple_file("insights_commands/ls_-laRZ_.var.lib.nova.instances")
     ls_var_log = simple_file("insights_commands/ls_-la_.var.log_.var.log.audit")
@@ -145,23 +112,19 @@ class InsightsArchiveSpecs(Specs):
     ls_var_tmp = simple_file("insights_commands/ls_-ln_.var.tmp")
     ls_var_run = simple_file("insights_commands/ls_-lnL_.var.run")
     ls_var_www = simple_file("insights_commands/ls_-la_.dev.null_.var.www")
-    ls_tmp = simple_file("insights_commands/ls_-la_.tmp")
     lsblk = simple_file("insights_commands/lsblk")
     lsblk_pairs = simple_file("insights_commands/lsblk_-P_-o_NAME_KNAME_MAJ_MIN_FSTYPE_MOUNTPOINT_LABEL_UUID_RA_RO_RM_MODEL_SIZE_STATE_OWNER_GROUP_MODE_ALIGNMENT_MIN-IO_OPT-IO_PHY-SEC_LOG-SEC_ROTA_SCHED_RQ-SIZE_TYPE_DISC-ALN_DISC-GRAN_DISC-MAX_DISC-ZERO")
     lscpu = simple_file("insights_commands/lscpu")
-    lsinitrd = simple_file("insights_commands/lsinitrd")
     lsmod = simple_file("insights_commands/lsmod")
     lsof = simple_file("insights_commands/lsof")
     lspci = simple_file("insights_commands/lspci_-k")
     lssap = simple_file("insights_commands/usr.sap.hostctrl.exe.lssap")
     lsscsi = simple_file("insights_commands/lsscsi")
-    lvdisplay = simple_file("insights_commands/lvdisplay")
     lvmconfig = first_file([
         "insights_commands/lvmconfig_--type_full",
         "insights_commands/lvm_dumpconfig_--type_full"
     ])
     lvs_noheadings = simple_file("insights_commands/lvs_--nameprefixes_--noheadings_--separator_-a_-o_lv_name_lv_size_lv_attr_mirror_log_vg_name_devices_region_size_data_percent_metadata_percent_segtype_seg_monitor_--config_global_locking_type_0")
-    lvs_noheadings_all = simple_file("insights_commands/lvs_--nameprefixes_--noheadings_--separator_-a_-o_lv_name_lv_size_lv_attr_mirror_log_vg_name_devices_region_size_data_percent_metadata_percent_segtype_--config_global_locking_type_0_devices_filter_a")
     max_uid = simple_file("insights_commands/awk_-F_if_3_max_max_3_END_print_max_.etc.passwd")
     md5chk_files = glob_file("insights_commands/md5sum_*")
     mount = simple_file("insights_commands/mount")
@@ -175,9 +138,7 @@ class InsightsArchiveSpecs(Specs):
     multipath_conf_initramfs = simple_file("insights_commands/lsinitrd_-f_.etc.multipath.conf")
     multipath__v4__ll = simple_file("insights_commands/multipath_-v4_-ll")
     mysqladmin_vars = simple_file("insights_commands/mysqladmin_variables")
-    mysqladmin_status = simple_file("insights_commands/mysqladmin_status")
     named_checkconf_p = simple_file("insights_commands/named-checkconf_-p")
-    namespace = simple_file("insights_commands/ls_.var.run.netns")
     ndctl_list_Ni = simple_file("insights_commands/ndctl_list_-Ni")
     netstat = simple_file("insights_commands/netstat_-neopa")
     netstat_agn = simple_file("insights_commands/netstat_-agn")
@@ -186,41 +147,18 @@ class InsightsArchiveSpecs(Specs):
     nmcli_conn_show = simple_file("insights_commands/nmcli_conn_show")
     nmcli_dev_show = simple_file("insights_commands/nmcli_dev_show")
     nova_crontab = simple_file("insights_commands/crontab_-l_-u_nova")
-    nova_crontab_container = simple_file("insights_commands/docker_exec_nova_api_cron_.usr.bin.crontab_-l_-u_nova")
     nova_uid = simple_file("insights_commands/id_-u_nova")
-    nova_migration_uid = simple_file("insights_commands/id_-u_nova_migration")
     ntpq_leap = simple_file("insights_commands/ntpq_-c_rv_0_leap")
-    ntpq_pn = simple_file("insights_commands/ntpq_-pn")
     ntptime = simple_file("insights_commands/ntptime")
     numeric_user_group_name = simple_file("insights_commands/grep_-c_digit_.etc.passwd_.etc.group")
-    oc_get_bc = simple_file("insights_commands/oc_get_bc_-o_yaml_--all-namespaces")
-    oc_get_build = simple_file("insights_commands/oc_get_build_-o_yaml_--all-namespaces")
     oc_get_clusterrole_with_config = simple_file("insights_commands/oc_get_clusterrole_--config_.etc.origin.master.admin.kubeconfig")
     oc_get_clusterrolebinding_with_config = simple_file("insights_commands/oc_get_clusterrolebinding_--config_.etc.origin.master.admin.kubeconfig")
-    oc_get_dc = simple_file("insights_commands/oc_get_dc_-o_yaml_--all-namespaces")
-    oc_get_egressnetworkpolicy = simple_file("insights_commands/oc_get_egressnetworkpolicy_-o_yaml_--all-namespaces")
-    oc_get_endpoints = simple_file("insights_commands/oc_get_endpoints_-o_yaml_--all-namespaces")
-    oc_get_event = simple_file("insights_commands/oc_get_event_-o_yaml_--all-namespaces")
-    oc_get_node = simple_file("insights_commands/oc_get_nodes_-o_yaml")
-    oc_get_pod = simple_file("insights_commands/oc_get_pod_-o_yaml_--all-namespaces")
-    oc_get_project = simple_file("insights_commands/oc_get_project_-o_yaml_--all-namespaces")
-    oc_get_pv = simple_file("insights_commands/oc_get_pv_-o_yaml_--all-namespaces")
-    oc_get_pvc = simple_file("insights_commands/oc_get_pvc_-o_yaml_--all-namespaces")
-    oc_get_rc = simple_file("insights_commands/oc_get_rc_-o_yaml_--all-namespaces")
-    oc_get_role = simple_file("insights_commands/oc_get_role_-o_yaml_--all-namespaces")
-    oc_get_rolebinding = simple_file("insights_commands/oc_get_rolebinding_-o_yaml_--all-namespaces")
-    oc_get_route = simple_file("insights_commands/oc_get_route_-o_yaml_--all-namespaces")
-    oc_get_service = simple_file("insights_commands/oc_get_service_-o_yaml_--all-namespaces")
-    oc_get_configmap = simple_file("insights_commands/oc_get_configmap_-o_yaml_--all-namespaces")
     openvswitch_other_config = simple_file("insights_commands/ovs-vsctl_-t_5_get_Open_vSwitch_._other_config")
-    ovs_appctl_fdb_show_bridge = glob_file("insights_commands/ovs-appctl_fdb.show_*")
-    ovs_ofctl_dump_flows = glob_file("insights_commands/ovs-ofctl_dump-flows_*")
     ovs_vsctl_list_bridge = simple_file("insights_commands/ovs-vsctl_list_bridge")
     ovs_vsctl_show = simple_file("insights_commands/ovs-vsctl_show")
-    parted__l = simple_file("insights_commands/parted_-l_-s")
     passenger_status = simple_file("insights_commands/passenger-status")
     pci_rport_target_disk_paths = simple_file("insights_commands/find_.sys.devices._-maxdepth_10_-mindepth_9_-name_stat_-type_f")
-    pcs_config = simple_file("insights_commands/pcs_config")
+    pcp_metrics = simple_file("insights_commands/curl_-s_http_..127.0.0.1_44322.metrics_--connect-timeout_5")
     pcs_quorum_status = simple_file("insights_commands/pcs_quorum_status")
     pcs_status = simple_file("insights_commands/pcs_status")
     ps_alxwww = simple_file("insights_commands/ps_alxwww")
@@ -229,46 +167,27 @@ class InsightsArchiveSpecs(Specs):
     ps_auxww = simple_file("insights_commands/ps_auxww")
     ps_ef = simple_file("insights_commands/ps_-ef")
     ps_eo = simple_file("insights_commands/ps_-eo_pid_ppid_comm")
-    pvs = simple_file("insights_commands/pvs_-a_-v_-o_pv_mda_free_pv_mda_size_pv_mda_count_pv_mda_used_count_pe_count_--config_global_locking_type_0")
     pvs_noheadings = simple_file("insights_commands/pvs_--nameprefixes_--noheadings_--separator_-a_-o_pv_all_vg_name_--config_global_locking_type_0")
-    pvs_noheadings_all = simple_file("insights_commands/pvs_--nameprefixes_--noheadings_--separator_-a_-o_pv_all_vg_name_--config_global_locking_type_0_devices_filter_a")
     qpid_stat_g = simple_file("insights_commands/qpid-stat_-g_--ssl-certificate_.etc.pki.katello.qpid_client_striped.crt_-b_amqps_..localhost_5671")
-    qpid_stat_q = simple_file("insights_commands/qpid-stat_-q_--ssl-certificate_.etc.pki.katello.qpid_client_striped.crt_-b_amqps_..localhost_5671")
-    qpid_stat_u = simple_file("insights_commands/qpid-stat_-u_--ssl-certificate_.etc.pki.katello.qpid_client_striped.crt_-b_amqps_..localhost_5671")
-    rabbitmq_policies = simple_file("insights_commands/rabbitmqctl_list_policies")
-    rabbitmq_queues = simple_file("insights_commands/rabbitmqctl_list_queues_name_messages_consumers_auto_delete")
     rabbitmq_report = simple_file("insights_commands/rabbitmqctl_report")
     rabbitmq_users = simple_file("insights_commands/rabbitmqctl_list_users")
     readlink_e_etc_mtab = simple_file("insights_commands/readlink_-e_.etc.mtab")
     readlink_e_shift_cert_client = simple_file("insights_commands/readlink_-e_.etc.origin.node.certificates.kubelet-client-current.pem")
     readlink_e_shift_cert_server = simple_file("insights_commands/readlink_-e_.etc.origin.node.certificates.kubelet-server-current.pem")
-    rhn_charsets = simple_file("insights_commands/rhn-charsets")
-    rhn_schema_stats = simple_file("insights_commands/rhn-schema-stats")
     rhn_schema_version = simple_file("insights_commands/rhn-schema-version")
     rhev_data_center = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_rhev_data_center")
-    rhv_log_collector_analyzer = simple_file("insights_commands/rhv-log-collector-analyzer_--json")
-    root_crontab = simple_file("insights_commands/crontab_-l_-u_root")
     rndc_status = simple_file("insights_commands/rndc_status")
-    route = simple_file("insights_commands/route_-n")
     rpm_V_packages = first_file(["insights_commands/rpm_-V_coreutils_procps_procps-ng_shadow-utils_passwd_sudo_chrony", "insights_commands/rpm_-V_coreutils_procps_procps-ng_shadow-utils_passwd_sudo"])
-    sapcontrol_getsystemupdatelist = simple_file("insights_commands/python_-m_insights.tools.cat_--no-header_sapcontrol_getsystemupdatelist")
     saphostctl_getcimobject_sapinstance = simple_file("insights_commands/usr.sap.hostctrl.exe.saphostctrl_-function_GetCIMObject_-enuminstances_SAPInstance")
-    saphostexec_status = simple_file("insights_commands/usr.sap.hostctrl.exe.saphostexec_-status")
-    saphostexec_version = simple_file("insights_commands/usr.sap.hostctrl.exe.saphostexec_-version")
-    satellite_enabled_features = simple_file("insights_commands/curl_-sk_https_..localhost_9090.features_--connect-timeout_5")
     satellite_mongodb_storage_engine = simple_file("insights_commands/mongo_pulp_database_--eval_db.serverStatus_.storageEngine")
     sealert = simple_file('insights_commands/sealert_-l')
     sestatus = simple_file("insights_commands/sestatus_-b")
-    smbstatus_S = simple_file("insights_commands/smbstatus_-S")
     smbstatus_p = simple_file("insights_commands/smbstatus_-p")
     software_collections_list = simple_file('insights_commands/scl_--list')
     ss = simple_file("insights_commands/ss_-tupna")
     sshd_config_perms = simple_file("insights_commands/ls_-l_.etc.ssh.sshd_config")
-    subscription_manager_installed_product_ids = simple_file("insights_commands/find_.etc.pki.product-default._.etc.pki.product._-name_pem_-exec_rct_cat-cert_--no-content")
     subscription_manager_id = simple_file("insights_commands/subscription-manager_identity")
-    subscription_manager_release_show = simple_file('insights_commands/subscription-manager_release_--show')
     sysctl = simple_file("insights_commands/sysctl_-a")
-    sysctl_conf_initramfs = glob_file("insights_commands/lsinitrd_.boot.*_-f_.etc.sysctl.conf_.etc.sysctl.d._.conf")
     systemctl_cat_rpcbind_socket = simple_file("insights_commands/systemctl_cat_rpcbind.socket")
     systemctl_cinder_volume = simple_file("insights_commands/systemctl_show_openstack-cinder-volume")
     systemctl_httpd = simple_file("insights_commands/systemctl_show_httpd")
@@ -276,9 +195,6 @@ class InsightsArchiveSpecs(Specs):
     systemctl_list_unit_files = simple_file("insights_commands/systemctl_list-unit-files")
     systemctl_list_units = simple_file("insights_commands/systemctl_list-units")
     systemctl_mariadb = simple_file("insights_commands/systemctl_show_mariadb")
-    systemctl_pulp_workers = simple_file("insights_commands/systemctl_show_pulp_workers")
-    systemctl_pulp_resmg = simple_file("insights_commands/systemctl_show_pulp_resource_manager")
-    systemctl_pulp_celerybeat = simple_file("insights_commands/systemctl_show_pulp_celerybeat")
     systemctl_qpidd = simple_file("insights_commands/systemctl_show_qpidd")
     systemctl_qdrouterd = simple_file("insights_commands/systemctl_show_qdrouterd")
     systemctl_show_all_services = simple_file("insights_commands/systemctl_show_.service")
@@ -288,8 +204,6 @@ class InsightsArchiveSpecs(Specs):
     systemd_docker = first_file(["insights_commands/systemctl_cat_docker.service", "/usr/lib/systemd/system/docker.service"])
     systemd_openshift_node = first_file(["insights_commands/systemctl_cat_atomic-openshift-node.service", "/usr/lib/systemd/system/atomic-openshift-node.service"])
     systool_b_scsi_v = simple_file("insights_commands/systool_-b_scsi_-v")
-    teamdctl_config_dump = glob_file("insights_commands/teamdctl_*_config_dump")
-    teamdctl_state_dump = glob_file("insights_commands/teamdctl_*_state_dump")
     tomcat_vdc_fallback = simple_file("insights_commands/find_.usr.share_-maxdepth_1_-name_tomcat_-exec_.bin.grep_-R_-s_VirtualDirContext_--include_.xml")
     tuned_adm = simple_file("insights_commands/tuned-adm_list")
     uname = simple_file("insights_commands/uname_-a")
@@ -298,11 +212,8 @@ class InsightsArchiveSpecs(Specs):
     vdo_status = simple_file("insights_commands/vdo_status")
     vgdisplay = simple_file("insights_commands/vgdisplay")
     vgs_noheadings = simple_file("insights_commands/vgs_--nameprefixes_--noheadings_--separator_-a_-o_vg_all_--config_global_locking_type_0")
-    vgs_noheadings_all = simple_file("insights_commands/vgs_--nameprefixes_--noheadings_--separator_-a_-o_vg_all_--config_global_locking_type_0_devices_filter_a")
     virsh_list_all = simple_file("insights_commands/virsh_--readonly_list_--all")
     virt_what = simple_file("insights_commands/virt-what")
     woopsie = simple_file("insights_commands/find_.var.crash_.var.tmp_-path_.reports-_.whoopsie-report")
-    yum_list_installed = simple_file("insights_commands/yum_-C_--noplugins_list_installed")
     yum_list_available = simple_file("insights_commands/yum_-C_--noplugins_list_available")
     yum_repolist = first_file(["insights_commands/yum_-C_--noplugins_repolist", "insights_commands/yum_-C_repolist"])
-    zdump_v = simple_file("insights_commands/zdump_-v_.etc.localtime_-c_2019_2039")
diff --git a/insights/specs/sos_archive.py b/insights/specs/sos_archive.py
index 8f4e923427..5f9aeb89a6 100644
--- a/insights/specs/sos_archive.py
+++ b/insights/specs/sos_archive.py
@@ -10,6 +10,8 @@
 
 class SosSpecs(Specs):
     auditctl_status = simple_file("sos_commands/auditd/auditctl_-s")
+    autofs_conf = simple_file("/etc/autofs.conf")
+
     blkid = first_file(["sos_commands/block/blkid_-c_.dev.null", "sos_commands/filesys/blkid_-c_.dev.null"])
     candlepin_log = first_of([
         simple_file("/var/log/candlepin/candlepin.log"),
@@ -21,9 +23,11 @@ class SosSpecs(Specs):
     ])
     catalina_out = glob_file("var/log/tomcat*/catalina.out")
     catalina_server_log = glob_file("var/log/tomcat*/catalina*.log")
+    ceilometer_central_log = simple_file("/var/log/ceilometer/central.log")
     ceph_osd_tree_text = simple_file("sos_commands/ceph/ceph_osd_tree")
     ceph_report = simple_file("sos_commands/ceph/ceph_report")
     ceph_health_detail = simple_file("sos_commands/ceph/ceph_health_detail_--format_json-pretty")
+    checkin_conf = simple_file("/etc/splice/checkin.conf")
     chkconfig = first_file(["sos_commands/startup/chkconfig_--list", "sos_commands/services/chkconfig_--list"])
     cib_xml = first_of(
         [
@@ -33,18 +37,33 @@ class SosSpecs(Specs):
             )
         ]
     )
+    cni_podman_bridge_conf = simple_file("/etc/cni/net.d/87-podman-bridge.conflist")
     corosync_cmapctl = glob_file("sos_commands/corosync/corosync-cmapctl*")
+    cpe = simple_file("/etc/system-release-cpe")
+    cpu_smt_control = simple_file("sys/devices/system/cpu/smt/control")
+    cpu_vulns_meltdown = simple_file("sys/devices/system/cpu/vulnerabilities/meltdown")
+    cpu_vulns_spectre_v1 = simple_file("sys/devices/system/cpu/vulnerabilities/spectre_v1")
+    cpu_vulns_spectre_v2 = simple_file("sys/devices/system/cpu/vulnerabilities/spectre_v2")
+    cpu_vulns_spec_store_bypass = simple_file("sys/devices/system/cpu/vulnerabilities/spec_store_bypass")
+    cpuinfo_max_freq = simple_file("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq")
     cpupower_frequency_info = simple_file("sos_commands/processor/cpupower_frequency-info")
     date = first_of([simple_file("sos_commands/general/date"), simple_file("sos_commands/date/date")])
     df__al = first_file(["sos_commands/filesys/df_-al", "sos_commands/filesys/df_-al_-x_autofs"])
+    dirsrv = simple_file("/etc/sysconfig/dirsrv")
+    dirsrv_access = glob_file("var/log/dirsrv/*/access*")
     display_java = simple_file("sos_commands/java/alternatives_--display_java")
+    dnf_modules = glob_file("/etc/dnf/modules.d/*.module")
+    docker_host_machine_id = simple_file("/etc/redhat-access-insights/machine-id")
+    docker_image_inspect = glob_file("sos_commands/docker/docker_inspect_*")
     docker_info = simple_file("sos_commands/docker/docker_info")
     docker_list_containers = first_file(["sos_commands/docker/docker_ps_-a", "sos_commands/docker/docker_ps"])
     docker_list_images = simple_file("sos_commands/docker/docker_images")
-    docker_image_inspect = glob_file("sos_commands/docker/docker_inspect_*")
+    docker_network = simple_file("/etc/sysconfig/docker-network")
+    docker_storage = simple_file("/etc/sysconfig/docker-storage")
     dmesg = first_file(["sos_commands/kernel/dmesg", "sos_commands/general/dmesg", "var/log/dmesg"])
     dmidecode = simple_file("sos_commands/hardware/dmidecode")
     dmsetup_info = simple_file("sos_commands/devicemapper/dmsetup_info_-c")
+    dnsmasq_config = glob_file(["/etc/dnsmasq.conf", "/etc/dnsmasq.d/*.conf"])
     dumpe2fs_h = glob_file("sos_commands/filesys/dumpe2fs_-h_*")
     ethtool = glob_file("sos_commands/networking/ethtool_*", ignore="ethtool_-.*")
     ethtool_S = glob_file("sos_commands/networking/ethtool_-S_*")
@@ -54,28 +73,48 @@ class SosSpecs(Specs):
     ethtool_g = glob_file("sos_commands/networking/ethtool_-g_*")
     ethtool_i = glob_file("sos_commands/networking/ethtool_-i_*")
     ethtool_k = glob_file("sos_commands/networking/ethtool_-k_*")
+    exim_conf = simple_file("etc/exim.conf")
     fdisk_l_sos = first_of([glob_file(r"sos_commands/filesys/fdisk_-l_*"), glob_file(r"sos_commands/block/fdisk_-l_*")])
     foreman_production_log = first_of([simple_file("/var/log/foreman/production.log"), simple_file("sos_commands/foreman/foreman-debug/var/log/foreman/production.log")])
     foreman_proxy_conf = first_of([simple_file("/etc/foreman-proxy/settings.yml"), simple_file("sos_commands/foreman/foreman-debug/etc/foreman-proxy/settings.yml")])
     foreman_proxy_log = first_of([simple_file("/var/log/foreman-proxy/proxy.log"), simple_file("sos_commands/foreman/foreman-debug/var/log/foreman-proxy/proxy.log")])
     foreman_satellite_log = first_of([simple_file("/var/log/foreman-installer/satellite.log"), simple_file("sos_commands/foreman/foreman-debug/var/log/foreman-installer/satellite.log")])
     foreman_ssl_access_ssl_log = first_file(["var/log/httpd/foreman-ssl_access_ssl.log", r"sos_commands/foreman/foreman-debug/var/log/httpd/foreman-ssl_access_ssl.log"])
+    foreman_tasks_config = first_file(["/etc/sysconfig/foreman-tasks", "/etc/sysconfig/dynflowd"])
+    freeipa_healthcheck_log = simple_file("/var/log/ipa/healthcheck/healthcheck.log")
     hammer_ping = first_file(["sos_commands/foreman/hammer_ping", "sos_commands/foreman/foreman-debug/hammer-ping"])
     getcert_list = first_file(["sos_commands/ipa/ipa-getcert_list", "sos_commands/ipa/getcert_list"])
+    glance_api_conf = first_file(["/var/lib/config-data/puppet-generated/glance_api/etc/glance/glance-api.conf", "/etc/glance/glance-api.conf"])
+    glance_api_log = first_file(["/var/log/containers/glance/api.log", "/var/log/glance/api.log"])
+    glance_cache_conf = first_file(["/var/lib/config-data/puppet-generated/glance_api/etc/glance/glance-cache.conf", "/etc/glance/glance-cache.conf"])
+    glance_registry_conf = simple_file("/etc/glance/glance-registry.conf")
     gluster_v_info = simple_file("sos_commands/gluster/gluster_volume_info")
     gluster_v_status = simple_file("sos_commands/gluster/gluster_volume_status")
     gluster_peer_status = simple_file("sos_commands/gluster/gluster_peer_status")
+    heat_engine_log = first_file(["/var/log/containers/heat/heat-engine.log", "/var/log/heat/heat-engine.log"])
     hostname = first_file(["sos_commands/general/hostname_-f", "sos_commands/host/hostname_-f"])
     hostname_default = first_file(["sos_commands/general/hostname", "sos_commands/host/hostname", "/etc/hostname", "hostname"])
     hostname_short = first_file(["sos_commands/general/hostname", "sos_commands/host/hostname", "/etc/hostname", "hostname"])
+    httpd_access_log = simple_file("/var/log/httpd/access_log")
     httpd_M = simple_file("sos_commands/apache/apachectl_-M")
+    httpd_ssl_access_log = simple_file("/var/log/httpd/ssl_access_log")
+    httpd_ssl_error_log = simple_file("/var/log/httpd/ssl_error_log")
+    initscript = glob_file(r"etc/rc.d/init.d/*")
     installed_rpms = first_file(["sos_commands/rpm/package-data", "installed-rpms"])
     ip_addr = first_of([simple_file("sos_commands/networking/ip_-d_address"), simple_file("sos_commands/networking/ip_address")])
     ip_neigh_show = first_file(["sos_commands/networking/ip_-s_-s_neigh_show", "sos_commands/networking/ip_neigh_show"])
     ip_route_show_table_all = simple_file("sos_commands/networking/ip_route_show_table_all")
     ip_s_link = first_of([simple_file("sos_commands/networking/ip_-s_-d_link"), simple_file("sos_commands/networking/ip_-s_link"), simple_file("sos_commands/networking/ip_link")])
+    ip6tables_permanent = simple_file("etc/sysconfig/ip6tables")
     iptables = first_file(["/etc/sysconfig/iptables", "/etc/sysconfig/iptables.save"])
     journal_since_boot = first_of([simple_file("sos_commands/logs/journalctl_--no-pager_--boot"), simple_file("sos_commands/logs/journalctl_--no-pager_--catalog_--boot"), simple_file("sos_commands/logs/journalctl_--all_--this-boot_--no-pager")])
+    ironic_conf = first_file(["/var/lib/config-data/puppet-generated/ironic/etc/ironic/ironic.conf", "/etc/ironic/ironic.conf"])
+    journal_since_boot = first_of([simple_file("sos_commands/logs/journalctl_--no-pager_--boot"), simple_file("sos_commands/logs/journalctl_--no-pager_--catalog_--boot")])
+    kerberos_kdc_log = simple_file("var/log/krb5kdc.log")
+    keystone_log = first_file(["/var/log/containers/keystone/keystone.log", "/var/log/keystone/keystone.log"])
+    kexec_crash_loaded = simple_file("/sys/kernel/kexec_crash_loaded")
+    keystone_conf = first_file(["/var/lib/config-data/puppet-generated/keystone/etc/keystone/keystone.conf", "/etc/keystone/keystone.conf"])
+    libvirtd_qemu_log = glob_file(r"/var/log/libvirt/qemu/*.log")
     locale = simple_file("sos_commands/i18n/locale")
     lsblk = first_file(["sos_commands/block/lsblk", "sos_commands/filesys/lsblk"])
     ls_boot = simple_file("sos_commands/boot/ls_-lanR_.boot")
@@ -91,17 +130,35 @@ class SosSpecs(Specs):
     lsscsi = simple_file("sos_commands/scsi/lsscsi")
     ls_dev = first_file(["sos_commands/block/ls_-lanR_.dev", "sos_commands/devicemapper/ls_-lanR_.dev"])
     lvs = first_file(["sos_commands/lvm2/lvs_-a_-o_lv_tags_devices_--config_global_locking_type_0", "sos_commands/lvm2/lvs_-a_-o_devices"])
+    manila_conf = first_file(["/var/lib/config-data/puppet-generated/manila/etc/manila/manila.conf", "/etc/manila/manila.conf"])
+    mistral_executor_log = simple_file("/var/log/mistral/executor.log")
     modinfo_all = glob_file("sos_commands/kernel/modinfo_*")
     mount = simple_file("sos_commands/filesys/mount_-l")
+    mounts = simple_file("/proc/mounts")
+    mlx4_port = glob_file("/sys/bus/pci/devices/*/mlx4_port[0-9]")
     multipath__v4__ll = first_file(["sos_commands/multipath/multipath_-v4_-ll", "sos_commands/devicemapper/multipath_-v4_-ll"])
     netstat = first_file(["sos_commands/networking/netstat_-neopa", "sos_commands/networking/netstat_-W_-neopa", "sos_commands/networking/netstat_-T_-neopa"])
     netstat_agn = first_of([simple_file("sos_commands/networking/netstat_-agn"), simple_file("sos_commands/networking/netstat_-W_-agn"), simple_file("sos_commands/networking/netstat_-T_-agn")])
     netstat_s = simple_file("sos_commands/networking/netstat_-s")
+    neutron_ml2_conf = first_file(["/var/lib/config-data/puppet-generated/neutron/etc/neutron/plugins/ml2/ml2_conf.ini", "/etc/neutron/plugins/ml2/ml2_conf.ini"])
+    neutron_server_log = first_file(["/var/log/containers/neutron/server.log", "/var/log/neutron/server.log"])
     nmcli_dev_show = simple_file("sos_commands/networking/nmcli_device_show")
     nmcli_dev_show_sos = glob_file(["sos_commands/networking/nmcli_dev_show_*", "sos_commands/networkmanager/nmcli_dev_show_*"])
     ntptime = simple_file("sos_commands/ntp/ntptime")
+    octavia_conf = simple_file("/var/lib/config-data/puppet-generated/octavia/etc/octavia/octavia.conf")
+    openvswitch_daemon_log = simple_file('/var/log/openvswitch/ovs-vswitchd.log')
     openvswitch_other_config = simple_file("sos_commands/openvswitch/ovs-vsctl_-t_5_get_Open_vSwitch_._other_config")
+    openvswitch_server_log = simple_file('/var/log/openvswitch/ovsdb-server.log')
+    osa_dispatcher_log = first_file([
+        "/var/log/rhn/osa-dispatcher.log",
+        "/rhn-logs/rhn/osa-dispatcher.log"
+    ])
+    ovirt_engine_boot_log = simple_file("/var/log/ovirt-engine/boot.log")
+    ovirt_engine_confd = glob_file("/etc/ovirt-engine/engine.conf.d/*")
+    ovirt_engine_console_log = simple_file("/var/log/ovirt-engine/console.log")
     ovs_vsctl_show = simple_file("sos_commands/openvswitch/ovs-vsctl_-t_5_show")
+    pam_conf = simple_file("/etc/pam.conf")
+    partitions = simple_file("/proc/partitions")
     pcs_config = simple_file("sos_commands/pacemaker/pcs_config")
     pcs_quorum_status = simple_file("sos_commands/pacemaker/pcs_quorum_status")
     pcs_status = simple_file("sos_commands/pacemaker/pcs_status")
@@ -137,14 +194,32 @@ class SosSpecs(Specs):
         "sos_commands/foreman/foreman-debug/qpid_stat_subscriptions",
         "qpid_stat_subscriptions"
     ])
+    rabbitmq_logs = glob_file("/var/log/rabbitmq/rabbit@*.log", ignore=".*rabbit@.*(?<!-sasl).log$")
     rabbitmq_report = simple_file("sos_commands/rabbitmq/rabbitmqctl_report")
     rabbitmq_report_of_containers = glob_file("sos_commands/rabbitmq/docker_exec_-t_rabbitmq-bundle-docker-*_rabbitmqctl_report")
+    rabbitmq_startup_err = simple_file("/var/log/rabbitmq/startup_err")
     rhn_charsets = first_file(["sos_commands/satellite/rhn-charsets", "sos_commands/rhn/rhn-charsets"])
+    rhn_hibernate_conf = first_file(["/usr/share/rhn/config-defaults/rhn_hibernate.conf", "/config-defaults/rhn_hibernate.conf"])
+    rhn_search_daemon_log = first_file([
+        "/var/log/rhn/search/rhn_search_daemon.log",
+        "/rhn-logs/rhn/search/rhn_search_daemon.log"
+    ])
+    rhn_server_satellite_log = simple_file("var/log/rhn/rhn_server_satellite.log")
+    rhn_server_xmlrpc_log = first_file([
+        "/var/log/rhn/rhn_server_xmlrpc.log",
+        "/rhn-logs/rhn/rhn_server_xmlrpc.log"
+    ])
+    rhosp_release = simple_file("/etc/rhosp-release")
     root_crontab = first_file(["sos_commands/crontab/root_crontab", "sos_commands/cron/root_crontab"])
     route = simple_file("sos_commands/networking/route_-n")
+    sap_host_profile = simple_file("/usr/sap/hostctrl/exe/host_profile")
+    sched_rt_runtime_us = simple_file("/proc/sys/kernel/sched_rt_runtime_us")
+    scheduler = glob_file("/sys/block/*/queue/scheduler")
+    secure = simple_file("/var/log/secure")
     sestatus = simple_file("sos_commands/selinux/sestatus_-b")
     sssd_logs = glob_file("var/log/sssd/*.log")
     samba_logs = glob_file("var/log/samba/log.*")
+    ssh_foreman_config = simple_file("/usr/share/foreman/.ssh/ssh_config")
     subscription_manager_list_consumed = first_file([
         'sos_commands/yum/subscription-manager_list_--consumed',
         'sos_commands/subscription_manager/subscription-manager_list_--consumed',
@@ -155,17 +230,35 @@ class SosSpecs(Specs):
         'sos_commands/subscription_manager/subscription-manager_list_--installed',
         'sos_commands/general/subscription-manager_list_--installed']
     )
+    swift_conf = first_file(["/var/lib/config-data/puppet-generated/swift/etc/swift/swift.conf", "/etc/swift/swift.conf"])
+    swift_log = first_file(["/var/log/containers/swift/swift.log", "/var/log/swift/swift.log"])
+    sys_kernel_sched_features = simple_file("/sys/kernel/debug/sched_features")
+    sysconfig_chronyd = simple_file("/etc/sysconfig/chronyd")
+    sysconfig_httpd = simple_file("/etc/sysconfig/httpd")
+    sysconfig_irqbalance = simple_file("etc/sysconfig/irqbalance")
+    sysconfig_memcached = first_file(["/var/lib/config-data/puppet-generated/memcached/etc/sysconfig/memcached", "/etc/sysconfig/memcached"])
+    sysconfig_mongod = glob_file(["etc/sysconfig/mongod", "etc/opt/rh/rh-mongodb26/sysconfig/mongod"])
     sysctl = simple_file("sos_commands/kernel/sysctl_-a")
     systemctl_list_unit_files = simple_file("sos_commands/systemd/systemctl_list-unit-files")
     systemctl_list_units = first_file(["sos_commands/systemd/systemctl_list-units", "sos_commands/systemd/systemctl_list-units_--all"])
     systemctl_show_all_services = simple_file("sos_commands/systemd/systemctl_show_service_--all")
+    systemd_system_origin_accounting = simple_file("/etc/systemd/system.conf.d/origin-accounting.conf")
     teamdctl_config_dump = glob_file("sos_commands/teamd/teamdctl_*_config_dump")
     teamdctl_state_dump = glob_file("sos_commands/teamd/teamdctl_*_state_dump")
+    tomcat_web_xml = first_of([glob_file("/etc/tomcat*/web.xml"),
+                                  glob_file("/conf/tomcat/tomcat*/web.xml")])
+    tuned_conf = simple_file("/etc/tuned.conf")
+    udev_persistent_net_rules = simple_file("/etc/udev/rules.d/70-persistent-net.rules")
     uname = simple_file("sos_commands/kernel/uname_-a")
     uptime = first_of([simple_file("sos_commands/general/uptime"), simple_file("sos_commands/host/uptime")])
     var_qemu_xml = glob_file(r"var/run/libvirt/qemu/*.xml")
+    vdsm_conf = simple_file("etc/vdsm/vdsm.conf")
+    vdsm_id = simple_file("etc/vdsm/vdsm.id")
     vdsm_import_log = glob_file("var/log/vdsm/import/import-*.log")
     vgdisplay = first_file(["sos_commands/lvm2/vgdisplay_-vv_--config_global_locking_type_0", "sos_commands/lvm2/vgdisplay_-vv"])
     vgs = first_file(["sos_commands/lvm2/vgs_-v_-o_vg_mda_count_vg_mda_free_vg_mda_size_vg_mda_used_count_vg_tags_--config_global_locking_type_0", "sos_commands/lvm2/vgs_-v", "sos_commands/devicemapper/vgs_-v"])
+    vmcore_dmesg = glob_file("/var/crash/*/vmcore-dmesg.txt")
+    vmware_tools_conf = simple_file("etc/vmware-tools/tools.conf")
     xfs_info = glob_file("sos_commands/xfs/xfs_info*")
+    yum_log = simple_file("/var/log/yum.log")
     yum_repolist = simple_file("sos_commands/yum/yum_-C_repolist")
diff --git a/insights/util/specs_catalog.py b/insights/util/specs_catalog.py
index c9475708a9..9c9dc4ae41 100644
--- a/insights/util/specs_catalog.py
+++ b/insights/util/specs_catalog.py
@@ -52,7 +52,9 @@
 function specific documentation.  Generally functions are used as a ``provider`` to other
 datasources to, for instance, get a list of running processes of a particular program.
 
-Python code that implements these datasources is located in :py:mod:`insights.specs.default`.
+Python code that implements these datasources is located in the module
+:py:mod:`insights.specs.default`.  The datasources each have a unique name in the
+class :py:class:`insights.specs.default.DefaultSpecs`.
 
 Datasources
 -----------