diff --git a/SOURCES/sos-bz1139339-foreman-add-plugin.patch b/SOURCES/sos-bz1139339-foreman-add-plugin.patch new file mode 100644 index 0000000..235a88e --- /dev/null +++ b/SOURCES/sos-bz1139339-foreman-add-plugin.patch @@ -0,0 +1,36 @@ +diff -up sos-3.0/sos/plugins/foreman.py.orig sos-3.0/sos/plugins/foreman.py +--- sos-3.0/sos/plugins/foreman.py.orig 2014-10-03 17:17:51.218891639 +0100 ++++ sos-3.0/sos/plugins/foreman.py 2014-10-03 17:17:30.861758765 +0100 +@@ -0,0 +1,32 @@ ++# Copyright (C) 2013 Red Hat, Inc., Lukas Zapletal ++ ++# 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 Foreman(Plugin, RedHatPlugin): ++ """Foreman systems management ++ """ ++ ++ plugin_name = 'foreman' ++ packages = ('foreman') ++ ++ def setup(self): ++ cmd = "foreman-debug" ++ path = os.path.join(self.get_cmd_dir(), "foreman-debug") ++ self.add_cmd_output("%s -q -a -d %s" % (cmd, path)) ++ ++# vim: et ts=4 sw=4 diff --git a/SOURCES/sos-bz1148560-add-kpatch-plugin.patch b/SOURCES/sos-bz1148560-add-kpatch-plugin.patch new file mode 100644 index 0000000..1841567 --- /dev/null +++ b/SOURCES/sos-bz1148560-add-kpatch-plugin.patch @@ -0,0 +1,93 @@ +From bf1dd84ad4049246d79a63f3448b1e855d159a5d Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Thu, 19 Jun 2014 10:49:17 +0100 +Subject: [PATCH] [kpatch] new plugin + +Based on a suggestion from Marc Milgram in rhbz#1110918. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/kpatch.py | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + create mode 100644 sos/plugins/kpatch.py + +diff --git a/sos/plugins/kpatch.py b/sos/plugins/kpatch.py +new file mode 100644 +index 0000000..7909926 +--- /dev/null ++++ b/sos/plugins/kpatch.py +@@ -0,0 +1,38 @@ ++# Copyright (C) 2014 Red Hat, Inc. Bryn M. Reeves ++# 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 re ++ ++ ++class Kpatch(Plugin, RedHatPlugin): ++ """Kpatch information ++ """ ++ ++ plugin_name = 'kpatch' ++ ++ packages = ('kpatch',) ++ ++ def setup(self): ++ kpatch_list = self.get_cmd_output_now("kpatch list") ++ kpatches = open(kpatch_list, "r").read().splitlines() ++ for patch in kpatches: ++ if not re.match("^kpatch-.*\(.*\)", patch): ++ continue ++ (module, version) = patch.split() ++ self.add_cmd_output("kpatch info " + module) ++ ++ ++# vim: et ts=4 sw=4 +-- +1.9.3 + +From 6b43c42078604b0551923c2801108848e97ba3b9 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Tue, 14 Oct 2014 15:43:20 +0100 +Subject: [PATCH] [kpatch] do not try to read kpatch data if it could not be + run + +Everything the kpatch plugin does requires the list of available +kpatch patches obtained from 'kpatch list'. If this fails return +immediately from the setup method. + +Fixes #417. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/kpatch.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sos/plugins/kpatch.py b/sos/plugins/kpatch.py +index 7909926..6ef557e 100644 +--- a/sos/plugins/kpatch.py ++++ b/sos/plugins/kpatch.py +@@ -27,6 +27,8 @@ class Kpatch(Plugin, RedHatPlugin): + + def setup(self): + kpatch_list = self.get_cmd_output_now("kpatch list") ++ if not kpatch_list: ++ return + kpatches = open(kpatch_list, "r").read().splitlines() + for patch in kpatches: + if not re.match("^kpatch-.*\(.*\)", patch): +-- +1.9.3 + diff --git a/SOURCES/sos-bz1148784-openstack-backport-plugins-from-master.patch b/SOURCES/sos-bz1148784-openstack-backport-plugins-from-master.patch new file mode 100644 index 0000000..38c56c6 --- /dev/null +++ b/SOURCES/sos-bz1148784-openstack-backport-plugins-from-master.patch @@ -0,0 +1,1125 @@ +From dda4e7261e77e92434294fe671a7310ab4fc79d2 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Thu, 11 Sep 2014 12:53:51 +0100 +Subject: [PATCH] [openstack] backport OpenStack plugins from master + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/openstack.py | 207 ------------------------------------ + sos/plugins/openstack_ceilometer.py | 67 ++++++++++++ + sos/plugins/openstack_cinder.py | 86 +++++++++++++++ + sos/plugins/openstack_glance.py | 64 +++++++++++ + sos/plugins/openstack_heat.py | 68 ++++++++++++ + sos/plugins/openstack_horizon.py | 81 ++++++++++++++ + sos/plugins/openstack_keystone.py | 79 ++++++++++++++ + sos/plugins/openstack_neutron.py | 178 +++++++++++++++++++++++++++++++ + sos/plugins/openstack_nova.py | 152 ++++++++++++++++++++++++++ + sos/plugins/openstack_swift.py | 62 +++++++++++ + 10 files changed, 837 insertions(+), 207 deletions(-) + delete mode 100644 sos/plugins/openstack.py + create mode 100644 sos/plugins/openstack_ceilometer.py + create mode 100644 sos/plugins/openstack_cinder.py + create mode 100644 sos/plugins/openstack_glance.py + create mode 100644 sos/plugins/openstack_heat.py + create mode 100644 sos/plugins/openstack_horizon.py + create mode 100644 sos/plugins/openstack_keystone.py + create mode 100644 sos/plugins/openstack_neutron.py + create mode 100644 sos/plugins/openstack_nova.py + create mode 100644 sos/plugins/openstack_swift.py + +diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py +deleted file mode 100644 +index 8c52136..0000000 +--- a/sos/plugins/openstack.py ++++ /dev/null +@@ -1,207 +0,0 @@ +-## Copyright (C) 2009 Red Hat, Inc., Joey Boggs +-## Copyright (C) 2012 Rackspace US, Inc., Justin Shepherd +- +-### 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 +- +-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin +- +- +-class OpenStack(Plugin): +- """openstack related information +- """ +- plugin_name = "openstack" +- +- option_list = [("log", "gathers all openstack logs", "slow", False)] +- +- +-class DebianOpenStack(OpenStack, DebianPlugin, UbuntuPlugin): +- """OpenStack related information for Debian based distributions +- """ +- +- packages = ('cinder-api', +- 'cinder-backup', +- 'cinder-common', +- 'cinder-scheduler', +- 'cinder-volume', +- 'glance', +- 'glance-api', +- 'glance-client', +- 'glance-common', +- 'glance-registry', +- 'keystone', +- 'melange', +- 'nova-api-ec2', +- 'nova-api-metadata', +- 'nova-api-os-compute', +- 'nova-api-os-volume', +- 'nova-common', +- 'nova-compute', +- 'nova-compute-kvm', +- 'nova-compute-lxc', +- 'nova-compute-qemu', +- 'nova-compute-uml', +- 'nova-compute-xcp', +- 'nova-compute-xen', +- 'nova-xcp-plugins', +- 'nova-consoleauth', +- 'nova-network', +- 'nova-scheduler', +- 'nova-volume', +- 'novnc', +- 'openstack-dashboard', +- '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', +- 'swift', +- 'swift-account', +- 'swift-container', +- 'swift-object', +- 'swift-proxy', +- 'swauth', +- 'python-cinder', +- 'python-cinderclient', +- 'python-django-horizon', +- 'python-glance', +- 'python-keystone', +- 'python-keystoneclient', +- 'python-melange', +- 'python-nova', +- 'python-novaclient', +- 'python-novnc', +- 'python-quantum', +- 'python-quantumclient', +- 'python-swift', +- 'python-swauth') +- +- def setup(self): +- # Nova +- if os.path.exists("nova-manage"): +- self.add_cmd_output( +- "nova-manage config list 2>/dev/null | sort", +- suggest_filename="nova_config_list") +- self.add_cmd_output( +- "nova-manage service list 2>/dev/null", +- suggest_filename="nova_service_list") +- self.add_cmd_output( +- "nova-manage db version 2>/dev/null", +- suggest_filename="nova_db_version") +- self.add_cmd_output( +- "nova-manage fixed list 2>/dev/null", +- suggest_filename="nova_fixed_ip_list") +- self.add_cmd_output( +- "nova-manage floating list 2>/dev/null", +- suggest_filename="nova_floating_ip_list") +- self.add_cmd_output( +- "nova-manage flavor list 2>/dev/null", +- suggest_filename="nova_flavor_list") +- self.add_cmd_output( +- "nova-manage network list 2>/dev/null", +- suggest_filename="nova_network_list") +- self.add_cmd_output( +- "nova-manage vm list 2>/dev/null", +- suggest_filename="nova_vm_list") +- self.add_copy_specs(["/etc/nova/", +- "/var/log/nova/", +- "/etc/default/nova-volume", +- "/etc/sudoers.d/nova_sudoers", +- "/etc/logrotate.d/nova-*"]) +- # Cinder +- if os.path.exists("/usr/bin/cinder-manage"): +- self.addCmdOutput( +- "/usr/bin/cinder-manage db version", +- suggest_filename="cinder_db_version") +- self.addCopySpecs(["/etc/cinder/", +- "/var/log/cinder/", +- "/etc/logrotate.d/cinder-*"]) +- # Glance +- if os.path.exists("glance-manage"): +- self.add_cmd_output( +- "glance-manage db_version", +- suggest_filename="glance_db_version") +- self.add_copy_specs(["/etc/glance/", +- "/var/log/glance/", +- "/etc/logrotate.d/glance-*"]) +- # Keystone +- self.add_copy_specs(["/etc/keystone/", +- "/var/log/keystone/", +- "/etc/logrotate.d/keystone"]) +- # Swift +- self.add_copy_specs(["/etc/swift/"]) +- # Quantum +- self.add_copy_specs(["/etc/quantum/", +- "/var/log/quantum/"]) +- +- +-class RedHatOpenStack(OpenStack, RedHatPlugin): +- """OpenStack related information for Red Hat distributions +- """ +- +- packages = ('openstack-nova', +- 'openstack-glance', +- 'openstack-dashboard', +- 'openstack-keystone', +- 'openstack-quantum', +- 'openstack-swift', +- 'openstack-swift-account', +- 'openstack-swift-container', +- 'openstack-swift-object', +- 'openstack-swift-proxy', +- 'swift', +- 'python-nova', +- 'python-glanceclient', +- 'python-keystoneclient', +- 'python-novaclient', +- 'python-openstackclient', +- 'python-quantumclient') +- +- def setup(self): +- # If RHEL or Fedora then invoke script for openstack-status +- if (os.path.isfile('/etc/redhat-release') +- or os.path.isfile('/etc/fedora-release')): +- self.add_cmd_output("openstack-status") +- +- # Nova +- self.add_copy_specs(["/etc/nova/", +- "/var/log/nova/", +- "/var/lib/nova/", +- "/etc/polkit-1/localauthority/50-local.d/50-nova.pkla", +- "/etc/sudoers.d/nova", +- "/etc/logrotate.d/openstack-nova"]) +- +- # Glance +- self.add_copy_specs(["/etc/glance/", +- "/var/log/glance/", +- "/etc/logrotate.d/openstack-glance"]) +- +- # Keystone +- self.add_copy_specs(["/etc/keystone/", +- "/var/log/keystone/"]) +- +- # Quantum +- self.add_copy_specs(["/etc/quantum/", +- "/var/log/quantum/"]) +- +- def postproc(self): +- self.do_file_sub('/etc/keystone/keystone.conf', +- r"(admin_password\s*=\s*)(.*)", +- r"\1******") +diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_ceilometer.py +@@ -0,0 +1,67 @@ ++# Copyright (C) 2013 Red Hat, Inc., Eoghan Lynn ++# Copyright (C) 2012 Rackspace US, Inc. ++# 2012 Justin Shepherd ++# Copyright (C) 2009 Red Hat, Inc. ++# 2009 Joey Boggs ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackCeilometer(Plugin): ++ """Openstack Ceilometer related information.""" ++ plugin_name = "openstack_ceilometer" ++ ++ option_list = [("log", "gathers openstack-ceilometer logs", "slow", False)] ++ ++ def setup(self): ++ # Ceilometer ++ self.add_copy_specs([ ++ "/etc/ceilometer/", ++ "/var/log/ceilometer" ++ ]) ++ ++ ++class DebianOpenStackCeilometer(OpenStackCeilometer, DebianPlugin, ++ UbuntuPlugin): ++ """OpenStackCeilometer related information for Debian based distributions. ++ """ ++ ++ packages = ( ++ 'ceilometer-api', ++ 'ceilometer-agent-central', ++ 'ceilometer-agent-compute', ++ 'ceilometer-collector', ++ 'ceilometer-common', ++ 'python-ceilometer', ++ 'python-ceilometerclient' ++ ) ++ ++ ++class RedHatOpenStackCeilometer(OpenStackCeilometer, RedHatPlugin): ++ """OpenStackCeilometer related information for Red Hat distributions.""" ++ ++ packages = ( ++ 'openstack-ceilometer', ++ 'openstack-ceilometer-api', ++ 'openstack-ceilometer-central', ++ 'openstack-ceilometer-collector', ++ 'openstack-ceilometer-common', ++ 'openstack-ceilometer-compute', ++ 'python-ceilometerclient' ++ ) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_cinder.py +@@ -0,0 +1,86 @@ ++# Copyright (C) 2009 Red Hat, Inc., Joey Boggs ++# Copyright (C) 2012 Rackspace US, Inc., ++# Justin Shepherd ++# Copyright (C) 2013 Red Hat, Inc., Flavio Percoco ++# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackCinder(Plugin): ++ """openstack cinder related information ++ """ ++ plugin_name = "openstack_cinder" ++ ++ option_list = [("log", "gathers openstack cinder logs", "slow", True), ++ ("db", "gathers openstack cinder db version", "slow", ++ False)] ++ ++ def setup(self): ++ if self.get_option("db"): ++ self.add_cmd_output( ++ "cinder-manage db version", ++ suggest_filename="cinder_db_version") ++ ++ self.add_copy_specs(["/etc/cinder/"]) ++ ++ if self.get_option("log"): ++ self.add_copy_specs(["/var/log/cinder/"]) ++ ++ ++class DebianOpenStackCinder(OpenStackCinder, DebianPlugin, UbuntuPlugin): ++ """OpenStack Cinder related information for Debian based distributions ++ """ ++ ++ cinder = False ++ packages = ( ++ 'cinder-api', ++ 'cinder-backup', ++ 'cinder-common', ++ 'cinder-scheduler', ++ 'cinder-volume', ++ 'python-cinder', ++ 'python-cinderclient' ++ ) ++ ++ def check_enabled(self): ++ self.cinder = self.is_installed("cinder-common") ++ return self.cinder ++ ++ def setup(self): ++ super(DebianOpenStackCinder, self).setup() ++ ++ ++class RedHatOpenStackCinder(OpenStackCinder, RedHatPlugin): ++ """OpenStack related information for Red Hat distributions ++ """ ++ ++ cinder = False ++ packages = ('openstack-cinder', ++ 'python-cinder', ++ 'python-cinderclient') ++ ++ def check_enabled(self): ++ self.cinder = self.is_installed("openstack-cinder") ++ return self.cinder ++ ++ def setup(self): ++ super(RedHatOpenStackCinder, self).setup() ++ self.add_copy_specs(["/etc/sudoers.d/cinder"]) ++ ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_glance.py +@@ -0,0 +1,64 @@ ++# Copyright (C) 2013 Red Hat, Inc., Flavio Percoco ++# Copyright (C) 2012 Rackspace US, Inc., ++# Justin Shepherd ++# Copyright (C) 2009 Red Hat, Inc., Joey Boggs ++ ++# 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 import plugins ++ ++ ++class OpenStackGlance(plugins.Plugin): ++ """OpenstackGlance related information.""" ++ plugin_name = "openstack_glance" ++ ++ option_list = [("log", "gathers openstack-glance logs", "slow", False)] ++ ++ def setup(self): ++ # Glance ++ self.add_cmd_output( ++ "glance-manage db_version", ++ suggest_filename="glance_db_version" ++ ) ++ self.add_copy_specs([ ++ "/etc/glance/", ++ "/var/log/glance/" ++ ]) ++ ++ ++class DebianOpenStackGlance(OpenStackGlance, ++ plugins.DebianPlugin, ++ plugins.UbuntuPlugin): ++ """OpenStackGlance related information for Debian based distributions.""" ++ ++ packages = ( ++ 'glance', ++ 'glance-api', ++ 'glance-client', ++ 'glance-common', ++ 'glance-registry', ++ 'python-glance' ++ ) ++ ++ ++class RedHatOpenStackGlance(OpenStackGlance, plugins.RedHatPlugin): ++ """OpenStackGlance related information for Red Hat distributions.""" ++ ++ packages = ( ++ 'openstack-glance', ++ 'python-glanceclient' ++ ) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_heat.py +@@ -0,0 +1,68 @@ ++# Copyright (C) 2013 Red Hat, Inc. ++ ++# 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 import plugins ++ ++ ++class OpenStackHeat(plugins.Plugin): ++ """openstack related information ++ """ ++ plugin_name = "openstack_heat" ++ ++ option_list = [("log", "gathers openstack-heat logs", "slow", False)] ++ ++ def setup(self): ++ # Heat ++ self.add_cmd_output( ++ "heat-manage db_version", ++ suggest_filename="heat_db_version" ++ ) ++ self.add_copy_specs([ ++ "/etc/heat/", ++ "/var/log/heat/" ++ ]) ++ ++ ++class DebianOpenStack(OpenStackHeat, ++ plugins.DebianPlugin, ++ plugins.UbuntuPlugin): ++ """OpenStackHeat related information for Debian based distributions.""" ++ ++ packages = ( ++ 'heat-api', ++ 'heat-api-cfn', ++ 'heat-api-cloudwatch', ++ 'heat-common', ++ 'heat-engine', ++ 'python-heat', ++ 'python-heatclient' ++ ) ++ ++ ++class RedHatOpenStack(OpenStackHeat, plugins.RedHatPlugin): ++ """OpenStackHeat related information for Red Hat distributions.""" ++ ++ packages = ( ++ 'openstack-heat-api', ++ 'openstack-heat-api-cfn', ++ 'openstack-heat-api-cloudwatch', ++ 'openstack-heat-cli', ++ 'openstack-heat-common', ++ 'openstack-heat-engine', ++ 'python-heatclient' ++ ) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_horizon.py +@@ -0,0 +1,81 @@ ++# Copyright (C) 2009 Red Hat, Inc., Joey Boggs ++# Copyright (C) 2012 Rackspace US, Inc., ++# Justin Shepherd ++# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackHorizon(Plugin): ++ """openstack horizon related information ++ """ ++ ++ plugin_name = "openstack_horizon" ++ option_list = [("log", "gathers openstack horizon logs", "slow", True)] ++ ++ def setup(self): ++ self.add_copy_spec("/etc/openstack-dashboard/") ++ if self.get_option("log"): ++ self.add_copy_spec("/var/log/horizon/") ++ ++ ++class DebianOpenStackHorizon(OpenStackHorizon, DebianPlugin): ++ """OpenStack Horizon related information for Debian based distributions ++ """ ++ ++ packages = ( ++ 'python-django-horizon', ++ 'openstack-dashboard', ++ 'openstack-dashboard-apache' ++ ) ++ ++ def setup(self): ++ super(DebianOpenStackHorizon, self).setup() ++ self.add_copy_spec("/etc/apache2/sites-available/") ++ ++ ++class UbuntuOpenStackHorizon(OpenStackHorizon, UbuntuPlugin): ++ """OpenStack Horizon related information for Ubuntu based distributions ++ """ ++ ++ packages = ( ++ 'python-django-horizon', ++ 'openstack-dashboard', ++ 'openstack-dashboard-ubuntu-theme' ++ ) ++ ++ def setup(self): ++ super(UbuntuOpenStackHorizon, self).setup() ++ self.add_copy_spec("/etc/apache2/conf.d/openstack-dashboard.conf") ++ ++ ++class RedHatOpenStackHorizon(OpenStackHorizon, RedHatPlugin): ++ """OpenStack Horizon related information for Red Hat distributions ++ """ ++ ++ packages = ( ++ 'python-django-horizon', ++ 'openstack-dashboard' ++ ) ++ ++ def setup(self): ++ super(RedHatOpenStackHorizon, self).setup() ++ self.add_copy_spec("/etc/httpd/conf.d/openstack-dashboard.conf") ++ if self.get_option("log"): ++ self.add_copy_spec("/var/log/httpd/") ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_keystone.py +@@ -0,0 +1,79 @@ ++# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackKeystone(Plugin): ++ """openstack keystone related information ++ """ ++ plugin_name = "openstack_keystone" ++ ++ option_list = [("log", "gathers openstack keystone logs", "slow", True), ++ ("nopw", "dont gathers keystone passwords", "slow", True)] ++ ++ def setup(self): ++ self.add_copy_specs([ ++ "/etc/keystone/default_catalog.templates", ++ "/etc/keystone/keystone.conf", ++ "/etc/keystone/logging.conf", ++ "/etc/keystone/policy.json" ++ ]) ++ ++ if self.get_option("log"): ++ self.add_copy_spec("/var/log/keystone/") ++ ++ def postproc(self): ++ self.do_file_sub('/etc/keystone/keystone.conf', ++ r"(?m)^(admin_password.*=)(.*)", ++ r"\1 ******") ++ self.do_file_sub('/etc/keystone/keystone.conf', ++ r"(?m)^(admin_token.*=)(.*)", ++ r"\1 ******") ++ self.do_file_sub('/etc/keystone/keystone.conf', ++ r"(?m)^(connection.*=.*mysql://)(.*)(:)(.*)(@)(.*)", ++ r"\1\2:******@\6") ++ self.do_file_sub('/etc/keystone/keystone.conf', ++ r"(?m)^(password.*=)(.*)", ++ r"\1 ******") ++ self.do_file_sub('/etc/keystone/keystone.conf', ++ r"(?m)^(ca_password.*=)(.*)", ++ r"\1 ******") ++ ++ ++class DebianOpenStackKeystone(OpenStackKeystone, DebianPlugin, UbuntuPlugin): ++ """OpenStack Keystone related information for Debian based distributions ++ """ ++ ++ packages = ( ++ 'keystone', ++ 'python-keystone', ++ 'python-keystoneclient' ++ ) ++ ++ ++class RedHatOpenStackKeystone(OpenStackKeystone, RedHatPlugin): ++ """OpenStack Keystone related information for Red Hat distributions ++ """ ++ ++ packages = ( ++ 'openstack-keystone', ++ 'python-keystone', ++ 'python-django-openstack-auth', ++ 'python-keystoneclient' ++ ) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_neutron.py +@@ -0,0 +1,175 @@ ++# Copyright (C) 2013 Red Hat, Inc., Brent Eagles ++ ++# 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 not self.get_option("quantum"): ++ 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() ++ ++ 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"] ++ ip_netns_result = self.call_ext_prog("ip netns") ++ if not (ip_netns_result[0] == 0): ++ return ++ nslist = ip_netns_result[1] ++ lease_directories = [] ++ if nslist: ++ for nsname in nslist.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.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_outputs([ ++ cmd_prefix + "iptables-save", ++ cmd_prefix + "ifconfig -a", ++ cmd_prefix + "route -n" ++ ]) ++ # borrowed from networking plugin ++ ip_addr_result = self.call_ext_prog(cmd_prefix + "ip -o link") ++ if ip_addr_result[0] == 0: ++ for eth in self.get_interface_name(ip_addr_result[1]): ++ # 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. ++ self.add_cmd_outputs([ ++ cmd_prefix + "ethtool "+eth, ++ cmd_prefix + "ethtool -i "+eth, ++ cmd_prefix + "ethtool -k "+eth, ++ cmd_prefix + "ethtool -S "+eth ++ ]) ++ ++ # 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 check_enabled(self): ++ return self.is_installed("%s-common" % self.component_name) ++ ++ 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 check_enabled(self): ++ return self.is_installed("openstack-%s" % self.component_name) ++ ++ def setup(self): ++ super(RedHatNeutron, self).setup() ++ self.packages = self.gen_pkg_tuple(self.package_list_template) ++ self.add_copy_spec("/etc/sudoers.d/%s-rootwrap" % self.component_name) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py +new file mode 100644 +index 0000000..a4186af +--- /dev/null ++++ b/sos/plugins/openstack_nova.py +@@ -0,0 +1,152 @@ ++# Copyright (C) 2009 Red Hat, Inc., Joey Boggs ++# Copyright (C) 2012 Rackspace US, Inc., ++# Justin Shepherd ++# Copyright (C) 2013 Red Hat, Inc., Jeremy Agee ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackNova(Plugin): ++ """openstack nova related information ++ """ ++ plugin_name = "openstack_nova" ++ ++ option_list = [("log", "gathers openstack nova logs", "slow", True), ++ ("cmds", "gathers openstack nova commands", "slow", False)] ++ ++ def setup(self): ++ if self.get_option("cmds"): ++ self.add_cmd_output( ++ "nova-manage config list", ++ suggest_filename="nova_config_list") ++ self.add_cmd_output( ++ "nova-manage service list", ++ suggest_filename="nova_service_list") ++ self.add_cmd_output( ++ "nova-manage db version", ++ suggest_filename="nova_db_version") ++ self.add_cmd_output( ++ "nova-manage fixed list", ++ suggest_filename="nova_fixed_ip_list") ++ self.add_cmd_output( ++ "nova-manage floating list", ++ suggest_filename="nova_floating_ip_list") ++ self.add_cmd_output( ++ "nova-manage flavor list", ++ suggest_filename="nova_flavor_list") ++ self.add_cmd_output( ++ "nova-manage network list", ++ suggest_filename="nova_network_list") ++ self.add_cmd_output( ++ "nova-manage vm list", ++ suggest_filename="nova_vm_list") ++ ++ if self.get_option("log"): ++ self.add_copy_spec("/var/log/nova/") ++ ++ self.add_copy_spec("/etc/nova/") ++ ++ def postproc(self): ++ protect_keys = [ ++ "ldap_dns_password", "neutron_admin_password", "rabbit_password", ++ "qpid_password", "powervm_mgr_passwd", "virtual_power_host_pass", ++ "xenapi_connection_password", "password", "host_password", ++ "vnc_password", "connection", "sql_connection", "admin_password" ++ ] ++ ++ regexp = r"((?m)^\s*#*(%s)\s*=\s*)(.*)" % "|".join(protect_keys) ++ ++ for conf_file in ["/etc/nova/nova.conf", "/etc/nova/api-paste.ini"]: ++ self.do_file_sub(conf_file, regexp, r"\1*********") ++ ++ ++class DebianOpenStackNova(OpenStackNova, DebianPlugin, UbuntuPlugin): ++ """OpenStack nova related information for Debian based distributions ++ """ ++ ++ nova = False ++ packages = ( ++ 'nova-api-ec2', ++ 'nova-api-metadata', ++ 'nova-api-os-compute', ++ 'nova-api-os-volume', ++ 'nova-common', ++ 'nova-compute', ++ 'nova-compute-kvm', ++ 'nova-compute-lxc', ++ 'nova-compute-qemu', ++ 'nova-compute-uml', ++ 'nova-compute-xcp', ++ 'nova-compute-xen', ++ 'nova-xcp-plugins', ++ 'nova-consoleauth', ++ 'nova-network', ++ 'nova-scheduler', ++ 'nova-volume', ++ 'novnc', ++ 'python-nova', ++ 'python-novaclient', ++ 'python-novnc' ++ ) ++ ++ def check_enabled(self): ++ self.nova = self.is_installed("nova-common") ++ return self.nova ++ ++ def setup(self): ++ super(DebianOpenStackNova, self).setup() ++ self.add_copy_specs(["/etc/sudoers.d/nova_sudoers"]) ++ ++ ++class RedHatOpenStackNova(OpenStackNova, RedHatPlugin): ++ """OpenStack nova related information for Red Hat distributions ++ """ ++ ++ nova = False ++ packages = ( ++ 'openstack-nova-common', ++ 'openstack-nova-network', ++ 'openstack-nova-conductor', ++ 'openstack-nova-conductor', ++ 'openstack-nova-scheduler', ++ 'openstack-nova-console', ++ 'openstack-nova-novncproxy', ++ 'openstack-nova-compute', ++ 'openstack-nova-api', ++ 'openstack-nova-cert', ++ 'openstack-nova-cells', ++ 'openstack-nova-objectstore', ++ 'python-nova', ++ 'python-novaclient', ++ 'novnc' ++ ) ++ ++ def check_enabled(self): ++ self.nova = self.is_installed("openstack-nova-common") ++ return self.nova ++ ++ def setup(self): ++ super(RedHatOpenStackNova, self).setup() ++ self.add_copy_specs([ ++ "/etc/logrotate.d/openstack-nova", ++ "/etc/polkit-1/localauthority/50-local.d/50-nova.pkla", ++ "/etc/sudoers.d/nova", ++ "/etc/security/limits.d/91-nova.conf", ++ "/etc/sysconfig/openstack-nova-novncproxy" ++ ]) ++ ++# vim: et ts=4 sw=4 +diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py +new file mode 100644 +--- /dev/null ++++ b/sos/plugins/openstack_swift.py +@@ -0,0 +1,62 @@ ++# Copyright (C) 2013 Red Hat, Inc., Flavio Percoco ++# Copyright (C) 2012 Rackspace US, Inc., ++# Justin Shepherd ++# Copyright (C) 2009 Red Hat, Inc., Joey Boggs ++ ++# 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, DebianPlugin, UbuntuPlugin ++ ++ ++class OpenStackSwift(Plugin): ++ """OpenstackSwift related information.""" ++ plugin_name = "openstack_swift" ++ ++ option_list = [("log", "gathers openstack-swift logs", "slow", False)] ++ ++ def setup(self): ++ # Swift ++ self.add_copy_spec("/etc/swift/") ++ ++ ++class DebianOpenStackSwift(OpenStackSwift, DebianPlugin, UbuntuPlugin): ++ """OpenStackSwift related information for Debian based distributions.""" ++ ++ packages = ( ++ 'swift', ++ 'swift-account', ++ 'swift-container', ++ 'swift-object', ++ 'swift-proxy', ++ 'swauth', ++ 'python-swift', ++ 'python-swauth' ++ ) ++ ++ ++class RedHatOpenStackSwift(OpenStackSwift, RedHatPlugin): ++ """OpenStackSwift related information for Red Hat distributions.""" ++ ++ packages = ( ++ 'openstack-swift', ++ 'openstack-swift-account', ++ 'openstack-swift-container', ++ 'openstack-swift-object', ++ 'openstack-swift-proxy', ++ 'swift', ++ 'python-swiftclient' ++ ) ++ ++# vim: et ts=4 sw=4 +-- +1.9.3 + diff --git a/SOURCES/sos-bz1148784-plugin-backport-add_cmd_outputs.patch b/SOURCES/sos-bz1148784-plugin-backport-add_cmd_outputs.patch new file mode 100644 index 0000000..071aaf9 --- /dev/null +++ b/SOURCES/sos-bz1148784-plugin-backport-add_cmd_outputs.patch @@ -0,0 +1,44 @@ +From 4fc8b401992402f9cb45e68db883c90875107572 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Thu, 11 Sep 2014 12:52:16 +0100 +Subject: [PATCH] [plugin] backport add_cmd_outputs + + commit 40646007c03f9088f0d6136b50a83077b1b8934c + Author: Bryn M. Reeves + Date: Sun Apr 6 20:13:59 2014 +0100 + + Add add_cmd_outputs() and convert plugins to use it + + Add a new method to Plugin to add a list of commands to be run, + analogous to add_copy_specs() vs add_copy_spec(). + + Also convert a few plugins not using add_copy_specs() for long + file lists (or using it inconsistently). + + Signed-off-by: Bryn M. Reeves + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/__init__.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py +index 2bf8d98..f50df79 100644 +--- a/sos/plugins/__init__.py ++++ b/sos/plugins/__init__.py +@@ -504,6 +504,12 @@ class Plugin(object): + (status, output, runtime) = self.call_ext_prog(prog) + return (status == 0) + ++ def add_cmd_outputs(self, cmds, timeout=300): ++ """Run a list of programs and collect the output""" ++ if isinstance(cmds, basestring): ++ raise TypeError("Plugin.add_cmd_outputs called with string argument") ++ for cmd in cmds: ++ self.add_cmd_output(cmd, timeout=timeout) + + def add_cmd_output(self, exe, suggest_filename=None, root_symlink=None, timeout=300): + """Run a program and collect the output""" +-- +1.9.3 + diff --git a/SOURCES/sos-bz1159835-obtain-postgres-password-from-environment.patch b/SOURCES/sos-bz1159835-obtain-postgres-password-from-environment.patch new file mode 100644 index 0000000..8b19053 --- /dev/null +++ b/SOURCES/sos-bz1159835-obtain-postgres-password-from-environment.patch @@ -0,0 +1,46 @@ +diff -up sos-3.0/sos/plugins/postgresql.py.orig sos-3.0/sos/plugins/postgresql.py +--- sos-3.0/sos/plugins/postgresql.py.orig 2014-11-11 17:22:24.973592961 +0000 ++++ sos-3.0/sos/plugins/postgresql.py 2014-11-11 17:29:02.374434446 +0000 +@@ -13,23 +13,27 @@ class PostgreSQL(Plugin): + + tmp_dir = None + ++ password_warn_text = " (password visible in process listings)" ++ + option_list = [ + ("pghome", 'PostgreSQL server home directory.', '', '/var/lib/pgsql'), + ("username", 'username for pg_dump', '', 'postgres'), +- ("password", 'password for pg_dump', '', ''), +- ("dbname", 'database name to dump for pg_dump', '', ''), ++ ('password', 'password for pg_dump' + password_warn_text, '', ''), ++ ("dbname", 'database name to dump for pg_dump', '', '') + ] + + def pg_dump(self): + dest_file = os.path.join(self.tmp_dir, "sos_pgdump.tar") +- old_env_pgpassword = os.environ.get("PGPASSWORD") +- os.environ["PGPASSWORD"] = self.get_option("password") ++ # We're only modifying this for ourself and our children so there ++ # is no need to save and restore environment variables if the user ++ # decided to pass the password on the command line. ++ if self.get_option("password") is not None: ++ os.environ["PGPASSWORD"] = self.get_option("password") ++ + (status, output, rtime) = self.call_ext_prog("pg_dump %s -U %s -w -f %s -F t" % + (self.get_option("dbname"), + self.get_option("username"), + dest_file)) +- if old_env_pgpassword is not None: +- os.environ["PGPASSWORD"] = old_env_pgpassword + if (status == 0): + self.add_copy_spec(dest_file) + else: +@@ -37,7 +41,7 @@ class PostgreSQL(Plugin): + + def setup(self): + if self.get_option("dbname"): +- if self.get_option("password"): ++ if self.get_option("password") or "PGPASSWORD" in os.environ: + self.tmp_dir = tempfile.mkdtemp() + self.pg_dump() + else: diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch deleted file mode 100644 index 12e8f1a..0000000 --- a/SOURCES/sos-centos-branding.patch +++ /dev/null @@ -1,1462 +0,0 @@ -diff -uNrp sos-3.0.orig/po/af.po sos-3.0/po/af.po ---- sos-3.0.orig/po/af.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/af.po 2014-06-21 11:15:36.435724571 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/am.po sos-3.0/po/am.po ---- sos-3.0.orig/po/am.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/am.po 2014-06-21 11:15:36.436724563 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/ar.po sos-3.0/po/ar.po ---- sos-3.0.orig/po/ar.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ar.po 2014-06-21 11:16:38.081245080 -0500 -@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL." - msgstr "لا يمكن الرفع للعنوان المحدّد" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "صودفت مشكلة برفع تقريرك إلى دعم Red Hat. " -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "صودفت مشكلة برفع تقريرك إلى دعم CentOS. " - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/as.po sos-3.0/po/as.po ---- sos-3.0.orig/po/as.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/as.po 2014-06-21 11:15:36.437724555 -0500 -@@ -85,11 +85,11 @@ msgid "" - "No changes will be made to your system.\n" - "\n" - msgstr "" --"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু Red Hat Enterprise Linux\n" -+"এই সামগ্ৰীৰ সহায়ত যান্ত্ৰিক সামগ্ৰী আৰু CentOS Enterprise Linux\n" - "প্ৰণালীৰ প্ৰতিষ্ঠা সম্পৰ্কে বিশদ তথ্য সংগ্ৰহ কৰা হ'ব ।\n" - "তথ্য সংগ্ৰহৰ পিছত /tmp পঞ্জিকাৰ অধীন এটা আৰ্কাইভ নিৰ্মিত হয় ।\n" - "এই আৰ্কাইভ আপুনি সহায়তা প্ৰতিনিধিৰ কাশত পঠায় দিব পাৰে ।\n" --"Red Hat দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n" -+"CentOS দ্বাৰা এই তথ্য অকল সমস্যাৰ কাৰণ নিৰ্ণয় কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব\n" - "আৰু ইয়াৰ গোপনীয়তা বজায় ৰাখা হ'ব ।\n" - "\n" - "এই কাম সম্পন্ন হ'বলৈ কিছু সময় ব্যয় হ'ব পাৰে ।\n" -@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL." - msgstr "উল্লিখিত URL-এ আপলোড কৰিবলৈ ব্যৰ্থ ।" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "আপোনাৰ ৰিপোৰ্টটি Red Hat সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "আপোনাৰ ৰিপোৰ্টটি CentOS সহায়তা ব্যৱস্থাত আপলোড কৰিবলৈ সমস্যা ।" - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" - msgstr "" --"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে Red Hat-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড " -+"আপোনাৰ প্ৰদত্ত ৰিপোৰ্ট সফলতাৰে সৈতে CentOS-ৰ ftp সেৱকত নিম্নলিখিত নামত আপলোড " - "কৰা হৈছে:" - - #: ../sos/policyredhat.py:404 -diff -uNrp sos-3.0.orig/po/ast.po sos-3.0/po/ast.po ---- sos-3.0.orig/po/ast.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ast.po 2014-06-21 11:17:08.318010034 -0500 -@@ -86,10 +86,10 @@ msgid "" - "\n" - msgstr "" - "Esta utilidá recueyerá dalguna información detallada sobro'l\n" --"hardware y la configuración del to sistema Red Hat Enterprise Linux.\n" -+"hardware y la configuración del to sistema CentOS Enterprise Linux.\n" - "La información recuéyese y críase un ficheru baxo /tmp.\n" - "Ésti puede mandase al to representante de sofitu.\n" --"Red Hat usará esta información pa diagnosticar el sistema\n" -+"CentOS usará esta información pa diagnosticar el sistema\n" - "únicamente y considerará esta información como confidencial.\n" - "\n" - "Esti procesu va llevar un tiempu pa completase.\n" -@@ -184,14 +184,14 @@ msgid "Cannot upload to specified URL." - msgstr "Nun se puede cargar a la URL especificada." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Hebo un problema al cargar el to informe al equipu d'asistencia de Red Hat" -+"Hebo un problema al cargar el to informe al equipu d'asistencia de CentOS" - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" --msgstr "El to informe cargóse bien a los sirvidores ftp e Red Hat col nome:" -+msgstr "El to informe cargóse bien a los sirvidores ftp e CentOS col nome:" - - #: ../sos/policyredhat.py:404 - msgid "Please communicate this name to your support representative." -diff -uNrp sos-3.0.orig/po/be.po sos-3.0/po/be.po ---- sos-3.0.orig/po/be.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/be.po 2014-06-21 11:15:36.438724547 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/bg.po sos-3.0/po/bg.po ---- sos-3.0.orig/po/bg.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/bg.po 2014-06-21 11:15:36.439724539 -0500 -@@ -172,9 +172,9 @@ msgid "Cannot upload to specified URL." - msgstr "Не може да се качи на посочения URL" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Възникна проблем при качването на вашия отчет на проддръжката на Red Hat." -+"Възникна проблем при качването на вашия отчет на проддръжката на CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/bn_IN.po sos-3.0/po/bn_IN.po ---- sos-3.0.orig/po/bn_IN.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/bn_IN.po 2014-06-21 11:15:36.440724532 -0500 -@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL." - msgstr "উল্লিখিত URL-এ আপলোড করতে ব্যর্থ।" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "আপনার রিপোর্টটি Red Hat সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "আপনার রিপোর্টটি CentOS সহায়তা ব্যবস্থায় আপলোড করতে সমস্যা।" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/bn.po sos-3.0/po/bn.po ---- sos-3.0.orig/po/bn.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/bn.po 2014-06-21 11:15:36.440724532 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/bs.po sos-3.0/po/bs.po ---- sos-3.0.orig/po/bs.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/bs.po 2014-06-21 11:15:36.441724524 -0500 -@@ -189,8 +189,8 @@ msgid "Cannot upload to specified URL." - msgstr "Nije se mogao postaviti specificirani URL," - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Bilo je problema u postavljanju vaseg izvjestaja na Red Hat podrsku. " -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Bilo je problema u postavljanju vaseg izvjestaja na CentOS podrsku. " - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ca.po sos-3.0/po/ca.po ---- sos-3.0.orig/po/ca.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ca.po 2014-06-21 11:15:36.442724516 -0500 -@@ -194,8 +194,8 @@ msgid "Cannot upload to specified URL." - msgstr "No es pot pujar a la URL especificada." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Hi ha hagut un problema en pujar l'informe al manteniment de CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/cs.po sos-3.0/po/cs.po ---- sos-3.0.orig/po/cs.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/cs.po 2014-06-21 11:15:36.443724508 -0500 -@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL." - msgstr "Nelze uložit na uvedené URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Při odesílání zprávy do firmy Red Hat vznikla chyba." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Při odesílání zprávy do firmy CentOS vznikla chyba." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/cy.po sos-3.0/po/cy.po ---- sos-3.0.orig/po/cy.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/cy.po 2014-06-21 11:15:36.443724508 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/da.po sos-3.0/po/da.po ---- sos-3.0.orig/po/da.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/da.po 2014-06-21 11:15:36.444724501 -0500 -@@ -184,9 +184,9 @@ msgid "Cannot upload to specified URL." - msgstr "Kan ikke overføre til den angivne URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Der opstod et problem under overførsel af din rapport til Red Hat-support." -+"Der opstod et problem under overførsel af din rapport til CentOS-support." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/de_CH.po sos-3.0/po/de_CH.po ---- sos-3.0.orig/po/de_CH.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/de_CH.po 2014-06-21 11:15:36.444724501 -0500 -@@ -87,10 +87,10 @@ msgid "" - "\n" - msgstr "" - "Dieses Dienstprogramm sammelt einige detaillierte Informationen\n" --"zur Hardware und Einrichtung Ihres Red Hat Enterprise Linux Systems.\n" -+"zur Hardware und Einrichtung Ihres CentOS Enterprise Linux Systems.\n" - "Die Informationen werden gesammelt und in einem Archiv unter /tmp\n" - "zusammengefasst, welches Sie an einen Support-Vertreter schicken\n" --"können. Red Hat verwendet diese Informationen AUSSCHLIESSLICH zu\n" -+"können. CentOS verwendet diese Informationen AUSSCHLIESSLICH zu\n" - "Diagnosezwecken und behandelt sie als vertrauliche Informationen.\n" - "\n" - "Die Fertigstellung dieses Prozesses kann eine Weile dauern.\n" -@@ -188,14 +188,14 @@ msgid "Cannot upload to specified URL." - msgstr "Hochladen zu speziellem URL scheiterte." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf." - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" - msgstr "" --"Ihr Bericht wurde erfolgreich auf den Red Hat FTP-Server hochgeladen, mit " -+"Ihr Bericht wurde erfolgreich auf den CentOS FTP-Server hochgeladen, mit " - "dem Namen:" - - #: ../sos/policyredhat.py:404 -diff -uNrp sos-3.0.orig/po/de.po sos-3.0/po/de.po ---- sos-3.0.orig/po/de.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/de.po 2014-06-21 11:15:36.445724493 -0500 -@@ -191,8 +191,8 @@ msgid "Cannot upload to specified URL." - msgstr "Hochladen zu spezieller URL scheiterte." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Beim Hochladen Ihres Berichts zum Red Hat Support trat ein Fehler auf." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Beim Hochladen Ihres Berichts zum CentOS Support trat ein Fehler auf." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/el.po sos-3.0/po/el.po ---- sos-3.0.orig/po/el.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/el.po 2014-06-21 11:15:36.445724493 -0500 -@@ -84,10 +84,10 @@ msgid "" - "\n" - msgstr "" - "Αυτό το εργαλείο θα συγκετρώσει ορισμένες πληροφορίες για τον υπολογιστή σας " --"και την εγκατάσταση του Red Hat Enterprise Linux συστήματος.\n" -+"και την εγκατάσταση του CentOS Enterprise Linux συστήματος.\n" - "Οι πληροφορίες συγκετρώνονται και το archive δημιουργήται στο\n" - "/tmp,το οποίο και μπορείτε να στείλετε σε έναν αντιπρόσωπο υποστήριξης.\n" --"Η Red Hat θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n" -+"Η CentOS θα χρησιμοποιήσει αυτα τα δεδομένα ΜΟΝΟ για διαγνωστικούς σκοπούς\n" - "και θα παραμείνουν εμπιστευτηκά.\n" - "\n" - -@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL." - msgstr "Δεν είναι δυνατό το upload στο καθορισμένο URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Υπήρξε ένα πρόβλημα κατα το upload της αναφοράς σας στην CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/en_GB.po sos-3.0/po/en_GB.po ---- sos-3.0.orig/po/en_GB.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/en_GB.po 2014-06-21 11:15:36.446724485 -0500 -@@ -83,10 +83,10 @@ msgid "" - "\n" - msgstr "" - "This utility will collect some detailed information about the\n" --"hardware and setup of your Red Hat Enterprise Linux system.\n" -+"hardware and setup of your CentOS Enterprise Linux system.\n" - "The information is collected and an archive is packaged under\n" - "/tmp, which you can send to a support representative.\n" --"Red Hat will use this information for diagnostic purposes ONLY\n" -+"CentOS will use this information for diagnostic purposes ONLY\n" - "and it will be considered confidential information.\n" - "\n" - "This process may take a while to complete.\n" -@@ -181,14 +181,14 @@ msgid "Cannot upload to specified URL." - msgstr "Cannot upload to specified URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "There was a problem uploading your report to CentOS support." - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" - msgstr "" --"Your report was successfully uploaded to Red Hat's ftp server with name:" -+"Your report was successfully uploaded to CentOS's ftp server with name:" - - #: ../sos/policyredhat.py:404 - msgid "Please communicate this name to your support representative." -diff -uNrp sos-3.0.orig/po/en.po sos-3.0/po/en.po ---- sos-3.0.orig/po/en.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/en.po 2014-06-21 11:15:36.446724485 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/es.po sos-3.0/po/es.po ---- sos-3.0.orig/po/es.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/es.po 2014-06-21 11:17:24.153886936 -0500 -@@ -189,9 +189,9 @@ msgid "Cannot upload to specified URL." - msgstr "No se puede cargar a la URL especificada." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Hubo un problema al cargar su reporte al equipo de asistencia de Red Hat" -+"Hubo un problema al cargar su reporte al equipo de asistencia de CentOS" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/et.po sos-3.0/po/et.po ---- sos-3.0.orig/po/et.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/et.po 2014-06-21 11:15:36.447724477 -0500 -@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/eu_ES.po sos-3.0/po/eu_ES.po ---- sos-3.0.orig/po/eu_ES.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/eu_ES.po 2014-06-21 11:15:36.448724469 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/fa.po sos-3.0/po/fa.po ---- sos-3.0.orig/po/fa.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/fa.po 2014-06-21 11:15:36.448724469 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/fi.po sos-3.0/po/fi.po ---- sos-3.0.orig/po/fi.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/fi.po 2014-06-21 11:17:38.280777198 -0500 -@@ -179,8 +179,8 @@ msgid "Cannot upload to specified URL." - msgstr "Annettuun osoitteeseen ei voida lähettää." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Raportin lähettämisessä Red Hatin käyttötukeen oli ongelmia." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Raportin lähettämisessä CentOSin käyttötukeen oli ongelmia." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/fr.po sos-3.0/po/fr.po ---- sos-3.0.orig/po/fr.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/fr.po 2014-06-21 11:15:36.449724462 -0500 -@@ -188,10 +188,10 @@ msgid "Cannot upload to specified URL." - msgstr "Impossible de le télécharger vers l'URL spécifié." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - "Une erreur s'est produite lors du téléchargement de votre rapport vers le " --"support Red Hat." -+"support CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/gl.po sos-3.0/po/gl.po ---- sos-3.0.orig/po/gl.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/gl.po 2014-06-21 11:15:36.450724454 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/gu.po sos-3.0/po/gu.po ---- sos-3.0.orig/po/gu.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/gu.po 2014-06-21 11:15:36.450724454 -0500 -@@ -186,8 +186,8 @@ msgid "Cannot upload to specified URL." - msgstr "સ્પષ્ટ કરેલ URL અપલોડ કરી શકતા નથી." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "તમારા અહેવાલને Red Hat આધારમાં અપલોડ કરવામાં સમસ્યા હતી." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "તમારા અહેવાલને CentOS આધારમાં અપલોડ કરવામાં સમસ્યા હતી." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/he.po sos-3.0/po/he.po ---- sos-3.0.orig/po/he.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/he.po 2014-06-21 11:15:36.450724454 -0500 -@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/hi.po sos-3.0/po/hi.po ---- sos-3.0.orig/po/hi.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/hi.po 2014-06-21 11:15:36.451724446 -0500 -@@ -187,8 +187,8 @@ msgid "Cannot upload to specified URL." - msgstr "निर्दिष्ट URL अपलोड नहीं कर सकता है." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "आपके रिपोर्ट को Red Hat समर्थन में अपलोड करने में समस्या थी." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "आपके रिपोर्ट को CentOS समर्थन में अपलोड करने में समस्या थी." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/hr.po sos-3.0/po/hr.po ---- sos-3.0.orig/po/hr.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/hr.po 2014-06-21 11:15:36.451724446 -0500 -@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/hu.po sos-3.0/po/hu.po ---- sos-3.0.orig/po/hu.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/hu.po 2014-06-21 11:15:36.452724438 -0500 -@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL." - msgstr "Nem lehet az URL-re feltölteni." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "A jelentést a Red Hat támogatáshoz feltöltvén baj történt." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "A jelentést a CentOS támogatáshoz feltöltvén baj történt." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/hy.po sos-3.0/po/hy.po ---- sos-3.0.orig/po/hy.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/hy.po 2014-06-21 11:15:36.452724438 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/id.po sos-3.0/po/id.po ---- sos-3.0.orig/po/id.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/id.po 2014-06-21 11:15:36.453724430 -0500 -@@ -171,7 +171,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/ilo.po sos-3.0/po/ilo.po ---- sos-3.0.orig/po/ilo.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ilo.po 2014-06-21 11:15:36.453724430 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/is.po sos-3.0/po/is.po ---- sos-3.0.orig/po/is.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/is.po 2014-06-21 11:15:36.453724430 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/it.po sos-3.0/po/it.po ---- sos-3.0.orig/po/it.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/it.po 2014-06-21 11:15:36.454724423 -0500 -@@ -181,7 +181,7 @@ msgid "Cannot upload to specified URL." - msgstr "Impossibile inviare all'URL specificato." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - "Si è verificato un problema nell'inviare il report al supporto tecnico Red " - "Hat." -diff -uNrp sos-3.0.orig/po/ja.po sos-3.0/po/ja.po ---- sos-3.0.orig/po/ja.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ja.po 2014-06-21 11:15:36.454724423 -0500 -@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL." - msgstr "指定された URL にアップロードできません。" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "レポートを Red Hat サポートにアップロードするのに問題がありました。" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "レポートを CentOS サポートにアップロードするのに問題がありました。" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ka.po sos-3.0/po/ka.po ---- sos-3.0.orig/po/ka.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ka.po 2014-06-21 11:15:36.455724415 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/kn.po sos-3.0/po/kn.po ---- sos-3.0.orig/po/kn.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/kn.po 2014-06-21 11:15:36.455724415 -0500 -@@ -185,9 +185,9 @@ msgid "Cannot upload to specified URL." - msgstr "ಸೂಚಿಸಲಾದ URL ಅನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"ನಿಮ್ಮ ವರದಿಯನ್ನು Red Hat ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ." -+"ನಿಮ್ಮ ವರದಿಯನ್ನು CentOS ಬೆಂಬಲದ ಸ್ಥಳಕ್ಕೆ ಅಪ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ko.po sos-3.0/po/ko.po ---- sos-3.0.orig/po/ko.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ko.po 2014-06-21 11:17:58.331621414 -0500 -@@ -84,10 +84,10 @@ msgid "" - "No changes will be made to your system.\n" - "\n" - msgstr "" --"이 유틸리티는 Red Hat Enterprise Linux 시스템의 하드웨어와 \n" -+"이 유틸리티는 CentOS Enterprise Linux 시스템의 하드웨어와 \n" - "시스템 설정 사항에 대한 상세 정보를 수집하게 됩니다. 수집된 \n" - "정보는 지원 담당자에게 보낼 수 있도록 /tmp 디렉토리 안에 \n" --"아카이브로 저장됩니다. Red Hat은 이 정보를 문제 해결 목적으로만 사용하며 기" -+"아카이브로 저장됩니다. CentOS은 이 정보를 문제 해결 목적으로만 사용하며 기" - "밀 정보로 \n" - "취급할 것입니다. \n" - "\n" -@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL." - msgstr "지정된 URL에서 업로드할 수 없습니다." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "리포트를 Red Hat 지원 센터로 업로드하는 데 문제가 발생했습니다." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "리포트를 CentOS 지원 센터로 업로드하는 데 문제가 발생했습니다." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ku.po sos-3.0/po/ku.po ---- sos-3.0.orig/po/ku.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ku.po 2014-06-21 11:15:36.456724407 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/lo.po sos-3.0/po/lo.po ---- sos-3.0.orig/po/lo.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/lo.po 2014-06-21 11:15:36.457724399 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/lt.po sos-3.0/po/lt.po ---- sos-3.0.orig/po/lt.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/lt.po 2014-06-21 11:15:36.457724399 -0500 -@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/lv.po sos-3.0/po/lv.po ---- sos-3.0.orig/po/lv.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/lv.po 2014-06-21 11:15:36.458724392 -0500 -@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/mk.po sos-3.0/po/mk.po ---- sos-3.0.orig/po/mk.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/mk.po 2014-06-21 11:15:36.459724384 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/ml.po sos-3.0/po/ml.po ---- sos-3.0.orig/po/ml.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ml.po 2014-06-21 11:15:36.459724384 -0500 -@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL." - msgstr "നല്‍കിയിരിക്കുന്ന URL-ലേക്ക് ഫയല്‍ അപ്ലോഡ് ചെയ്യുവാന്‍ സാധ്യമായില്ല " - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Red Hat-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് അയയ്ക്കുന്നതില്‍ ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "CentOS-ലേക്ക് നിങ്ങളുടെ റിപ്പോറ്‍ട്ട് അയയ്ക്കുന്നതില്‍ ഏതോ പ്റശ്നം ഉണ്ടായിരിക്കുന്നു." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/mr.po sos-3.0/po/mr.po ---- sos-3.0.orig/po/mr.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/mr.po 2014-06-21 11:15:36.460724376 -0500 -@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL." - msgstr "निर्देशीत URL अपलोड करण्यास अशक्य." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "तुमचा अहवाल Red Hat सपोर्टकडे पाठवतेवेळी अडचण आढळली." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "तुमचा अहवाल CentOS सपोर्टकडे पाठवतेवेळी अडचण आढळली." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ms.po sos-3.0/po/ms.po ---- sos-3.0.orig/po/ms.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ms.po 2014-06-21 11:15:36.461724368 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/my.po sos-3.0/po/my.po ---- sos-3.0.orig/po/my.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/my.po 2014-06-21 11:15:36.461724368 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/nb.po sos-3.0/po/nb.po ---- sos-3.0.orig/po/nb.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/nb.po 2014-06-21 11:15:36.462724360 -0500 -@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL." - msgstr "Kan ikke laste opp til oppgitt URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/nds.po sos-3.0/po/nds.po ---- sos-3.0.orig/po/nds.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/nds.po 2014-06-21 11:15:36.462724360 -0500 -@@ -165,7 +165,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/nl.po sos-3.0/po/nl.po ---- sos-3.0.orig/po/nl.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/nl.po 2014-06-21 11:15:36.462724360 -0500 -@@ -183,9 +183,9 @@ msgid "Cannot upload to specified URL." - msgstr "Kan niet naar de opgegeven URL uploaden." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Er trad een probleem op bij het uploaden van jouw rapport naar Red Hat " -+"Er trad een probleem op bij het uploaden van jouw rapport naar CentOS " - "support." - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/nn.po sos-3.0/po/nn.po ---- sos-3.0.orig/po/nn.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/nn.po 2014-06-21 11:15:36.462724360 -0500 -@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/nso.po sos-3.0/po/nso.po ---- sos-3.0.orig/po/nso.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/nso.po 2014-06-21 11:15:36.463724353 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/or.po sos-3.0/po/or.po ---- sos-3.0.orig/po/or.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/or.po 2014-06-21 11:15:36.463724353 -0500 -@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL." - msgstr "ଉଲ୍ଲିଖିତ URL କୁ ଧାରଣ କରିପାରିବେ ନାହିଁ।" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Red Hat ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "CentOS ସହାୟତାରେ ଆପଣଙ୍କର ବିବରଣୀକୁ ଧାରଣ କରିବାରେ ସମସ୍ୟା ଦୋଇଥିଲା।" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/pa.po sos-3.0/po/pa.po ---- sos-3.0.orig/po/pa.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/pa.po 2014-06-21 11:15:36.463724353 -0500 -@@ -184,8 +184,8 @@ msgid "Cannot upload to specified URL." - msgstr "ਦਿੱਤੇ URL ਤੇ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ।" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ Red Hat ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "ਤੁਹਾਡੀ ਰਿਪੋਰਟ ਨੂੰ CentOS ਸਹਿਯੋਗ ਤੇ ਅੱਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਆਈ ਹੈ।" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/pl.po sos-3.0/po/pl.po ---- sos-3.0.orig/po/pl.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/pl.po 2014-06-21 11:15:36.463724353 -0500 -@@ -179,10 +179,10 @@ msgid "Cannot upload to specified URL." - msgstr "Nie można wysłać na podany adres URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - "Wystąpił problem podczas wysyłania raportu do wsparcia technicznego firmy " --"Red Hat." -+"CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/pt_BR.po sos-3.0/po/pt_BR.po ---- sos-3.0.orig/po/pt_BR.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/pt_BR.po 2014-06-21 11:15:36.463724353 -0500 -@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL." - msgstr "Não foi possível enviar para a URL especificada." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Houve um problema ao enviar o seu relatório para o suporte da Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Houve um problema ao enviar o seu relatório para o suporte da CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/pt.po sos-3.0/po/pt.po ---- sos-3.0.orig/po/pt.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/pt.po 2014-06-21 11:15:36.463724353 -0500 -@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL." - msgstr "Não foi possível submeter para o URL especificado." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Ocorreu um erro ao submeter o seu relatório para o suporte CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ro.po sos-3.0/po/ro.po ---- sos-3.0.orig/po/ro.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ro.po 2014-06-21 11:15:36.464724345 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/ru.po sos-3.0/po/ru.po ---- sos-3.0.orig/po/ru.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ru.po 2014-06-21 11:15:36.464724345 -0500 -@@ -186,9 +186,9 @@ msgid "Cannot upload to specified URL." - msgstr "Не удалось отправить файл." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" --"Произошла ошибка при попытке отправить отчёт в службу поддержки Red Hat." -+"Произошла ошибка при попытке отправить отчёт в службу поддержки CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/si.po sos-3.0/po/si.po ---- sos-3.0.orig/po/si.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/si.po 2014-06-21 11:15:36.464724345 -0500 -@@ -85,11 +85,11 @@ msgid "" - "No changes will be made to your system.\n" - "\n" - msgstr "" --"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ Red Hat " -+"මෙම උපයෝගි තාවය දෘඩාංග පිළිබදව සවිස්තරාත්මක තොරතුරු රැස්කරණ අතර ඔබගේ CentOS " - "Enterprise Linux පද්ධතිය පිහිටවනු ලැබේ.\n" - "රැස් කළ තොරතුරු සහ සංරක්‍ෂකය /tmp යටතේ ඇසුරුම් ගත කර ඇති අතර ඔබට එය සහායක නියෝජිත වෙත " - "යැවිය හැක.\n" --"Red Hat මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු " -+"CentOS මෙම තොරතුරු භාවිතා කරන්නේ දෝෂ විනිශ්චය පමණක් වන අතර එම තොරතුරු රහසිගත තොරතුරු " - "ලෙස සළකණු ලබයි.\n" - "\n" - "මෙම ක්‍රියාව නිම වීමට වේලාවක් ගතවනු ඇත.\n" -@@ -184,13 +184,13 @@ msgid "Cannot upload to specified URL." - msgstr "දක්වන ලඳ URL වෙත ලබා දිය නොහැක." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "ඔබගේ වාර්තාව Red Hat සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "ඔබගේ වාර්තාව CentOS සහය වෙතට ලබා දිමේදි දෝෂයල් ඇති විය." - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" --msgstr "ඔබගේ වාර්තාව සාර්තකව Red Hat's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:" -+msgstr "ඔබගේ වාර්තාව සාර්තකව CentOS's ftp සේවාදායකයට ලබාදුන් අතර නම වූයේ:" - - #: ../sos/policyredhat.py:404 - msgid "Please communicate this name to your support representative." -diff -uNrp sos-3.0.orig/po/sk.po sos-3.0/po/sk.po ---- sos-3.0.orig/po/sk.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sk.po 2014-06-21 11:15:36.464724345 -0500 -@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL." - msgstr "Nie je možné odoslať na zadanú adresu URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Nastal problém pri odosielaní vašej správy na podporu Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Nastal problém pri odosielaní vašej správy na podporu CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/sl.po sos-3.0/po/sl.po ---- sos-3.0.orig/po/sl.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sl.po 2014-06-21 11:15:36.464724345 -0500 -@@ -170,7 +170,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/sos.pot sos-3.0/po/sos.pot ---- sos-3.0.orig/po/sos.pot 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sos.pot 2014-06-21 11:15:36.464724345 -0500 -@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/sq.po sos-3.0/po/sq.po ---- sos-3.0.orig/po/sq.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sq.po 2014-06-21 11:15:36.464724345 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/sr@latin.po sos-3.0/po/sr@latin.po ---- sos-3.0.orig/po/sr@latin.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sr@latin.po 2014-06-21 11:15:36.465724337 -0500 -@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL." - msgstr "Ne mogu da pošaljem na navedeni URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Pojavio se problem pri slanju vašeg izveštaja Red Hat podršci." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Pojavio se problem pri slanju vašeg izveštaja CentOS podršci." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/sr.po sos-3.0/po/sr.po ---- sos-3.0.orig/po/sr.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sr.po 2014-06-21 11:15:36.465724337 -0500 -@@ -182,8 +182,8 @@ msgid "Cannot upload to specified URL." - msgstr "Не могу да пошаљем на наведени УРЛ." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Појавио се проблем при слању вашег извештаја Red Hat подршци." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Појавио се проблем при слању вашег извештаја CentOS подршци." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/sv.po sos-3.0/po/sv.po ---- sos-3.0.orig/po/sv.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/sv.po 2014-06-21 11:15:36.465724337 -0500 -@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL." - msgstr "Kan inte skicka till angiven URL." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Ett problem uppstod när din rapport skickades till Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Ett problem uppstod när din rapport skickades till CentOS support." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ta.po sos-3.0/po/ta.po ---- sos-3.0.orig/po/ta.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ta.po 2014-06-21 11:15:36.465724337 -0500 -@@ -188,8 +188,8 @@ msgid "Cannot upload to specified URL." - msgstr "குறிப்பிட்ட இணைய முகவரியில் ஏற்ற முடியவில்லை." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "உங்கள் அறிக்கையை Red Hat சேவைக்கு அனுப்புவதில் சிக்கல்." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "உங்கள் அறிக்கையை CentOS சேவைக்கு அனுப்புவதில் சிக்கல்." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/te.po sos-3.0/po/te.po ---- sos-3.0.orig/po/te.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/te.po 2014-06-21 11:15:36.465724337 -0500 -@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL." - msgstr "తెలుపబడిన URLకు అప్‌లోడ్ చేయలేదు." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "మీ సమస్యను Red Hat మద్దతునకు అప్‌లోడు చేయుటలో వొక సమస్యవుంది." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "మీ సమస్యను CentOS మద్దతునకు అప్‌లోడు చేయుటలో వొక సమస్యవుంది." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/th.po sos-3.0/po/th.po ---- sos-3.0.orig/po/th.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/th.po 2014-06-21 11:18:12.876508348 -0500 -@@ -84,9 +84,9 @@ msgid "" - "\n" - msgstr "" - "เครื่องมือนี้จะเก็บข้อมูลโดยละเอียดเกี่ยวกับฮาร์ดแวร์และการตั้งค่า\n" --"ระบบ Red Hat Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n" -+"ระบบ CentOS Enterprise Linux ของคุณ ข้อมูลจะถูกเก็บและ\n" - "สร้างเป็นไฟล์ที่ /tmp ซึ่งคุณสามารถส่งไปยังผู้สนับสนุนได้\n" --"Red Hat จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n" -+"CentOS จะใช้ข้อมูลนี้ในการแก้ไขปัญหาเท่านั้น และจะถือว่าเป็น\n" - "ความลับ\n" - "\n" - "กระบวนการนี้อาจจะใช้เวลาสักครู่ในการทำงาน จะไม่มีการแก้ไข\n" -@@ -180,13 +180,13 @@ msgid "Cannot upload to specified URL." - msgstr "ไม่สามารถอัพโหลดไปยัง URL ที่ระบุ" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน Red Hat" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "มีปัญหาในการอัพโหลดรายงานของคุณไปยังฝ่ายสนับสนุน CentOS" - - #: ../sos/policyredhat.py:401 - #, fuzzy, python-format - msgid "Your report was successfully uploaded to %s with name:" --msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ Red Hat ในชื่อ:" -+msgstr "รายงานของคุณได้ถูกส่งไปยังเซิร์ฟเวอร์ ftp ของ CentOS ในชื่อ:" - - #: ../sos/policyredhat.py:404 - msgid "Please communicate this name to your support representative." -diff -uNrp sos-3.0.orig/po/tr.po sos-3.0/po/tr.po ---- sos-3.0.orig/po/tr.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/tr.po 2014-06-21 11:15:36.466724329 -0500 -@@ -185,8 +185,8 @@ msgid "Cannot upload to specified URL." - msgstr "Belirtilen URL 'ye yükleme yapılamadı." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Raporunuz Red Hat desteğe yüklenirken bir sorunla karşılaşıldı." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Raporunuz CentOS desteğe yüklenirken bir sorunla karşılaşıldı." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/uk.po sos-3.0/po/uk.po ---- sos-3.0.orig/po/uk.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/uk.po 2014-06-21 11:15:36.466724329 -0500 -@@ -183,8 +183,8 @@ msgid "Cannot upload to specified URL." - msgstr "Не вдається надіслати файл." - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки Red Hat." -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "Виникла помилка при спробі надіслати звіт до служби підтримки CentOS." - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/ur.po sos-3.0/po/ur.po ---- sos-3.0.orig/po/ur.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/ur.po 2014-06-21 11:15:36.466724329 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/vi.po sos-3.0/po/vi.po ---- sos-3.0.orig/po/vi.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/vi.po 2014-06-21 11:15:36.466724329 -0500 -@@ -169,7 +169,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/zh_CN.po sos-3.0/po/zh_CN.po ---- sos-3.0.orig/po/zh_CN.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/zh_CN.po 2014-06-21 11:15:36.466724329 -0500 -@@ -184,7 +184,7 @@ msgid "Cannot upload to specified URL." - msgstr "无法上传到指定的网址。" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "在将您的报告上传到红帽支持时出错。" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/po/zh_TW.po sos-3.0/po/zh_TW.po ---- sos-3.0.orig/po/zh_TW.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/zh_TW.po 2014-06-21 11:15:36.466724329 -0500 -@@ -180,8 +180,8 @@ msgid "Cannot upload to specified URL." - msgstr "無法上傳指定的網址。" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." --msgstr "將報告上傳至 Red Hat 技術支援時，出現問題。" -+msgid "There was a problem uploading your report to CentOS support." -+msgstr "將報告上傳至 CentOS 技術支援時，出現問題。" - - #: ../sos/policyredhat.py:401 - #, python-format -diff -uNrp sos-3.0.orig/po/zu.po sos-3.0/po/zu.po ---- sos-3.0.orig/po/zu.po 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/po/zu.po 2014-06-21 11:15:36.467724321 -0500 -@@ -168,7 +168,7 @@ msgid "Cannot upload to specified URL." - msgstr "" - - #: ../sos/policyredhat.py:399 --msgid "There was a problem uploading your report to Red Hat support." -+msgid "There was a problem uploading your report to CentOS support." - msgstr "" - - #: ../sos/policyredhat.py:401 -diff -uNrp sos-3.0.orig/sos/plugins/apache.py sos-3.0/sos/plugins/apache.py ---- sos-3.0.orig/sos/plugins/apache.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/apache.py 2014-06-21 11:20:20.422520121 -0500 -@@ -22,7 +22,7 @@ class Apache(Plugin): - option_list = [("log", "gathers all apache logs", "slow", False)] - - class RedHatApache(Apache, RedHatPlugin): -- """Apache related information for Red Hat distributions -+ """Apache related information for CentOS distributions - """ - files = ('/etc/httpd/conf/httpd.conf',) - -diff -uNrp sos-3.0.orig/sos/plugins/cgroups.py sos-3.0/sos/plugins/cgroups.py ---- sos-3.0.orig/sos/plugins/cgroups.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/cgroups.py 2014-06-21 11:20:20.424520105 -0500 -@@ -30,7 +30,7 @@ class DebianCgroups(Cgroups, DebianPlugi - return - - class RedHatCgroups(Cgroups, RedHatPlugin): -- """Red Hat specific cgroup subsystem information -+ """CentOS specific cgroup subsystem information - """ - - def setup(self): -diff -uNrp sos-3.0.orig/sos/plugins/cs.py sos-3.0/sos/plugins/cs.py ---- sos-3.0.orig/sos/plugins/cs.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/cs.py 2014-06-21 11:20:20.425520098 -0500 -@@ -21,7 +21,7 @@ from os.path import exists - from glob import glob - - class CertificateSystem(Plugin, RedHatPlugin): -- """Red Hat Certificate System 7.1, 7.3, 8.0 and dogtag related information -+ """CentOS Certificate System 7.1, 7.3, 8.0 and dogtag related information - """ - - plugin_name = 'certificatesystem' -@@ -49,7 +49,7 @@ class CertificateSystem(Plugin, RedHatPl - def setup(self): - csversion = self.checkversion() - if not csversion: -- self.add_alert("Red Hat Certificate System not found.") -+ self.add_alert("CentOS Certificate System not found.") - return - if csversion == 71: - self.add_copy_specs([ -diff -uNrp sos-3.0.orig/sos/plugins/dhcp.py sos-3.0/sos/plugins/dhcp.py ---- sos-3.0.orig/sos/plugins/dhcp.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/dhcp.py 2014-06-21 11:20:20.426520091 -0500 -@@ -21,7 +21,7 @@ class Dhcp(Plugin): - plugin_name = "dhcp" - - class RedHatDhcp(Dhcp, RedHatPlugin): -- """DHCP related information for Red Hat based distributions""" -+ """DHCP related information for CentOS based distributions""" - - files = ('/etc/rc.d/init.d/dhcpd',) - packages = ('dhcp',) -diff -uNrp sos-3.0.orig/sos/plugins/hardware.py sos-3.0/sos/plugins/hardware.py ---- sos-3.0.orig/sos/plugins/hardware.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/hardware.py 2014-06-21 11:20:20.429520069 -0500 -@@ -36,7 +36,7 @@ class Hardware(Plugin): - - - class RedHatHardware(Hardware, RedHatPlugin): -- """hardware related information for Red Hat distribution -+ """hardware related information for CentOS distribution - """ - - def setup(self): -diff -uNrp sos-3.0.orig/sos/plugins/hts.py sos-3.0/sos/plugins/hts.py ---- sos-3.0.orig/sos/plugins/hts.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/hts.py 2014-06-21 11:20:20.429520069 -0500 -@@ -15,7 +15,7 @@ - from sos.plugins import Plugin, RedHatPlugin - - class HardwareTestSuite(Plugin, RedHatPlugin): -- """Red Hat Hardware Test Suite related information -+ """CentOS Hardware Test Suite related information - """ - - plugin_name = 'hardwaretestsuite' -diff -uNrp sos-3.0.orig/sos/plugins/__init__.py sos-3.0/sos/plugins/__init__.py ---- sos-3.0.orig/sos/plugins/__init__.py 2014-06-21 11:11:15.843754983 -0500 -+++ sos-3.0/sos/plugins/__init__.py 2014-06-21 11:20:20.431520054 -0500 -@@ -711,7 +711,7 @@ class Plugin(object): - - - class RedHatPlugin(object): -- """Tagging class to indicate that this plugin works with Red Hat Linux""" -+ """Tagging class to indicate that this plugin works with CentOS Linux""" - pass - - class UbuntuPlugin(object): -diff -uNrp sos-3.0.orig/sos/plugins/ipsec.py sos-3.0/sos/plugins/ipsec.py ---- sos-3.0.orig/sos/plugins/ipsec.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/ipsec.py 2014-06-21 11:20:20.432520046 -0500 -@@ -24,7 +24,7 @@ class IPSec(Plugin): - packages = ('ipsec-tools',) - - class RedHatIpsec(IPSec, RedHatPlugin): -- """ipsec related information for Red Hat distributions -+ """ipsec related information for CentOS distributions - """ - - files = ('/etc/racoon/racoon.conf',) -diff -uNrp sos-3.0.orig/sos/plugins/iscsi.py sos-3.0/sos/plugins/iscsi.py ---- sos-3.0.orig/sos/plugins/iscsi.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/iscsi.py 2014-06-21 11:20:20.432520046 -0500 -@@ -22,7 +22,7 @@ class Iscsi(Plugin): - plugin_name = "iscsi" - - class RedHatIscsi(Iscsi, RedHatPlugin): -- """iscsi-initiator related information Red Hat based distributions -+ """iscsi-initiator related information CentOS based distributions - """ - - packages = ('iscsi-initiator-utils',) -diff -uNrp sos-3.0.orig/sos/plugins/iscsitarget.py sos-3.0/sos/plugins/iscsitarget.py ---- sos-3.0.orig/sos/plugins/iscsitarget.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/iscsitarget.py 2014-06-21 11:20:20.432520046 -0500 -@@ -24,7 +24,7 @@ class IscsiTarget(Plugin): - plugin_name = "iscsitarget" - - class RedHatIscsiTarget(IscsiTarget, RedHatPlugin): -- """iscsi-target related information for Red Hat distributions -+ """iscsi-target related information for CentOS distributions - """ - - packages = ('scsi-target-utils',) -diff -uNrp sos-3.0.orig/sos/plugins/kdump.py sos-3.0/sos/plugins/kdump.py ---- sos-3.0.orig/sos/plugins/kdump.py 2014-06-21 11:11:15.785755436 -0500 -+++ sos-3.0/sos/plugins/kdump.py 2014-06-21 11:20:20.433520039 -0500 -@@ -26,7 +26,7 @@ class KDump(Plugin): - ]) - - class RedHatKDump(KDump, RedHatPlugin): -- """Kdump related information for Red Hat distributions -+ """Kdump related information for CentOS distributions - """ - - files = ('/etc/kdump.conf',) -diff -uNrp sos-3.0.orig/sos/plugins/openssl.py sos-3.0/sos/plugins/openssl.py ---- sos-3.0.orig/sos/plugins/openssl.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/openssl.py 2014-06-21 11:20:20.437520009 -0500 -@@ -24,7 +24,7 @@ class OpenSSL(Plugin): - packages = ('openssl',) - - class RedHatOpenSSL(OpenSSL, RedHatPlugin): -- """openssl related information for Red Hat distributions -+ """openssl related information for CentOS distributions - """ - - files = ('/etc/pki/tls/openssl.cnf',) -diff -uNrp sos-3.0.orig/sos/plugins/openstack.py sos-3.0/sos/plugins/openstack.py ---- sos-3.0.orig/sos/plugins/openstack.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/openstack.py 2014-06-21 11:20:20.438520002 -0500 -@@ -153,7 +153,7 @@ class DebianOpenStack(OpenStack, DebianP - - - class RedHatOpenStack(OpenStack, RedHatPlugin): -- """OpenStack related information for Red Hat distributions -+ """OpenStack related information for CentOS distributions - """ - - packages = ('openstack-nova', -diff -uNrp sos-3.0.orig/sos/plugins/postgresql.py sos-3.0/sos/plugins/postgresql.py ---- sos-3.0.orig/sos/plugins/postgresql.py 2013-06-10 12:35:56.000000000 -0500 -+++ sos-3.0/sos/plugins/postgresql.py 2014-06-21 11:20:20.438520002 -0500 -@@ -49,7 +49,7 @@ class PostgreSQL(Plugin): - shutil.rmtree(self.tmp_dir) - - class RedHatPostgreSQL(PostgreSQL, RedHatPlugin): -- """PostgreSQL related information for Red Hat distributions""" -+ """PostgreSQL related information for CentOS distributions""" - - def setup(self): - super(RedHatPostgreSQL, self).setup() -diff -uNrp sos-3.0.orig/sos/plugins/radius.py sos-3.0/sos/plugins/radius.py ---- sos-3.0.orig/sos/plugins/radius.py 2013-06-10 12:35:57.000000000 -0500 -+++ sos-3.0/sos/plugins/radius.py 2014-06-21 11:20:20.440519987 -0500 -@@ -24,7 +24,7 @@ class Radius(Plugin): - packages = ('freeradius',) - - class RedHatRadius(Radius, RedHatPlugin): -- """radius related information on Red Hat distributions -+ """radius related information on CentOS distributions - """ - - files = ('/etc/raddb',) -diff -uNrp sos-3.0.orig/sos/plugins/rhui.py sos-3.0/sos/plugins/rhui.py ---- sos-3.0.orig/sos/plugins/rhui.py 2013-06-10 12:35:57.000000000 -0500 -+++ sos-3.0/sos/plugins/rhui.py 2014-06-21 11:20:20.440519987 -0500 -@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl - import os - - class Rhui(Plugin, RedHatPlugin): -- """Red Hat Update Infrastructure for Cloud Providers data -+ """CentOS Update Infrastructure for Cloud Providers data - """ - - plugin_name = 'rhui' -diff -uNrp sos-3.0.orig/sos/plugins/sssd.py sos-3.0/sos/plugins/sssd.py ---- sos-3.0.orig/sos/plugins/sssd.py 2013-06-10 12:35:57.000000000 -0500 -+++ sos-3.0/sos/plugins/sssd.py 2014-06-21 11:20:20.443519965 -0500 -@@ -27,7 +27,7 @@ class Sssd(Plugin): - self.add_copy_specs(["/etc/sssd", "/var/log/sssd/*"]) - - class RedHatSssd(Sssd, RedHatPlugin): -- """sssd-related Diagnostic Information on Red Hat based distributions -+ """sssd-related Diagnostic Information on CentOS based distributions - """ - - def setup(self): -diff -uNrp sos-3.0.orig/sos/plugins/sunrpc.py sos-3.0/sos/plugins/sunrpc.py ---- sos-3.0.orig/sos/plugins/sunrpc.py 2013-06-10 12:35:57.000000000 -0500 -+++ sos-3.0/sos/plugins/sunrpc.py 2014-06-21 11:20:20.443519965 -0500 -@@ -34,7 +34,7 @@ class SunRPC(Plugin): - return - - class RedHatSunRPC(SunRPC, RedHatPlugin): -- """Sun RPC related information for Red Hat systems -+ """Sun RPC related information for CentOS systems - """ - - service = 'rpcbind' -@@ -42,7 +42,7 @@ class RedHatSunRPC(SunRPC, RedHatPlugin) - # FIXME: depends on addition of runlevel_by_service (or similar) - # in Debian/Ubuntu policy classes - #class DebianSunRPC(SunRPC, DebianPlugin, UbuntuPlugin): --# """Sun RPC related information for Red Hat systems -+# """Sun RPC related information for CentOS systems - # """ - # - # service = 'rpcbind-boot' -diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py ---- sos-3.0.orig/sos/policies/redhat.py 2014-06-21 11:11:15.838755022 -0500 -+++ sos-3.0/sos/policies/redhat.py 2014-06-21 11:22:10.554703632 -0500 -@@ -32,9 +32,9 @@ except: - pass - - class RedHatPolicy(LinuxPolicy): -- distro = "Red Hat" -- vendor = "Red Hat" -- vendor_url = "http://www.redhat.com/" -+ distro = "CentOS" -+ vendor = "CentOS" -+ vendor_url = "http://www.centos.org/" - _tmp_dir = "/var/tmp" - - def __init__(self): -@@ -56,9 +56,9 @@ class RedHatPolicy(LinuxPolicy): - - @classmethod - def check(self): -- """This method checks to see if we are running on Red Hat. It must be -+ """This method checks to see if we are running on CentOS. It must be - overriden by concrete subclasses to return True when running on a -- Fedora, RHEL or other Red Hat distribution or False otherwise.""" -+ CentOS distribution or False otherwise.""" - return False - - def runlevel_by_service(self, name): -@@ -92,9 +92,9 @@ class RedHatPolicy(LinuxPolicy): - return self.host_name() - - class RHELPolicy(RedHatPolicy): -- distro = "Red Hat Enterprise Linux" -- vendor = "Red Hat" -- vendor_url = "https://access.redhat.com/support/" -+ distro = "CentOS Linux" -+ vendor = "CentOS" -+ vendor_url = "https://www.centos.org/" - - def __init__(self): - super(RHELPolicy, self).__init__() diff --git a/SPECS/sos.spec b/SPECS/sos.spec index 3a77f97..bd39092 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -3,7 +3,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 3.0 -Release: 23%{?dist} +Release: 23%{?dist}.4 Group: Applications/System Source0: https://people.redhat.com/breeves/sos/releases/sos-3.0.tar.gz License: GPLv2+ @@ -17,6 +17,7 @@ Requires: rpm-python Requires: tar Requires: bzip2 Requires: xz +Obsoletes: sos-plugins-openstack Patch0: sos-silence-could-not-run.patch Patch1: sos-bz971420-strip-trailing-newline.patch Patch2: sos-bz916705-fix-rhel_version-problems.patch @@ -73,8 +74,11 @@ Patch52: sos-bz1030553-fix-command-output-substitution-exception.patch Patch53: sos-bz916705-remove-rhel_version-from-yum-plugin.patch Patch54: sos-bz1067769-fix-anacron-checks.patch Patch55: sos-bz1039036-call-rhsm-debug-with-sos.patch - -Patch1000: sos-centos-branding.patch +Patch56: sos-bz1139339-foreman-add-plugin.patch +Patch57: sos-bz1148784-plugin-backport-add_cmd_outputs.patch +Patch58: sos-bz1148784-openstack-backport-plugins-from-master.patch +Patch59: sos-bz1148560-add-kpatch-plugin.patch +Patch60: sos-bz1159835-obtain-postgres-password-from-environment.patch %description Sos is a set of tools that gathers information about system @@ -140,8 +144,11 @@ support technicians and developers. %patch53 -p1 %patch54 -p1 %patch55 -p1 - -%patch1000 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 %build make @@ -165,8 +172,24 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sos.conf %changelog -* Thu Jun 19 2014 Johnny Hughes = 3.0-23.el7.centos -- Roll in CentOS Branding +* Wed Nov 12 2014 Bryn M. Reeves = 3.0-23.el7_0.4 +- Ensure sos obsoletes sos-plugins-openstack + Resolves: bz1148784 + +* Tue Nov 11 2014 Bryn M. Reeves = 3.0-23.el7_0.3 +- Obtain postgresql password from the environment + Resolves: bz1159835 + +* Tue Oct 14 2014 Bryn M. Reeves = 3.0-23.el7_0.2 +- Add kpatch plugin + Resolves: bz1148560 +- Backport updated OpenStack plugins from upstream +- Backport add_cmd_outputs interface from upstream + Resolves: bz1148784, bz1148554 + +* Fri Oct 03 2014 Bryn M. Reeves = 3.0-23.el7_0.1 +- Add foreman plugin + Resolves: bz1139339 * Thu Mar 20 2014 Bryn M. Reeves = 3.0-23 - Call rhsm-debug with the --sos switch