diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py index a7fa9de584..5e9745f290 100644 --- a/sos/report/plugins/__init__.py +++ b/sos/report/plugins/__init__.py @@ -1997,6 +1997,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 a8710ee864..ab3c547681 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): """Control groups subsystem """ diff --git a/sos/report/plugins/devices.py b/sos/report/plugins/devices.py index 2a4cf7c79f..0d5b2b234a 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): """ devices specific commands """ diff --git a/sos/report/plugins/docker.py b/sos/report/plugins/docker.py index ac56322b29..c466965cbe 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): """Docker containers """ diff --git a/sos/report/plugins/filesys.py b/sos/report/plugins/filesys.py index 87f3f26bff..e7461ae71d 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): """Local file systems """ diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py index 20317e0eb8..1f62c6ae2e 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): """Linux kernel """ diff --git a/sos/report/plugins/logs.py b/sos/report/plugins/logs.py index d6ec0e6b00..17839f2d5f 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): """System logs""" plugin_name = "logs" diff --git a/sos/report/plugins/memory.py b/sos/report/plugins/memory.py index f32e835193..3273534026 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): """Memory configuration and use """ diff --git a/sos/report/plugins/process.py b/sos/report/plugins/process.py index 7a69783055..693c684ff6 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): """process information """ diff --git a/sos/report/plugins/systemd.py b/sos/report/plugins/systemd.py index 19993e6290..82b133e242 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): """ System management daemon """