diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | sos/plugins/cloudforms.py | 38 | ||||
| -rw-r--r-- | sos/plugins/foreman.py | 36 | ||||
| -rw-r--r-- | sos/plugins/katello.py | 36 | ||||
| -rw-r--r-- | sos/plugins/neutron.py | 172 | ||||
| -rw-r--r-- | sos/plugins/openstack.py | 15 | ||||
| -rw-r--r-- | sos/plugins/rpm.py | 5 | ||||
| -rw-r--r-- | tests/utilities_tests.py | 4 |
8 files changed, 252 insertions, 55 deletions
@@ -16,6 +16,7 @@ Justin Payne <jpayne@redhat.com> Keith Kearnan <kearnan_keith@emc.com> Kent Lamb <klamb@redhat.com> Louis Bouchard <louis.bouchard@canonical.com> +Lukas Zapletal <lzap@redhat.com> Marc Sauton <msauton@redhat.com> Navid Sheikhol-Eslami <navid@redhat.com> Pierre Amadio <pamadio@redhat.com> diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py deleted file mode 100644 index 9f1721fd..00000000 --- a/sos/plugins/cloudforms.py +++ /dev/null @@ -1,38 +0,0 @@ -## Copyright (C) 2012 Red Hat Inc., Bryn M. Reeves <bmr@redhat.com> -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. - -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. - -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -from sos.plugins import Plugin, RedHatPlugin -import os - -class Cloudforms(Plugin, RedHatPlugin): - """CloudForms related information - """ - - plugin_name = 'cloudforms' - packages = ["katello", "katello-common", - "katello-headpin", "aeoleus-conductor"] - files = ["/usr/share/katello/script/katello-debug", - "aeolus-debug"] - - def setup(self): - katello_debug = "/usr/share/katello/script/katello-debug" - aeolus_debug = "aeolus-debug" - if os.path.isfile(katello_debug): - katello_debug_path = os.path.join(self.get_cmd_path(), "katello-debug") - self.add_cmd_output("%s --notar -d %s" % (katello_debug, katello_debug_path)) - if os.path.isfile(aeolus_debug): - aeolus_debug_path = os.path.join(self.get_cmd_path(), "aeolus-debug") - self.add_cmd_output("%s --notar -d %s" % (aeolus_debug, aeolus_debug_path)) - diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py new file mode 100644 index 00000000..60ec34df --- /dev/null +++ b/sos/plugins/foreman.py @@ -0,0 +1,36 @@ +## Copyright (C) 2013 Red Hat, Inc., Lukas Zapletal <lzap@redhat.com> + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +import sos.plugintools +import os + +class foreman(sos.plugintools.PluginBase): + """Foreman project related information + """ + + def defaultenabled(self): + return True + + def checkenabled(self): + self.packages = ["foreman"] + self.files = ["/usr/sbin/foreman-debug"] + return sos.plugintools.PluginBase.checkenabled(self) + + def setup(self): + foreman_debug = "/usr/sbin/foreman-debug" + if os.path.isfile(foreman_debug): + foreman_debug_path = os.path.join(self.cInfo['dstroot'],"foreman-debug") + self.collectExtOutput("%s -a -d %s" % (foreman_debug, foreman_debug_path)) diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py new file mode 100644 index 00000000..54b30fac --- /dev/null +++ b/sos/plugins/katello.py @@ -0,0 +1,36 @@ +## Copyright (C) 2013 Red Hat, Inc., Lukas Zapletal <lzap@redhat.com> + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +import sos.plugintools +import os + +class katello(sos.plugintools.PluginBase): + """Katello project related information + """ + + def defaultenabled(self): + return True + + def checkenabled(self): + self.packages = ["katello", "katello-common", "katello-headpin"] + self.files = ["/usr/bin/katello-debug"] + return sos.plugintools.PluginBase.checkenabled(self) + + def setup(self): + katello_debug = "/usr/bin/katello-debug" + if os.path.isfile(katello_debug): + katello_debug_path = os.path.join(self.cInfo['dstroot'],"katello-debug") + self.collectExtOutput("%s --notar -d %s" % (katello_debug, katello_debug_path)) diff --git a/sos/plugins/neutron.py b/sos/plugins/neutron.py new file mode 100644 index 00000000..03403227 --- /dev/null +++ b/sos/plugins/neutron.py @@ -0,0 +1,172 @@ +## Copyright (C) 2013 Red Hat, Inc., Brent Eagles <beagles@redhat.com> + +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +import os +import re + +from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin + +# The Networking plugin includes most of what is needed from a snapshot +# of the networking, so we only need to focus on the parts that are specific +# to OpenStack Networking. The Process plugin should capture the dnsmasq +# command line. The libvirt plugin grabs the instance's XML definition which +# has the interface names for an instance. So what remains is relevant database +# info... + +class Neutron(Plugin): + """OpenStack Networking (quantum/neutron) related information + """ + plugin_name = "neutron" + + option_list = [("log", "Gathers all Neutron logs", "slow", False), + ("quantum", "Overrides checks for newer Neutron components", + "fast", False)] + + component_name = "neutron" + + def setup(self): + if os.path.exists("/etc/neutron/") and self.get_option("quantum", False): + self.component_name = self.plugin_name + else: + self.component_name = "quantum" + + self.add_copy_specs(["/etc/%s/" % self.component_name, + "/var/log/%s/" % self.component_name]) + + self.netns_dumps() + self.get_ovs_dumps() + + + def get_ovs_dumps(self): + # Check to see if we are using the Open vSwitch plugin. If not we + # should be able to skip the rest of the dump. + ovs_conf_check_out = self.call_ext_prog('grep "^core_plugin.*openvswitch" ' + + ("/etc/%s/*.conf" + self.component_name)) + + if not ovs_conf_check_out or len(ovs_conf_check_out[1].splitlines()) == 0: + return + + # The '-s' option enables dumping of packet counters on the + # ports. + self.add_cmd_output("ovs-dpctl -s show") + + # The '-t 5' adds an upper bound on how long to wait to connect + # to the Open vSwitch server, avoiding hangs when running sosreport. + self.add_cmd_output("ovs-vsctl -t 5 show") + + def netns_dumps(self): + # It would've been beautiful if we could get parts of the networking + # plugin to run in different namespaces. There are a couple of options + # in the short term: create a local instance and "borrow" some of the + # functionality, or simply copy some of the functionality. + prefixes = ["qdhcp", "qrouter"] + nslist = self.call_ext_prog("ip netns") + lease_directories = [] + if nslist: + for nsname in nslist[1].splitlines(): + prefix, netid = nsname.split('-', 1) + if len(netid) > 0 and prefix in prefixes: + self.ns_gather_data(nsname) + lease_directories.append("/var/lib/%s/dhcp/%s/" % + (self.component_name, netid)) + self.add_copy_specs(lease_directories) + + # TODO: Refactor! Copied from Networking plugin. + def get_interface_name(self,ip_addr_out): + """Return a dictionary for which key are interface name according to the + output of ifconifg-a stored in ifconfig_file. + """ + out={} + for line in ip_addr_out[1].splitlines(): + match=re.match('.*link/ether', line) + if match: + int=match.string.split(':')[1].lstrip() + out[int]=True + return out + + def ns_gather_data(self, nsname): + cmd_prefix = "ip netns exec %s " % nsname + self.add_cmd_output(cmd_prefix + "iptables-save") + self.add_cmd_output(cmd_prefix + "ifconfig -a") + self.add_cmd_output(cmd_prefix + "route -n") + # borrowed from networking plugin + ip_addr_out=self.call_ext_prog(cmd_prefix + "ip -o addr") + if ip_addr_out: + for eth in self.get_interface_name(ip_addr_out): + self.add_cmd_output(cmd_prefix + "ethtool "+eth) + self.add_cmd_output(cmd_prefix + "ethtool -i "+eth) + self.add_cmd_output(cmd_prefix + "ethtool -k "+eth) + self.add_cmd_output(cmd_prefix + "ethtool -S "+eth) + # Most, if not all, IFs in the namespaces are going to be + # virtual. The '-a', '-c' and '-g' options are not likely to be + # supported so these ops are not copied from the network + # plugin. + + # As all of the bridges are in the "global namespace", we do not need + # to gather info on them. + + def gen_pkg_tuple(self, packages): + names = [] + for p in packages: + names.append(p % { "comp" : self.component_name }) + return tuple(names) + +class DebianNeutron(Neutron, DebianPlugin, UbuntuPlugin): + """OpenStack Neutron related information for Debian based distributions + """ + package_list_template = ['%(comp)s-common', + '%(comp)s-plugin-cisco', + '%(comp)s-plugin-linuxbridge-agent', + '%(comp)s-plugin-nicira', + '%(comp)s-plugin-openvswitch', + '%(comp)s-plugin-openvswitch-agent', + '%(comp)s-plugin-ryu', + '%(comp)s-plugin-ryu-agent', + '%(comp)s-server', + 'python-%(comp)s', + 'python-%(comp)sclient'] + + def setup(self): + super(DebianNeutron, self).setup() + self.packages = self.gen_pkg_tuple(self.package_list_template) + self.add_copy_spec("/etc/sudoers.d/%s_sudoers" % self.component_name) + + + +class RedHatNeutron(Neutron, RedHatPlugin): + """OpenStack Neutron related information for Red Hat distributions + """ + + package_list_template = ['openstack-%(comp)s', + 'openstack-%(comp)s-linuxbridge' + 'openstack-%(comp)s-metaplugin', + 'openstack-%(comp)s-openvswitch', + 'openstack-%(comp)s-bigswitch', + 'openstack-%(comp)s-brocade', + 'openstack-%(comp)s-cisco', + 'openstack-%(comp)s-hyperv', + 'openstack-%(comp)s-midonet', + 'openstack-%(comp)s-nec' + 'openstack-%(comp)s-nicira', + 'openstack-%(comp)s-plumgrid', + 'openstack-%(comp)s-ryu', + 'python-%(comp)s', + 'python-%(comp)sclient'] + + def setup(self): + super(RedHatNeutron, self).setup() + self.packages = self.gen_pkg_tuple(self.package_list_template) + self.add_copy_specs(["/etc/sudoers.d/%s-rootwrap" % self.component_name]) diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py index 2f696fa9..488fe6ce 100644 --- a/sos/plugins/openstack.py +++ b/sos/plugins/openstack.py @@ -84,21 +84,10 @@ class DebianOpenStack(OpenStack, DebianPlugin, UbuntuPlugin): 'nova-scheduler', 'nova-volume', 'novnc', - 'quantum-common', - 'quantum-plugin-cisco', - 'quantum-plugin-linuxbridge-agent', - 'quantum-plugin-nicira', - 'quantum-plugin-openvswitch', - 'quantum-plugin-openvswitch-agent', - 'quantum-plugin-ryu', - 'quantum-plugin-ryu-agent', - 'quantum-server', 'python-melange', 'python-nova', 'python-novaclient', 'python-novnc', - 'python-quantum', - 'python-quantumclient') def setup(self): # Nova @@ -113,11 +102,9 @@ class RedHatOpenStack(OpenStack, RedHatPlugin): """ packages = ('openstack-nova', - 'openstack-quantum', 'python-nova', 'python-novaclient', - 'python-openstackclient', - 'python-quantumclient') + 'python-openstackclient') def setup(self): # Nova diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py index 71f36a0c..55c80196 100644 --- a/sos/plugins/rpm.py +++ b/sos/plugins/rpm.py @@ -24,7 +24,7 @@ class Rpm(Plugin, RedHatPlugin): ("rpmva", "runs a verify on all packages", "slow", False)] verify_list = [ - 'kernel', 'glibc', 'initscripts', + 'kernel$', 'glibc', 'initscripts', 'pam_.*', 'java.*', 'perl.*', 'rpm', 'yum', @@ -49,4 +49,7 @@ class Rpm(Plugin, RedHatPlugin): verify_list = map(pkgs_by_regex, self.verify_list) for pkg_list in verify_list: for pkg in pkg_list: + if 'debuginfo' in pkg \ + or pkg.endswith('-debuginfo-common'): + continue self.add_cmd_output("rpm -V %s" % pkg) diff --git a/tests/utilities_tests.py b/tests/utilities_tests.py index 9cce51a4..fc9e858f 100644 --- a/tests/utilities_tests.py +++ b/tests/utilities_tests.py @@ -78,7 +78,7 @@ class ExecutableTest(unittest.TestCase): path = os.path.join(TEST_DIR, 'test_exe.py') ret, out, junk = sos_get_command_output(path) self.assertEquals(ret, 0) - self.assertEquals(out, "executed") + self.assertEquals(out, "executed\n") def test_output_non_exe(self): path = os.path.join(TEST_DIR, 'utility_tests.py') @@ -88,7 +88,7 @@ class ExecutableTest(unittest.TestCase): def test_shell_out(self): path = os.path.join(TEST_DIR, 'test_exe.py') - self.assertEquals("executed", shell_out(path)) + self.assertEquals("executed\n", shell_out(path)) class FindTest(unittest.TestCase): |