10 files changed, 32 insertions, 18 deletions
diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py
index c632d5e4..408705ad 100644
--- a/sos/report/plugins/__init__.py
+++ b/sos/report/plugins/__init__.py
@@ -2000,6 +2000,11 @@ class SuSEPlugin(object):
     pass
 
 
+class CosPlugin(object):
+    """Tagging class for Container-Optimized OS"""
+    pass
+
+
 class IndependentPlugin(object):
     """Tagging class for plugins that can run on any platform"""
     pass
diff --git a/sos/report/plugins/cgroups.py b/sos/report/plugins/cgroups.py
index ea4000b8..2de79960 100644
--- a/sos/report/plugins/cgroups.py
+++ b/sos/report/plugins/cgroups.py
@@ -6,10 +6,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Cgroups(Plugin, DebianPlugin, UbuntuPlugin):
+class Cgroups(Plugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'Control groups subsystem'
 
diff --git a/sos/report/plugins/devices.py b/sos/report/plugins/devices.py
index 23f9b588..cecc20ef 100644
--- a/sos/report/plugins/devices.py
+++ b/sos/report/plugins/devices.py
@@ -6,10 +6,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Devices(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Devices(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'devices specific commands'
 
diff --git a/sos/report/plugins/docker.py b/sos/report/plugins/docker.py
index ebebe31e..6b8e0804 100644
--- a/sos/report/plugins/docker.py
+++ b/sos/report/plugins/docker.py
@@ -8,10 +8,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, SoSPredicate
+from sos.report.plugins import (Plugin, RedHatPlugin, UbuntuPlugin,
+                                SoSPredicate, CosPlugin)
 
 
-class Docker(Plugin):
+class Docker(Plugin, CosPlugin):
 
     short_desc = 'Docker containers'
     plugin_name = 'docker'
diff --git a/sos/report/plugins/filesys.py b/sos/report/plugins/filesys.py
index 398487bf..3baec3ce 100644
--- a/sos/report/plugins/filesys.py
+++ b/sos/report/plugins/filesys.py
@@ -6,10 +6,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Filesys(Plugin, DebianPlugin, UbuntuPlugin):
+class Filesys(Plugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'Local file systems'
 
diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py
index b6669053..2ea6f318 100644
--- a/sos/report/plugins/kernel.py
+++ b/sos/report/plugins/kernel.py
@@ -6,12 +6,13 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 import os
 import glob
 
 
-class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'Linux kernel'
 
diff --git a/sos/report/plugins/logs.py b/sos/report/plugins/logs.py
index 138f316a..c92cc1f0 100644
--- a/sos/report/plugins/logs.py
+++ b/sos/report/plugins/logs.py
@@ -8,10 +8,11 @@
 
 import os
 import glob
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'System logs'
 
diff --git a/sos/report/plugins/memory.py b/sos/report/plugins/memory.py
index 794aff08..aefb27b8 100644
--- a/sos/report/plugins/memory.py
+++ b/sos/report/plugins/memory.py
@@ -6,10 +6,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'Memory configuration and use'
 
diff --git a/sos/report/plugins/process.py b/sos/report/plugins/process.py
index 7d49fb5a..ac2a7d8c 100644
--- a/sos/report/plugins/process.py
+++ b/sos/report/plugins/process.py
@@ -6,10 +6,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'process information'
 
diff --git a/sos/report/plugins/systemd.py b/sos/report/plugins/systemd.py
index 9399a905..e0e904b5 100644
--- a/sos/report/plugins/systemd.py
+++ b/sos/report/plugins/systemd.py
@@ -8,10 +8,11 @@
 #
 # See the LICENSE file in the source distribution for further information.
 
-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
+                                UbuntuPlugin, CosPlugin)
 
 
-class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
 
     short_desc = 'System management daemon'