Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[foreman] Skip collection of generic resources
New option was added to foreman-debug (-g) to skip collecting of generic
resources (firewall, selinux, cpu, memory). This patch leverages that.

https://github.com/theforeman/foreman/blob/develop/script/foreman-debug

Since katello-debug is now part of foreman-debug (as a plugin), there is no
need of separate sosreport plugin.

https://github.com/Katello/katello/blob/master/deploy/script/katello-debug.sh

New subpackage called foreman-debug was introduced. It is present in both
upstream Foreman and Katello installations as well as on both Satellite 6 main
node and capsule instances. It can be used to detect if foreman-debug script is
present.

Signed-off-by: Lukas Zapletal <lzap+git@redhat.com>
  • Loading branch information
lzap committed Feb 3, 2015
1 parent 476b7bc commit 5cc0613
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 35 deletions.
6 changes: 3 additions & 3 deletions sos/plugins/foreman.py
Expand Up @@ -18,16 +18,16 @@


class Foreman(Plugin, RedHatPlugin):
"""Foreman systems management
"""Foreman/Satellite 6 systems management
"""

plugin_name = 'foreman'
profiles = ('sysmgmt',)
packages = ('foreman')
packages = ('foreman-debug')

def setup(self):
cmd = "foreman-debug"
path = self.get_cmd_output_path(name="foreman-debug")
self.add_cmd_output("%s -q -a -d %s" % (cmd, path))
self.add_cmd_output("%s -g -q -a -d %s" % (cmd, path))

# vim: et ts=4 sw=4
32 changes: 0 additions & 32 deletions sos/plugins/katello.py

This file was deleted.

0 comments on commit 5cc0613

Please sign in to comment.