diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2018-04-02 15:32:01 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-05-22 15:14:44 +0100 |
| commit | 1cf2434e54df1e0a2e8e41e95e3b8f9455f02dcd (patch) | |
| tree | e00ffde2c9d893d86ddd867a308a37ebb2bfff3c | |
| parent | eb03bd2cd916932f74c02009e39576a20eee3071 (diff) | |
| download | sos-1cf2434e54df1e0a2e8e41e95e3b8f9455f02dcd.tar.gz | |
[sosreport] Add new container profile
Adds a new 'container' profile to sos that includes common container and
related technology plugins.
Resolves: #1260
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/atomichost.py | 1 | ||||
| -rw-r--r-- | sos/plugins/cgroups.py | 2 | ||||
| -rw-r--r-- | sos/plugins/docker.py | 2 | ||||
| -rw-r--r-- | sos/plugins/docker_distribution.py | 1 | ||||
| -rw-r--r-- | sos/plugins/etcd.py | 2 | ||||
| -rw-r--r-- | sos/plugins/kubernetes.py | 1 | ||||
| -rw-r--r-- | sos/plugins/runc.py | 1 | ||||
| -rw-r--r-- | sos/plugins/selinux.py | 2 |
8 files changed, 8 insertions, 4 deletions
diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py index 91f64ad8..8e904dbf 100644 --- a/sos/plugins/atomichost.py +++ b/sos/plugins/atomichost.py @@ -22,6 +22,7 @@ class AtomicHost(Plugin, RedHatPlugin): """ Atomic Host """ plugin_name = "atomichost" + profiles = ('container',) option_list = [ ("info", "gather atomic info for each image", "fast", False) ] diff --git a/sos/plugins/cgroups.py b/sos/plugins/cgroups.py index 144c5122..981444b3 100644 --- a/sos/plugins/cgroups.py +++ b/sos/plugins/cgroups.py @@ -20,7 +20,7 @@ class Cgroups(Plugin, DebianPlugin, UbuntuPlugin): """ plugin_name = "cgroups" - profiles = ('system',) + profiles = ('container', 'system') files = ('/proc/cgroups',) def setup(self): diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index f372845c..738ea234 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -23,7 +23,7 @@ class Docker(Plugin): """ plugin_name = 'docker' - profiles = ('virt',) + profiles = ('container',) docker_cmd = "docker" option_list = [ diff --git a/sos/plugins/docker_distribution.py b/sos/plugins/docker_distribution.py index 6bcbb08f..372f2c28 100644 --- a/sos/plugins/docker_distribution.py +++ b/sos/plugins/docker_distribution.py @@ -22,6 +22,7 @@ class DockerDistribution(Plugin): """Docker Distribution""" plugin_name = "docker_distribution" + profiles = ('container',) def setup(self): self.add_copy_spec('/etc/docker-distribution/') diff --git a/sos/plugins/etcd.py b/sos/plugins/etcd.py index fd0dcba7..062db6cb 100644 --- a/sos/plugins/etcd.py +++ b/sos/plugins/etcd.py @@ -24,7 +24,7 @@ class etcd(Plugin, RedHatPlugin): plugin_name = 'etcd' packages = ('etcd',) - profiles = ('system', 'services', 'cluster') + profiles = ('container', 'system', 'services', 'cluster') cmd = 'etcdctl' diff --git a/sos/plugins/kubernetes.py b/sos/plugins/kubernetes.py index 252cdd74..9c277e4b 100644 --- a/sos/plugins/kubernetes.py +++ b/sos/plugins/kubernetes.py @@ -27,6 +27,7 @@ class kubernetes(Plugin, RedHatPlugin): # Red Hat Atomic Platform and OpenShift Enterprise use the # atomic-openshift-master package to provide kubernetes packages = ('kubernetes', 'kubernetes-master', 'atomic-openshift-master') + profiles = ('container',) files = ("/etc/origin/master/master-config.yaml",) option_list = [ diff --git a/sos/plugins/runc.py b/sos/plugins/runc.py index 9006c50d..46fd80b2 100644 --- a/sos/plugins/runc.py +++ b/sos/plugins/runc.py @@ -21,6 +21,7 @@ class Runc(Plugin): """runC container runtime""" plugin_name = 'runc' + profiles = ('container',) def setup(self): diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py index f9140699..0376e039 100644 --- a/sos/plugins/selinux.py +++ b/sos/plugins/selinux.py @@ -20,7 +20,7 @@ class SELinux(Plugin, RedHatPlugin): """ plugin_name = 'selinux' - profiles = ('system', 'security', 'openshift') + profiles = ('container', 'system', 'security', 'openshift') option_list = [("fixfiles", 'Print incorrect file context labels', 'slow', False)] |