diff options
author | Xuewei Zhang <xueweiz@google.com> | 2020-04-30 00:21:13 -0700 |
---|---|---|
committer | Jake Hunsaker <jhunsake@redhat.com> | 2020-05-05 16:39:31 -0400 |
commit | 6a6c9b0e9a72deaf2c08adb0003cd0c106679238 (patch) | |
tree | c66f982090bd0155847c64c05b84f78087c91f9d | |
parent | ad8b0b2460990168d939b89abe53aaf87a045491 (diff) | |
download | sos-6a6c9b0e9a72deaf2c08adb0003cd0c106679238.tar.gz |
[plugins] mark 9 plugins as supported on COS
9 exisiting plugins already works on Container-Optimized OS. Marking it
to reflect that.
Resolves: #1419
Signed-off-by: Xuewei Zhang <xueweiz@google.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
-rw-r--r-- | sos/report/plugins/__init__.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/cgroups.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/devices.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/docker.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/filesys.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/kernel.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/logs.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/memory.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/process.py | 5 | ||||
-rw-r--r-- | sos/report/plugins/systemd.py | 5 |
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' |