[plugins] add initial profile tags to all plugins

Add an initial profile tag list to each plugin base class. A tag
list is a tuple of strings indicating the set of profiles that
should select this plugin, e.g.:

    plugin_name = "qux"
    profiles = ('system', 'storage', 'foo)

A follow up patch will add infrastructure to use these tag lists
to allow the user to select a logically-related set of plugins by
specifying a profile on the command line:

    # sosreport -v --batch --profile=storage

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

159 files changed, 168 insertions, 14 deletions

diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index 0c746f49..76d528d8 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -22,6 +22,7 @@ class Abrt(Plugin, RedHatPlugin):
     """
 
     plugin_name = "abrt"
+    profiles = ('system', 'debug')
     packages = ('abrt-cli', 'abrt-gui', 'abrt')
     files = ('/var/spool/abrt',)
 
diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py
index 2dec076f..1371c84d 100644
--- a/sos/plugins/acpid.py
+++ b/sos/plugins/acpid.py
@@ -17,6 +17,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
 class Acpid(Plugin):
     plugin_name = "acpid"
+    profiles = ('hardware',)
 
 
 class RedHatAcpid(Acpid, RedHatPlugin):
diff --git a/sos/plugins/activemq.py b/sos/plugins/activemq.py
index 0c960312..8fb68bc0 100644
--- a/sos/plugins/activemq.py
+++ b/sos/plugins/activemq.py
@@ -21,7 +21,7 @@ class ActiveMq(Plugin, RedHatPlugin, DebianPlugin):
     """
 
     plugin_name = 'activemq'
-
+    profiles = ()
     packages = ('activemq', 'activemq-core')
     files = ('/var/log/activemq',)
 
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index cf1907ac..24e0a1ec 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -21,6 +21,7 @@ class Anaconda(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'anaconda'
+    profiles = ('system',)
 
     files = (
         '/var/log/anaconda.log',
diff --git a/sos/plugins/anacron.py b/sos/plugins/anacron.py
index f8b1a3c1..4d79c990 100644
--- a/sos/plugins/anacron.py
+++ b/sos/plugins/anacron.py
@@ -19,6 +19,7 @@ class Anacron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """ capture scheduled jobs information """
 
     plugin_name = 'anacron'
+    profiles = ('system',)
 
     # anacron may be provided by anacron, cronie-anacron etc.
     # just look for the configuration file which is common
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
index 51893684..5875a829 100644
--- a/sos/plugins/apache.py
+++ b/sos/plugins/apache.py
@@ -19,6 +19,7 @@ class Apache(Plugin):
     """Apache related information
     """
     plugin_name = "apache"
+    profiles = ('webserver',)
 
     option_list = [
         ("log", "gathers all apache logs", "slow", False)
diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py
index 508c685a..d7150223 100644
--- a/sos/plugins/apparmor.py
+++ b/sos/plugins/apparmor.py
@@ -21,6 +21,7 @@ class Apparmor(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'apparmor'
+    profiles = ('security',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py
index f528f41c..dacf6ce2 100644
--- a/sos/plugins/apport.py
+++ b/sos/plugins/apport.py
@@ -21,6 +21,7 @@ class Apport(Plugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'apport'
+    profiles = ()
 
     def setup(self):
         self.add_copy_spec("/etc/apport/*")
diff --git a/sos/plugins/apt.py b/sos/plugins/apt.py
index 4fa76762..2d459356 100644
--- a/sos/plugins/apt.py
+++ b/sos/plugins/apt.py
@@ -22,6 +22,7 @@ class Apt(Plugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'apt'
+    profiles = ('system', 'packagemanager')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/ata.py b/sos/plugins/ata.py
index 253d0259..3465b4d2 100644
--- a/sos/plugins/ata.py
+++ b/sos/plugins/ata.py
@@ -21,6 +21,7 @@ class Ata(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = "ata"
+    profiles = ('storage', 'hardware')
 
     packages = ('hdparm', 'smartmontools')
 
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index a43526be..b433a46d 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -20,6 +20,7 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'auditd'
+    profiles = ('system', 'security')
 
     packages = ('audit',)
 
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index 530dd3e4..ab85bd9e 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -22,6 +22,7 @@ class Autofs(Plugin):
     """
 
     plugin_name = "autofs"
+    profiles = ('storage',)
 
     files = ('/etc/sysconfig/autofs', '/etc/default/autofs')
     packages = ('autofs',)
diff --git a/sos/plugins/azure.py b/sos/plugins/azure.py
index 6e39a84e..367401cb 100644
--- a/sos/plugins/azure.py
+++ b/sos/plugins/azure.py
@@ -22,6 +22,7 @@ class Azure(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'azure'
+    profiles = ('virt',)
     packages = ('walinuxagent',)
 
     def setup(self):
diff --git a/sos/plugins/block.py b/sos/plugins/block.py
index 82a355f9..0a26dc2a 100644
--- a/sos/plugins/block.py
+++ b/sos/plugins/block.py
@@ -21,6 +21,7 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'block'
+    profiles = ('storage', 'hardware')
 
     def setup(self):
         self.add_copy_spec("/proc/partitions")
diff --git a/sos/plugins/boot.py b/sos/plugins/boot.py
index d8835f8e..4a12bee0 100644
--- a/sos/plugins/boot.py
+++ b/sos/plugins/boot.py
@@ -21,6 +21,7 @@ class Boot(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'boot'
+    profiles = ('system', 'boot')
 
     option_list = [
         ("all-images", "collect lsinitrd for all images", "slow", False)
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
index 9fc5ff60..188151e7 100644
--- a/sos/plugins/ceph.py
+++ b/sos/plugins/ceph.py
@@ -20,6 +20,8 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'ceph'
+    profiles = ('storage', 'virt')
+
     option_list = [
         ("log", "gathers all ceph logs", "slow", False)
     ]
diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py
index 225b0076..670bf017 100644
--- a/sos/plugins/cgroups.py
+++ b/sos/plugins/cgroups.py
@@ -19,9 +19,9 @@ class Cgroups(Plugin, DebianPlugin, UbuntuPlugin):
     """cgroup subsystem information
     """
 
-    files = ('/proc/cgroups',)
-
     plugin_name = "cgroups"
+    profiles = ('system',)
+    files = ('/proc/cgroups',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 6567fcb0..da598edd 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -23,6 +23,7 @@ class Cluster(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'cluster'
+    profiles = ('cluster',)
     option_list = [
         ("gfslockdump", 'gather output of gfs lockdumps', 'slow', False),
         ("crm_from", 'specify the start time for crm_report', 'fast', False),
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index 1591f623..2a9731d8 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -24,6 +24,7 @@ class RedHatCobbler(Cobbler, RedHatPlugin):
     """
 
     packages = ('cobbler',)
+    profiles = ('cluster', 'sysmgmt')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py
index 1433fb80..349351bf 100644
--- a/sos/plugins/corosync.py
+++ b/sos/plugins/corosync.py
@@ -20,6 +20,7 @@ class Corosync(Plugin):
     """
 
     plugin_name = "corosync"
+    profiles = ('cluster',)
     packages = ('corosync',)
 
     def setup(self):
diff --git a/sos/plugins/cron.py b/sos/plugins/cron.py
index 56bc740e..5af2024e 100644
--- a/sos/plugins/cron.py
+++ b/sos/plugins/cron.py
@@ -20,6 +20,7 @@ class Cron(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = "cron"
+    profiles = ('system',)
 
     files = ('/etc/crontab')
 
diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py
index e51cf915..434dc6b0 100644
--- a/sos/plugins/cs.py
+++ b/sos/plugins/cs.py
@@ -26,6 +26,7 @@ class CertificateSystem(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'certificatesystem'
+    profiles = ('identity', 'security')
 
     packages = (
         "redhat-cs",
diff --git a/sos/plugins/ctdb.py b/sos/plugins/ctdb.py
index d0a4b872..67e3701c 100644
--- a/sos/plugins/ctdb.py
+++ b/sos/plugins/ctdb.py
@@ -20,6 +20,7 @@ class Ctdb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Samba CTDB related information
     """
     packages = ('ctdb',)
+    profiles = ('cluster', 'storage')
     plugin_name = "ctdb"
 
     def setup(self):
diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py
index 0ab77793..6f2ec3ca 100644
--- a/sos/plugins/cups.py
+++ b/sos/plugins/cups.py
@@ -20,6 +20,7 @@ class Cups(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'cups'
+    profiles = ('hardware',)
 
     packages = ('cups',)
 
diff --git a/sos/plugins/dbus.py b/sos/plugins/dbus.py
index 3e888870..889300e2 100644
--- a/sos/plugins/dbus.py
+++ b/sos/plugins/dbus.py
@@ -19,6 +19,7 @@ class Dbus(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """dbus information"""
 
     plugin_name = "dbus"
+    profiles = ('system',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index 96e1a2c7..57951d61 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -20,6 +20,7 @@ class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'devicemapper'
+    profiles = ('storage',)
 
     def setup(self):
         self.add_cmd_outputs([
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 6eb5817b..34cb8985 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -20,6 +20,7 @@ class Dhcp(Plugin):
     """
 
     plugin_name = "dhcp"
+    profiles = ('network',)
 
 
 class RedHatDhcp(Dhcp, RedHatPlugin):
diff --git a/sos/plugins/distupgrade.py b/sos/plugins/distupgrade.py
index d18ab9e3..09c77800 100644
--- a/sos/plugins/distupgrade.py
+++ b/sos/plugins/distupgrade.py
@@ -21,6 +21,7 @@ class DistUpgrade(Plugin):
     """ Distribution upgrade data """
 
     plugin_name = "distupgrade"
+    profiles = ('system', 'sysmgmt')
 
     files = None
 
diff --git a/sos/plugins/dmraid.py b/sos/plugins/dmraid.py
index 3f4ebaec..4b879494 100644
--- a/sos/plugins/dmraid.py
+++ b/sos/plugins/dmraid.py
@@ -19,11 +19,12 @@ class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """dmraid related information
     """
 
+    plugin_name = 'dmraid'
+    profiles = ('hardware', 'storage')
     option_list = [
         ("metadata", "capture dmraid device metadata", "slow", False)
     ]
 
-    plugin_name = 'dmraid'
     # V - {-V/--version}
     # b - {-b|--block_devices}
     # r - {-r|--raid_devices}
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
index aee9a6af..0f67a244 100644
--- a/sos/plugins/docker.py
+++ b/sos/plugins/docker.py
@@ -21,6 +21,7 @@ class Docker(Plugin):
     """
 
     plugin_name = 'docker'
+    profiles = ('virt',)
     docker_bin = "docker"
 
     def setup(self):
diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py
index ee2cb901..d88cba9c 100644
--- a/sos/plugins/dovecot.py
+++ b/sos/plugins/dovecot.py
@@ -20,6 +20,7 @@ class Dovecot(Plugin):
     """
 
     plugin_name = "dovecot"
+    profiles = ('mail',)
 
     def setup(self):
         self.add_copy_spec("/etc/dovecot*")
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index ad836410..314aef48 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -21,6 +21,7 @@ class Dpkg(Plugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'dpkg'
+    profiles = ('sysmgmt', 'packagemanager')
 
     def setup(self):
         self.add_copy_spec("/var/log/dpkg.log")
diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py
index 082a7476..2ca2d824 100644
--- a/sos/plugins/ds.py
+++ b/sos/plugins/ds.py
@@ -24,6 +24,7 @@ class DirectoryServer(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'directoryserver'
+    profiles = ('identity',)
 
     files = ('/etc/dirsrv', '/opt/redhat-ds')
     packages = ('redhat-ds-base', 'redhat-ds-7')
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index e220ad7a..03574b61 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -27,6 +27,7 @@ class Emc(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'emc'
+    profiles = ('storage', 'hardware')
 
     def about_emc(self):
         """ EMC Corporation specific information
diff --git a/sos/plugins/fcoe.py b/sos/plugins/fcoe.py
index ad6ecc31..63519fff 100644
--- a/sos/plugins/fcoe.py
+++ b/sos/plugins/fcoe.py
@@ -20,6 +20,7 @@ class fcoe(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'fcoe'
+    profiles = ('storage', 'hardware')
     packages = ('fcoe-utils',)
 
     def setup(self):
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index 8681f7b1..639cb11a 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -20,6 +20,7 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'filesys'
+    profiles = ('storage',)
 
     option_list = [("lsof", 'gathers information on all open files', 'slow',
                     False),
diff --git a/sos/plugins/firewalld.py b/sos/plugins/firewalld.py
index 50eb1a97..c3ea60b2 100644
--- a/sos/plugins/firewalld.py
+++ b/sos/plugins/firewalld.py
@@ -22,6 +22,7 @@ class FirewallD(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'firewalld'
+    profiles = ('network',)
 
     packages = ('firewalld',)
 
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
index d5c6b23e..baad329a 100644
--- a/sos/plugins/foreman.py
+++ b/sos/plugins/foreman.py
@@ -22,6 +22,7 @@ class Foreman(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'foreman'
+    profiles = ('sysmgmt',)
     packages = ('foreman')
 
     def setup(self):
diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py
index 208b45c1..6af8fb49 100644
--- a/sos/plugins/gdm.py
+++ b/sos/plugins/gdm.py
@@ -20,6 +20,7 @@ class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'gdm'
+    profiles = ('desktop',)
 
     def setup(self):
         self.add_copy_spec("/etc/gdm/*")
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 0a78074c..116c4855 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -19,6 +19,7 @@ class General(Plugin):
     """basic system information"""
 
     plugin_name = "general"
+    profiles = ('system', 'sysmgmt')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index d9a7fb8c..a4b2f49d 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -23,6 +23,7 @@ class Gluster(Plugin, RedHatPlugin):
     '''gluster related information'''
 
     plugin_name = 'gluster'
+    profiles = ('storage', 'virt')
 
     statedump_dir = '/tmp/glusterfs-statedumps'
     packages = ["glusterfs", "glusterfs-core"]
diff --git a/sos/plugins/grub.py b/sos/plugins/grub.py
index b439e889..0e3878ce 100644
--- a/sos/plugins/grub.py
+++ b/sos/plugins/grub.py
@@ -20,6 +20,7 @@ class Grub(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'grub'
+    profiles = ('boot',)
     packages = ('grub',)
 
     def setup(self):
diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py
index 6e2e1b4d..9b64316e 100644
--- a/sos/plugins/grub2.py
+++ b/sos/plugins/grub2.py
@@ -20,6 +20,7 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'grub2'
+    profiles = ('boot',)
     packages = ('grub2',)
 
     def setup(self):
diff --git a/sos/plugins/haproxy.py b/sos/plugins/haproxy.py
index e1015f27..b1944f13 100644
--- a/sos/plugins/haproxy.py
+++ b/sos/plugins/haproxy.py
@@ -21,6 +21,7 @@ class HAProxy(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'haproxy'
+    profiles = ('webserver',)
 
     packages = ('haproxy',)
 
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 58ca7ec9..5bf7b27f 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -20,6 +20,7 @@ class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = "hardware"
+    profiles = ('system', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/hpasm.py b/sos/plugins/hpasm.py
index 17a0022a..ec85197c 100644
--- a/sos/plugins/hpasm.py
+++ b/sos/plugins/hpasm.py
@@ -21,6 +21,7 @@ class Hpasm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'hpasm'
+    profiles = ('system', 'hardware')
 
     packages = ('hp-health',)
 
diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py
index 2cefd733..8c4fb640 100644
--- a/sos/plugins/hts.py
+++ b/sos/plugins/hts.py
@@ -20,6 +20,7 @@ class HardwareTestSuite(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'hardwaretestsuite'
+    profiles = ('debug',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index e60f5b37..1f91428f 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -20,6 +20,7 @@ class I18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'i18n'
+    profiles = ('system',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index cef1172b..4bbd08a6 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -22,6 +22,7 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'infiniband'
+    profiles = ('hardware',)
     packages = ('libibverbs-utils',)
 
     def setup(self):
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index 39256c11..87b0a735 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -22,6 +22,7 @@ class Ipa(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'ipa'
+    profiles = ('identity',)
 
     ipa_server = False
     ipa_client = False
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index e4439de8..87fc60ca 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -22,6 +22,7 @@ class IPSec(Plugin):
     """
 
     plugin_name = "ipsec"
+    profiles = ('network',)
     packages = ('ipsec-tools',)
 
 
diff --git a/sos/plugins/ipvs.py b/sos/plugins/ipvs.py
index fb67d099..ff0ca54d 100644
--- a/sos/plugins/ipvs.py
+++ b/sos/plugins/ipvs.py
@@ -21,6 +21,7 @@ class Ipvs(Plugin, RedHatPlugin, DebianPlugin):
     """
 
     plugin_name = 'ipvs'
+    profiles = ('cluster', 'network')
 
     packages = ('ipvsadm',)
 
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index 5abb3437..213dca45 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -21,6 +21,7 @@ class Iscsi(Plugin):
     """
 
     plugin_name = "iscsi"
+    profiles = ('storage',)
 
 
 class RedHatIscsi(Iscsi, RedHatPlugin):
diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py
index 3818ff8c..c4366874 100644
--- a/sos/plugins/iscsitarget.py
+++ b/sos/plugins/iscsitarget.py
@@ -23,6 +23,7 @@ class IscsiTarget(Plugin):
     """
 
     plugin_name = "iscsitarget"
+    profiles = ('storage',)
 
 
 class RedHatIscsiTarget(IscsiTarget, RedHatPlugin):
diff --git a/sos/plugins/java.py b/sos/plugins/java.py
index d50b4e77..0c62a987 100644
--- a/sos/plugins/java.py
+++ b/sos/plugins/java.py
@@ -19,6 +19,7 @@ class Java(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """basic java information"""
 
     plugin_name = "java"
+    profiles = ('webserver', 'java')
 
     def setup(self):
         self.add_copy_spec("/etc/java")
diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py
index c30efe91..fa5fa61d 100644
--- a/sos/plugins/juju.py
+++ b/sos/plugins/juju.py
@@ -41,6 +41,7 @@ class Juju(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'juju'
+    profiles = ('virt', 'sysmgmt')
 
     option_list = [
         ('export-mongodb',
diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py
index 8d1fcedf..b0023dc3 100644
--- a/sos/plugins/katello.py
+++ b/sos/plugins/katello.py
@@ -22,6 +22,7 @@ class Katello(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'katello'
+    profiles = ('sysmgmt',)
     packages = ('katello', 'katello-common', 'katello-headpin')
 
     def setup(self):
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 0d324296..673d49cd 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -20,6 +20,7 @@ class KDump(Plugin):
     """
 
     plugin_name = "kdump"
+    profiles = ('system', 'debug')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/keepalived.py b/sos/plugins/keepalived.py
index 46820107..fa4e3c14 100644
--- a/sos/plugins/keepalived.py
+++ b/sos/plugins/keepalived.py
@@ -21,6 +21,7 @@ class Keepalived(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'keepalived'
+    profiles = ('webserver', 'network', 'cluster')
 
     packages = ('keepalived',)
 
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index f09b252f..1074cb4f 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -21,6 +21,7 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'kernel'
+    profiles = ('system', 'hardware', 'kernel')
 
     sys_module = '/sys/module'
 
diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py
index 2b6856bb..5f5b7c61 100644
--- a/sos/plugins/kernelrt.py
+++ b/sos/plugins/kernelrt.py
@@ -22,6 +22,7 @@ class KernelRT(Plugin, RedHatPlugin):
     '''
 
     plugin_name = 'kernelrt'
+    profiles = ('system', 'hardware', 'kernel')
 
     # this file exists only when the realtime kernel is booted
     # this plugin will not be called is this file does not exist
diff --git a/sos/plugins/krb5.py b/sos/plugins/krb5.py
index 202dd37a..04e28d21 100644
--- a/sos/plugins/krb5.py
+++ b/sos/plugins/krb5.py
@@ -20,8 +20,9 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class Krb5(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Kerberos related information
     """
-    packages = ('krb5-libs', 'krb5-user')
     plugin_name = 'krb5'
+    profiles = ('identity', 'system')
+    packages = ('krb5-libs', 'krb5-user')
 
     def setup(self):
         self.add_copy_spec("/etc/krb5.conf")
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index 3c3ec50e..bedbe3fa 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -24,6 +24,7 @@ class Kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'kvm'
+    profiles = ('system', 'virt')
     debugfs_path = "/sys/kernel/debug"
 
     _debugfs_cleanup = False
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index 606a3226..ff6cd443 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -21,10 +21,8 @@ class Landscape(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'landscape'
-
-    files = (
-        '/etc/landscape/client.conf',
-    )
+    profiles = ('sysmgmt',)
+    files = ('/etc/landscape/client.conf',)
     packages = ('landscape-client',)
 
     def setup(self):
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index fddc9282..d7908574 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -20,6 +20,7 @@ class Ldap(Plugin):
     """
 
     plugin_name = "ldap"
+    profiles = ('identity', 'sysmgmt', 'system')
     ldap_conf = "/etc/openldap/ldap.conf"
 
     def setup(self):
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index c166fa6f..109d298a 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -20,6 +20,7 @@ class Libraries(Plugin, RedHatPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'libraries'
+    profiles = ('system',)
 
     option_list = [
         ('ldconfigv', 'collect verbose ldconfig output', "slow", False)
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index ddfb0ba8..02cefcec 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -22,6 +22,7 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = 'libvirt'
+    profiles = ('system', 'virt')
 
     def setup(self):
         libvirt_keytab = "/etc/libvirt/krb5.tab"
diff --git a/sos/plugins/lilo.py b/sos/plugins/lilo.py
index 2516daf2..f7be4d69 100644
--- a/sos/plugins/lilo.py
+++ b/sos/plugins/lilo.py
@@ -20,6 +20,7 @@ class Lilo(Plugin, RedHatPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'lilo'
+    profiles = ('system', 'boot')
     packages = ('lilo',)
 
     def setup(self):
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index d609d059..b3558383 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -20,6 +20,7 @@ class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'logrotate'
+    profiles = ('system',)
 
     def setup(self):
         self.add_cmd_output("logrotate --debug /etc/logrotate.conf",
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index 47f0066f..4bace230 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -20,6 +20,7 @@ class Logs(Plugin):
     """log data """
 
     plugin_name = "logs"
+    profiles = ('system', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index af9adee4..047c2707 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -21,6 +21,7 @@ class LsbRelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'lsbrelease'
+    profiles = ('system',)
 
     def setup(self):
         self.add_cmd_output("lsb_release -a")
diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py
index c1d4769e..653366c1 100644
--- a/sos/plugins/lvm2.py
+++ b/sos/plugins/lvm2.py
@@ -20,6 +20,7 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'lvm2'
+    profiles = ('storage',)
 
     option_list = [("lvmdump", 'collect an lvmdump tarball', 'fast', False),
                    ("lvmdump-am", 'attempt to collect an lvmdump with '
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
index 82a82bc4..bd46a3bf 100644
--- a/sos/plugins/maas.py
+++ b/sos/plugins/maas.py
@@ -22,6 +22,7 @@ class Maas(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'maas'
+    profiles = ('sysmgmt',)
 
     option_list = [
         ('profile-name',
diff --git a/sos/plugins/md.py b/sos/plugins/md.py
index 9e2a50be..28bf1b4f 100644
--- a/sos/plugins/md.py
+++ b/sos/plugins/md.py
@@ -20,6 +20,7 @@ class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'md'
+    profiles = ('storage',)
 
     def setup(self):
         self.add_cmd_output("mdadm -D /dev/md*")
diff --git a/sos/plugins/megacli.py b/sos/plugins/megacli.py
index 0a83b9a1..80df2459 100644
--- a/sos/plugins/megacli.py
+++ b/sos/plugins/megacli.py
@@ -25,6 +25,7 @@ class MegaCLI(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'megacli'
+    profiles = ('system', 'storage', 'hardware')
 
     def setup(self):
         if os.path.isfile("/opt/MegaRAID/MegaCli/MegaCli64"):
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index 5b21fdb7..28c2c61c 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -20,6 +20,7 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'memory'
+    profiles = ('system', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/mongodb.py b/sos/plugins/mongodb.py
index 05d37d3c..3ee5efb4 100644
--- a/sos/plugins/mongodb.py
+++ b/sos/plugins/mongodb.py
@@ -22,6 +22,7 @@ class MongoDb(Plugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'mongodb'
+    profiles = ()
 
     packages = ('mongodb-server',)
     files = ('/etc/mongodb.conf',)
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index 65bba8af..10d98845 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -20,6 +20,7 @@ class MrgGrid(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'mrggrid'
+    profiles = ()
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py
index 4ee985c7..394fabdf 100644
--- a/sos/plugins/mrgmessg.py
+++ b/sos/plugins/mrgmessg.py
@@ -20,6 +20,7 @@ class MrgMessg(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'mrgmessg'
+    profiles = ()
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/multipath.py b/sos/plugins/multipath.py
index 70d6597c..0ce85696 100644
--- a/sos/plugins/multipath.py
+++ b/sos/plugins/multipath.py
@@ -20,6 +20,7 @@ class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'multipath'
+    profiles = ('system', 'storage', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index fdd69dea..d5702d6a 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -20,6 +20,7 @@ class Mysql(Plugin):
     """
 
     plugin_name = "mysql"
+    profiles = ('services',)
     mysql_cnf = "/etc/my.cnf"
 
     option_list = [
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index dc41cb1d..fe11862b 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -21,6 +21,7 @@ class Named(Plugin):
     """
 
     plugin_name = "named"
+    profiles = ('system', 'services', 'network')
     named_conf = "/etc/named.conf"
     config_files = named_conf
 
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index d313e184..abb22280 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -21,6 +21,7 @@ class Networking(Plugin):
     """network related information
     """
     plugin_name = "networking"
+    profiles = ('network', 'hardware', 'system')
     trace_host = "www.example.com"
     option_list = [("traceroute", "collects a traceroute to %s" % trace_host,
                     "slow", False)]
diff --git a/sos/plugins/nfs.py b/sos/plugins/nfs.py
index 44535215..b7c57419 100644
--- a/sos/plugins/nfs.py
+++ b/sos/plugins/nfs.py
@@ -19,6 +19,7 @@ class Nfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """NFS related information
     """
     plugin_name = 'nfs'
+    profiles = ('storage', 'network')
     packages = ['nfs-utils']
 
     def setup(self):
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index f85c0efe..fb1c1a07 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -24,6 +24,7 @@ class NfsServer(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'nfsserver'
+    profiles = ('storage', 'network', 'services')
 
     def check_enabled(self):
         default_runlevel = self.policy().default_runlevel()
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index 64fee689..e4c80e59 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -20,6 +20,7 @@ class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'nis'
+    profiles = ('identity', 'services')
 
     files = ('/var/yp',)
 
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index e8d545e2..7d0d3ce2 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -22,6 +22,7 @@ class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'nscd'
+    profiles = ('services', 'identity', 'system')
 
     files = ('/etc/nscd.conf',)
     packages = ('nscd',)
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index f4bfb06b..b2a529e0 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -20,6 +20,7 @@ class Ntp(Plugin):
     """
 
     plugin_name = "ntp"
+    profiles = ('system', 'services')
 
     packages = ('ntp',)
 
diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py
index 1b6fd759..fec661bb 100644
--- a/sos/plugins/oddjob.py
+++ b/sos/plugins/oddjob.py
@@ -22,6 +22,7 @@ class Oddjob(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'oddjob'
+    profiles = ('services', 'sysmgmt')
 
     files = ('/etc/oddjobd.conf',)
     packages = ('oddjob',)
diff --git a/sos/plugins/openhpi.py b/sos/plugins/openhpi.py
index aba66728..9f30513c 100644
--- a/sos/plugins/openhpi.py
+++ b/sos/plugins/openhpi.py
@@ -20,6 +20,7 @@ class OpenHPI(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'openhpi'
+    profiles = ('system', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py
index 9c986d36..22776c14 100644
--- a/sos/plugins/openshift.py
+++ b/sos/plugins/openshift.py
@@ -20,6 +20,7 @@ class Openshift(Plugin, RedHatPlugin):
     '''Openshift related information'''
 
     plugin_name = "openshift"
+    profiles = ('virt',)
 
     # The 'broker' and 'node' options are obsolete but are maintained
     # here for compatibility with external programs that call sosreport
diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py
index a7347760..4cfa952d 100644
--- a/sos/plugins/openssl.py
+++ b/sos/plugins/openssl.py
@@ -22,6 +22,7 @@ class OpenSSL(Plugin):
     """
 
     plugin_name = "openssl"
+    profiles = ('network', 'security')
     packages = ('openssl',)
 
     def postproc(self):
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index 178fe912..b6236ddd 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -24,6 +24,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackCeilometer(Plugin):
     """Openstack Ceilometer related information."""
     plugin_name = "openstack_ceilometer"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack-ceilometer logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index 3367ff82..ed2fce37 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -25,6 +25,7 @@ class OpenStackCinder(Plugin):
     """openstack cinder related information
     """
     plugin_name = "openstack_cinder"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack cinder logs", "slow", True),
                    ("db", "gathers openstack cinder db version", "slow",
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index 81f2c2ff..9b68c038 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -23,6 +23,7 @@ from sos import plugins
 class OpenStackGlance(plugins.Plugin):
     """OpenstackGlance related information."""
     plugin_name = "openstack_glance"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack-glance logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index d7fb0027..2b14cf4d 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -21,6 +21,7 @@ class OpenStackHeat(plugins.Plugin):
     """openstack related information
     """
     plugin_name = "openstack_heat"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack-heat logs", "slow", False)]
 
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index 8369d420..4ddc4a49 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -25,6 +25,7 @@ class OpenStackHorizon(Plugin):
     """
 
     plugin_name = "openstack_horizon"
+    profiles = ('openstack',)
     option_list = [("log", "gathers openstack horizon logs", "slow", True)]
 
     def setup(self):
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index 87c49bc5..3f539f3e 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -21,6 +21,7 @@ class OpenStackKeystone(Plugin):
     """openstack keystone related information
     """
     plugin_name = "openstack_keystone"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack keystone logs", "slow", True),
                    ("nopw", "dont gathers keystone passwords", "slow", True)]
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index a12895e2..e2975adc 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -31,6 +31,7 @@ class Neutron(Plugin):
     """OpenStack Networking (quantum/neutron) related information
     """
     plugin_name = "neutron"
+    profiles = ('openstack',)
 
     option_list = [("log", "Gathers all Neutron logs", "slow", False),
                    ("quantum", "Overrides checks for newer Neutron components",
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index a4186af3..08f93a88 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -24,6 +24,7 @@ class OpenStackNova(Plugin):
     """openstack nova related information
     """
     plugin_name = "openstack_nova"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack nova logs", "slow", True),
                    ("cmds", "gathers openstack nova commands", "slow", False)]
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index ad9d6c83..c42dabee 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -23,6 +23,7 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class OpenStackSwift(Plugin):
     """OpenstackSwift related information."""
     plugin_name = "openstack_swift"
+    profiles = ('openstack',)
 
     option_list = [("log", "gathers openstack-swift logs", "slow", False)]
 
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index a44797fd..f26744b1 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -22,6 +22,7 @@ class Openswan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'openswan'
+    profiles = ('network', 'security')
     option_list = [("ipsec-barf",
                     "collect the output of the ipsec barf command",
                     "slow", False)]
diff --git a/sos/plugins/openvswitch.py b/sos/plugins/openvswitch.py
index cfb39bc0..5469f85f 100644
--- a/sos/plugins/openvswitch.py
+++ b/sos/plugins/openvswitch.py
@@ -21,6 +21,7 @@ class OpenVSwitch(Plugin):
     """ OpenVSwitch related information
     """
     plugin_name = "openvswitch"
+    profiles = ('network', 'virt')
 
     def setup(self):
         # The '-s' option enables dumping of packet counters on the
diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
index f59f3f36..f9a7cb1d 100644
--- a/sos/plugins/ovirt.py
+++ b/sos/plugins/ovirt.py
@@ -28,6 +28,9 @@ from sos.plugins import Plugin, RedHatPlugin
 class Ovirt(Plugin, RedHatPlugin):
     """oVirt Engine related information"""
 
+    plugin_name = "ovirt"
+    profiles = ('virt',)
+
     packages = (
         'ovirt-engine',
         'ovirt-engine-dwh',
@@ -55,8 +58,6 @@ class Ovirt(Plugin, RedHatPlugin):
         'ENGINE_PKI_ENGINE_STORE_PASSWORD:DWH_DB_PASSWORD'
     )
 
-    plugin_name = "ovirt"
-
     option_list = [
         ('jbosstrace', 'Enable oVirt Engine JBoss stack trace collection',
          '', True),
diff --git a/sos/plugins/ovirt_hosted_engine.py b/sos/plugins/ovirt_hosted_engine.py
index 3e8dc1e3..d28a95ea 100644
--- a/sos/plugins/ovirt_hosted_engine.py
+++ b/sos/plugins/ovirt_hosted_engine.py
@@ -30,6 +30,7 @@ class OvirtHostedEngine(Plugin, RedHatPlugin):
     )
 
     plugin_name = 'ovirt_hosted_engine'
+    profiles = ('virt',)
 
     SETUP_LOG_GLOB = '/var/log/ovirt-hosted-engine-setup/*.log'
     HA_LOG_GLOB = '/var/log/ovirt-hosted-engine-ha/*.log'
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 640eff03..9064caab 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -20,6 +20,7 @@ class Pam(Plugin):
     """
 
     plugin_name = "pam"
+    profiles = ('security', 'identity', 'system')
     security_libs = ""
 
     def setup(self):
diff --git a/sos/plugins/pci.py b/sos/plugins/pci.py
index f62657cc..bd5ec927 100644
--- a/sos/plugins/pci.py
+++ b/sos/plugins/pci.py
@@ -20,6 +20,7 @@ class Pci(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = "pci"
+    profiles = ('hardware', 'system')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/pcp.py b/sos/plugins/pcp.py
index b8c82b43..d715bd3e 100644
--- a/sos/plugins/pcp.py
+++ b/sos/plugins/pcp.py
@@ -25,6 +25,7 @@ class Pcp(Plugin, RedHatPlugin, DebianPlugin):
     """
 
     plugin_name = 'pcp'
+    profiles = ('system', 'performance')
     packages = ('pcp',)
 
     pcp_conffile = '/etc/pcp.conf'
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index 446c9e66..89ee97db 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -19,6 +19,7 @@ class Postfix(Plugin):
     """mail server related information
     """
     plugin_name = "postfix"
+    profiles = ('mail', 'services')
 
     packages = ('postfix',)
 
diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py
index ea593f91..ec94cd76 100644
--- a/sos/plugins/postgresql.py
+++ b/sos/plugins/postgresql.py
@@ -28,6 +28,7 @@ class PostgreSQL(Plugin):
     """PostgreSQL related information"""
 
     plugin_name = "postgresql"
+    profiles = ('services',)
 
     packages = ('postgresql',)
 
diff --git a/sos/plugins/powerpc.py b/sos/plugins/powerpc.py
index c829a5fb..e95a3e8d 100644
--- a/sos/plugins/powerpc.py
+++ b/sos/plugins/powerpc.py
@@ -24,6 +24,7 @@ class PowerPC(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = 'powerpc'
+    profiles = ('system', 'hardware')
 
     def check_enabled(self):
         return (self.policy().get_arch() == "ppc64")
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index ed88020e..fa190b47 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -22,6 +22,7 @@ class Ppp(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'ppp'
+    profiles = ('system', 'network')
 
     packages = ('ppp',)
 
diff --git a/sos/plugins/procenv.py b/sos/plugins/procenv.py
index a38bd4c9..84c7680f 100644
--- a/sos/plugins/procenv.py
+++ b/sos/plugins/procenv.py
@@ -21,6 +21,7 @@ class Procenv(Plugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'procenv'
+    profiles = ('system',)
 
     def setup(self):
         self.add_cmd_output('procenv')
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index ae6e5ef7..edea34d1 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -20,6 +20,7 @@ class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'process'
+    profiles = ('system',)
 
     def setup(self):
         self.add_cmd_output("ps auxwww", root_symlink="ps")
diff --git a/sos/plugins/processor.py b/sos/plugins/processor.py
index cc35a041..9f12c3ea 100644
--- a/sos/plugins/processor.py
+++ b/sos/plugins/processor.py
@@ -20,6 +20,7 @@ class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = 'processor'
+    profiles = ('system', 'hardware')
     files = ('/proc/cpuinfo',)
     packages = ('cpufreq-utils')
 
diff --git a/sos/plugins/psacct.py b/sos/plugins/psacct.py
index ffbadfeb..8e1011ba 100644
--- a/sos/plugins/psacct.py
+++ b/sos/plugins/psacct.py
@@ -18,6 +18,8 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class Psacct(Plugin):
     """Process accounting related information
     """
+    plugin_name = "psacct"
+    profiles = ('system',)
 
     option_list = [("all", "collect all process accounting files",
                     "slow", False)]
@@ -28,7 +30,6 @@ class Psacct(Plugin):
 class RedHatPsacct(Psacct, RedHatPlugin):
     """Process accounting related information for RedHat based distributions
     """
-    plugin_name = "psacct"
 
     packages = ["psacct"]
 
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index d1bcdde6..ba66722f 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -18,10 +18,10 @@ from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 class Pxe(Plugin):
     """PXE related information
     """
-
+    plugin_name = "pxe"
+    profiles = ('sysmgmt', 'network')
     option_list = [("tftpboot", 'gathers content from the tftpboot path',
                     'slow', False)]
-    plugin_name = "pxe"
 
 
 class RedHatPxe(Pxe, RedHatPlugin):
diff --git a/sos/plugins/python.py b/sos/plugins/python.py
index df61d52d..27cf5957 100644
--- a/sos/plugins/python.py
+++ b/sos/plugins/python.py
@@ -22,6 +22,7 @@ class Python(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'python'
+    profiles = ('system',)
 
     packages = ('python',)
 
diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py
index 3a97d3b7..72234f3d 100644
--- a/sos/plugins/qpid.py
+++ b/sos/plugins/qpid.py
@@ -20,6 +20,7 @@ class Qpid(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'qpid'
+    profiles = ('services',)
 
     packages = ('qpidd', 'qpid-cpp-server', 'qpid-tools')
 
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index da33176f..1b26a214 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -22,6 +22,7 @@ class Quagga(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'quagga'
+    profiles = ('network',)
 
     files = ('/etc/quagga/zebra.conf',)
     packages = ('quagga',)
diff --git a/sos/plugins/rabbitmq.py b/sos/plugins/rabbitmq.py
index 28465de2..3d19e7d0 100644
--- a/sos/plugins/rabbitmq.py
+++ b/sos/plugins/rabbitmq.py
@@ -19,6 +19,7 @@ class RabbitMQ(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """rabbitmq related information
     """
     plugin_name = 'rabbitmq'
+    profiles = ('services',)
     files = ('/etc/rabbitmq/rabbitmq.conf',)
     packages = ('rabbitmq-server',)
 
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index 845f403a..aadab513 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -22,6 +22,7 @@ class Radius(Plugin):
     """
 
     plugin_name = "radius"
+    profiles = ('network', 'identity')
     packages = ('freeradius',)
 
 
diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py
index dfd0c0fd..7b619a45 100644
--- a/sos/plugins/rhui.py
+++ b/sos/plugins/rhui.py
@@ -20,6 +20,7 @@ class Rhui(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'rhui'
+    profiles = ('sysmgmt',)
 
     rhui_debug_path = "/usr/share/rh-rhua/rhui-debug.py"
 
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index c93df795..112a3b53 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -20,6 +20,7 @@ class Rpm(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'rpm'
+    profiles = ('system', 'packagemanager')
 
     option_list = [("rpmq", "queries for package information via rpm -q",
                     "fast", True),
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index d7fd0305..6a4da995 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -22,6 +22,7 @@ class S390(Plugin, RedHatPlugin):
     """
 
     plugin_name = 's390'
+    profiles = ('system', 'hardware')
 
     # Check for s390 arch goes here
 
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index 2fdf48e1..0325b954 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -20,6 +20,7 @@ class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
     packages = ('samba-common',)
     plugin_name = "samba"
+    profiles = ('services',)
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py
index 4a2667bd..52a9d1cf 100644
--- a/sos/plugins/sanlock.py
+++ b/sos/plugins/sanlock.py
@@ -19,6 +19,7 @@ class SANLock(Plugin):
     """sanlock-related information
     """
     plugin_name = "sanlock"
+    profiles = ('cluster', 'virt')
     packages = ["sanlock"]
 
     def setup(self):
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 71d493ce..34ea0b89 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -21,6 +21,7 @@ class Sar(Plugin,):
     """
 
     plugin_name = 'sar'
+    profiles = ('system', 'performance')
 
     packages = ('sysstat',)
     sa_path = '/var/log/sa'
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
index 9fb9cdd4..67b83cd0 100644
--- a/sos/plugins/satellite.py
+++ b/sos/plugins/satellite.py
@@ -20,6 +20,7 @@ class Satellite(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'satellite'
+    profiles = ('sysmgmt',)
     satellite = False
     proxy = False
 
diff --git a/sos/plugins/scsi.py b/sos/plugins/scsi.py
index 4d8d179f..a4b23aa2 100644
--- a/sos/plugins/scsi.py
+++ b/sos/plugins/scsi.py
@@ -20,6 +20,7 @@ class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """
 
     plugin_name = 'scsi'
+    profiles = ('storage', 'hardware')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index 75813774..5839ed5d 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -20,6 +20,7 @@ class SELinux(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'selinux'
+    profiles = ('system', 'security')
 
     option_list = [("fixfiles", 'Print incorrect file context labels',
                     'slow', False),
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index 44c7480f..16f246b8 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -22,6 +22,7 @@ class Sendmail(Plugin):
     """
 
     plugin_name = "sendmail"
+    profiles = ('services', 'mail')
 
     packages = ('sendmail',)
 
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 3cebacee..65341c28 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -22,6 +22,7 @@ class Smartcard(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'smartcard'
+    profiles = ('security', 'identity', 'hardware')
 
     files = ('/etc/pam_pkcs11/pam_pkcs11.conf',)
     packages = ('pam_pkcs11',)
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index 6a57fa51..22b0050d 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -21,6 +21,7 @@ class Snmp(Plugin):
     """snmp related information
     """
     plugin_name = "snmp"
+    profiles = ('system', 'sysmgmt')
 
     files = ('/etc/snmp/snmpd.conf',)
 
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index 2b2b11e9..18b2d711 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -20,6 +20,7 @@ class Soundcard(Plugin):
     """
 
     plugin_name = "soundcard"
+    profiles = ('desktop', 'hardware')
 
     def default_enabled(self):
         return False
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index a3ad96d3..7e9b0705 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -20,6 +20,7 @@ class Squid(Plugin):
     """
 
     plugin_name = 'squid'
+    profiles = ('webserver', 'services', 'sysmgmt')
 
 
 class RedHatSquid(Squid, RedHatPlugin):
diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py
index 8918f423..0e6a8d9e 100644
--- a/sos/plugins/ssh.py
+++ b/sos/plugins/ssh.py
@@ -22,6 +22,7 @@ class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'ssh'
+    profiles = ('services', 'security', 'identity')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index 8dac049c..55bdcb5f 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -22,6 +22,7 @@ class Sssd(Plugin):
     """
 
     plugin_name = "sssd"
+    profiles = ('services', 'security', 'identity')
     packages = ('sssd',)
 
     def setup(self):
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index c4d50004..64f2f15a 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -20,6 +20,7 @@ class Startup(Plugin):
     """
 
     plugin_name = "startup"
+    profiles = ('system', 'boot')
 
     option_list = [("servicestatus", "get a status of all running services",
                     "slow", False)]
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index 02512c11..6d147416 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -22,6 +22,7 @@ class SunRPC(Plugin):
     """
 
     plugin_name = "sunrpc"
+    profiles = ('system', 'storage', 'network')
     service = None
 
     def check_enabled(self):
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index 8bb50e3c..261f7d2c 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -20,6 +20,7 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = "system"
+    profiles = ('system', 'kernel')
 
     def setup(self):
         self.add_copy_spec("/proc/sys")
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py
index d7be9fc4..ec758cf0 100644
--- a/sos/plugins/systemd.py
+++ b/sos/plugins/systemd.py
@@ -22,6 +22,7 @@ class Systemd(Plugin, RedHatPlugin):
     """
 
     plugin_name = "systemd"
+    profiles = ('system', 'services', 'boot')
 
     packages = ('systemd',)
     files = ('/usr/lib/systemd/systemd',)
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 32d92a17..0936bcb9 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -22,6 +22,7 @@ class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'systemtap'
+    profiles = ('debug', 'performance')
 
     files = ('stap',)
     packages = ('systemtap', 'systemtap-runtime')
diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py
index 53265c4a..35f5ff1d 100644
--- a/sos/plugins/sysvipc.py
+++ b/sos/plugins/sysvipc.py
@@ -21,6 +21,7 @@ class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = "sysvipc"
+    profiles = ('system', 'services')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index 96c0bedc..75078de7 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -22,6 +22,7 @@ class TftpServer(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'tftpserver'
+    profiles = ('sysmgmt', 'network')
 
     files = ('/etc/xinetd.d/tftp',)
     packages = ('tftp-server',)
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index 68949371..efc86ea0 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -20,6 +20,7 @@ class Tomcat(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'tomcat'
+    profiles = ('webserver', 'java', 'services')
 
     packages = ('tomcat6',)
 
diff --git a/sos/plugins/tuned.py b/sos/plugins/tuned.py
index 29c9a0f7..9400515a 100644
--- a/sos/plugins/tuned.py
+++ b/sos/plugins/tuned.py
@@ -21,6 +21,7 @@ class Tuned(Plugin, RedHatPlugin):
     """Tuned related information
     """
     packages = ('tuned',)
+    profiles = ('system', 'performance')
     plugin_name = 'tuned'
 
     def setup(self):
diff --git a/sos/plugins/ubuntu.py b/sos/plugins/ubuntu.py
index 12f46eed..05efea5c 100644
--- a/sos/plugins/ubuntu.py
+++ b/sos/plugins/ubuntu.py
@@ -20,6 +20,7 @@ class Ubuntu(Plugin, UbuntuPlugin):
     """
 
     plugin_name = 'ubuntu'
+    profiles = ('system',)
 
     option_list = [
         ('support-show-all',
diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py
index ec330fc8..c965cc93 100644
--- a/sos/plugins/udev.py
+++ b/sos/plugins/udev.py
@@ -20,6 +20,7 @@ class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'udev'
+    profiles = ('system', 'hardware', 'boot')
 
     def setup(self):
         self.add_copy_specs([
diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py
index f946b853..e15d248f 100644
--- a/sos/plugins/upstart.py
+++ b/sos/plugins/upstart.py
@@ -22,6 +22,7 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'upstart'
+    profiles = ('system', 'services', 'boot')
     packages = ('upstart',)
 
     def setup(self):
diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py
index 634e204b..1df0cf44 100644
--- a/sos/plugins/usb.py
+++ b/sos/plugins/usb.py
@@ -20,6 +20,7 @@ class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = "usb"
+    profiles = ('hardware',)
 
     def setup(self):
         self.add_copy_spec("/sys/bus/usb")
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 1ccc0b8c..f78a65fd 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -21,6 +21,7 @@ class Veritas(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'veritas'
+    profiles = ('cluster', 'storage')
 
     # Information about VRTSexplorer obtained from
     # http://seer.entsupport.symantec.com/docs/243150.htm
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 7aa8e559..c470701b 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -20,6 +20,7 @@ class VMWare(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'vmware'
+    profiles = ('virt',)
 
     files = ('vmware', '/usr/init.d/vmware-tools')
 
diff --git a/sos/plugins/vsftpd.py b/sos/plugins/vsftpd.py
index bc5846bc..f4214778 100644
--- a/sos/plugins/vsftpd.py
+++ b/sos/plugins/vsftpd.py
@@ -20,6 +20,7 @@ class Vsftpd(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'vsftpd'
+    profiles = ('services',)
 
     files = ('/etc/vsftpd',)
     packages = ('vsftpd',)
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index c4ba3cf2..bbc92561 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -20,6 +20,7 @@ class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'x11'
+    profiles = ('hardware', 'desktop')
 
     files = ('/etc/X11',)
 
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 99cd5dcb..57e92c07 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -23,6 +23,7 @@ class Xen(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'xen'
+    profiles = ('virt',)
 
     def determine_xen_host(self):
         if os.access("/proc/acpi/dsdt", os.R_OK):
diff --git a/sos/plugins/xfs.py b/sos/plugins/xfs.py
index 9e92e7b3..8b5f7ec3 100644
--- a/sos/plugins/xfs.py
+++ b/sos/plugins/xfs.py
@@ -21,6 +21,7 @@ class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'xfs'
+    profiles = ('storage',)
 
     option_list = [("logprint", 'gathers the log information', 'slow', False)]
 
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index 951ddff0..7367c86e 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -22,6 +22,7 @@ class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """
 
     plugin_name = 'xinetd'
+    profiles = ('services', 'network', 'boot')
 
     files = ('/etc/xinetd.conf',)
     packages = ('xinetd',)
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index ff9390f9..f56f48f5 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -20,6 +20,7 @@ class Yum(Plugin, RedHatPlugin):
     """
 
     plugin_name = 'yum'
+    profiles = ('system', 'packagemanager', 'sysmgmt')
 
     files = ('/etc/yum.conf',)
     packages = ('yum',)