diff --git a/.gitignore b/.gitignore index f9c6614..c63cd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/3.3.tar.gz +SOURCES/3.4.tar.gz diff --git a/.sos.metadata b/.sos.metadata index 96cfd56..a550778 100644 --- a/.sos.metadata +++ b/.sos.metadata @@ -1 +1 @@ -e2272fd13fb18c4a8b1bef690286ea3dacd4c407 SOURCES/3.3.tar.gz +76b088e728d79fa8110d2a16a66ffbc00c7e9170 SOURCES/3.4.tar.gz diff --git a/SOURCES/sos-bz1116670-grub2-mkconfig-dont-load-kernel-modules.patch b/SOURCES/sos-bz1116670-grub2-mkconfig-dont-load-kernel-modules.patch deleted file mode 100644 index 0eb586e..0000000 --- a/SOURCES/sos-bz1116670-grub2-mkconfig-dont-load-kernel-modules.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 27f5e7152444df82eb7a560b1ccef78d40f16296 Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 19 Aug 2016 11:19:45 +0200 -Subject: [PATCH 1/2] [general] call a command with specified environment - -Enable calling commands via add_cmd_output with the possibility to -update environmental variables. - -New option 'env' added (None or a dict). When set, it appends to or -overrides os.environ used when calling the command from add_cmd_output. - -Signed-off-by: Pavel Moravec ---- - sos/plugins/__init__.py | 31 ++++++++++++++++++------------- - sos/utilities.py | 6 +++++- - 2 files changed, 23 insertions(+), 14 deletions(-) - -diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py -index 6f86553..c6f1fd7 100644 ---- a/sos/plugins/__init__.py -+++ b/sos/plugins/__init__.py -@@ -561,14 +561,15 @@ class Plugin(object): - self._log_info("added copyspec '%s'" % copy_paths) - - def get_command_output(self, prog, timeout=300, stderr=True, -- chroot=True, runat=None): -+ chroot=True, runat=None, env=None): - if chroot or self.commons['cmdlineopts'].chroot == 'always': - root = self.sysroot - else: - root = None - - result = sos_get_command_output(prog, timeout=timeout, stderr=stderr, -- chroot=root, chdir=runat) -+ chroot=root, chdir=runat, -+ env=env) - - if result['status'] == 124: - self._log_warn("command '%s' timed out after %ds" -@@ -582,7 +583,8 @@ class Plugin(object): - "re-trying in host root" - % (prog.split()[0], root)) - return self.get_command_output(prog, timeout=timeout, -- chroot=False, runat=runat) -+ chroot=False, runat=runat, -+ env=env) - self._log_debug("could not run '%s': command not found" % prog) - return result - -@@ -603,14 +605,14 @@ class Plugin(object): - - def _add_cmd_output(self, cmd, suggest_filename=None, - root_symlink=None, timeout=300, stderr=True, -- chroot=True, runat=None): -+ chroot=True, runat=None, env=None): - """Internal helper to add a single command to the collection list.""" - cmdt = ( - cmd, suggest_filename, - root_symlink, timeout, stderr, -- chroot, runat -+ chroot, runat, env - ) -- _tuplefmt = "('%s', '%s', '%s', %s, '%s', '%s', '%s')" -+ _tuplefmt = "('%s', '%s', '%s', %s, '%s', '%s', '%s', '%s')" - _logstr = "packed command tuple: " + _tuplefmt - self._log_debug(_logstr % cmdt) - self.collect_cmds.append(cmdt) -@@ -618,7 +620,7 @@ class Plugin(object): - - def add_cmd_output(self, cmds, suggest_filename=None, - root_symlink=None, timeout=300, stderr=True, -- chroot=True, runat=None): -+ chroot=True, runat=None, env=None): - """Run a program or a list of programs and collect the output""" - if isinstance(cmds, six.string_types): - cmds = [cmds] -@@ -627,7 +629,7 @@ class Plugin(object): - for cmd in cmds: - self._add_cmd_output(cmd, suggest_filename, - root_symlink, timeout, stderr, -- chroot, runat) -+ chroot, runat, env) - - def get_cmd_output_path(self, name=None, make=True): - """Return a path into which this module should store collected -@@ -679,13 +681,14 @@ class Plugin(object): - - def get_cmd_output_now(self, exe, suggest_filename=None, - root_symlink=False, timeout=300, stderr=True, -- chroot=True, runat=None): -+ chroot=True, runat=None, env=None): - """Execute a command and save the output to a file for inclusion in the - report. - """ - start = time() - result = self.get_command_output(exe, timeout=timeout, stderr=stderr, -- chroot=chroot, runat=runat) -+ chroot=chroot, runat=runat, -+ env=env) - # 126 means 'found but not executable' - if result['status'] == 126 or result['status'] == 127: - return None -@@ -807,15 +810,17 @@ class Plugin(object): - suggest_filename, root_symlink, - timeout, - stderr, -- chroot, runat -+ chroot, runat, -+ env - ) = progs[0] - self._log_debug("unpacked command tuple: " + -- "('%s', '%s', '%s', %s, '%s', '%s', '%s')" % -+ "('%s', '%s', '%s', %s, '%s', '%s', '%s', '%s')" % - progs[0]) - self._log_info("collecting output of '%s'" % prog) - self.get_cmd_output_now(prog, suggest_filename=suggest_filename, - root_symlink=root_symlink, timeout=timeout, -- stderr=stderr, chroot=chroot, runat=runat) -+ stderr=stderr, chroot=chroot, runat=runat, -+ env=env) - - def _collect_strings(self): - for string, file_name in self.copy_strings: -diff --git a/sos/utilities.py b/sos/utilities.py -index 588cb3f..bc998fa 100644 ---- a/sos/utilities.py -+++ b/sos/utilities.py -@@ -110,7 +110,7 @@ def is_executable(command): - - - def sos_get_command_output(command, timeout=300, stderr=False, -- chroot=None, chdir=None): -+ chroot=None, chdir=None, env=None): - """Execute a command and return a dictionary of status and output, - optionally changing root or current working directory before - executing command. -@@ -127,6 +127,10 @@ def sos_get_command_output(command, timeout=300, stderr=False, - cmd_env = os.environ - # ensure consistent locale for collected command output - cmd_env['LC_ALL'] = 'C' -+ # optionally add an environment change for the command -+ if env: -+ for key, value in env.iteritems(): -+ cmd_env[key] = value - # use /usr/bin/timeout to implement a timeout - if timeout and is_executable("timeout"): - command = "timeout %ds %s" % (timeout, command) --- -2.4.11 - -From 57fdeaaad3436f374f4a68dbfef686c5dd8b4d5b Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 19 Aug 2016 11:20:55 +0200 -Subject: [PATCH 2/2] [grub2] grub2-mkconfig loads ext4 and brctl kernel - modules - -Call grub2-mkconfig with GRUB_DISABLE_OS_PROBER=true to prevent -explicit loading of the kernel modules. - -Resolves: #822 - -Signed-off-by: Pavel Moravec ---- - sos/plugins/grub2.py | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py -index d321494..a98d3d0 100644 ---- a/sos/plugins/grub2.py -+++ b/sos/plugins/grub2.py -@@ -33,10 +33,13 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): - "/etc/grub2.cfg", - "/etc/grub.d" - ]) -- self.add_cmd_output([ -- "ls -lanR /boot", -- "grub2-mkconfig" -- ]) -+ -+ self.add_cmd_output("ls -lanR /boot") -+ # call grub2-mkconfig with GRUB_DISABLE_OS_PROBER=true to prevent -+ # possible unwanted loading of some kernel modules -+ env = {} -+ env['GRUB_DISABLE_OS_PROBER'] = 'true' -+ self.add_cmd_output("grub2-mkconfig", env=env) - - def postproc(self): - # the trailing space is required; python treats '_' as whitespace --- -2.4.11 - diff --git a/SOURCES/sos-bz1148381-libvirt-cgroups-collection.patch b/SOURCES/sos-bz1148381-libvirt-cgroups-collection.patch new file mode 100644 index 0000000..d51c8b2 --- /dev/null +++ b/SOURCES/sos-bz1148381-libvirt-cgroups-collection.patch @@ -0,0 +1,29 @@ +From d7af5cddbbb9d93e3af5bff3753d29ff1c02cd8b Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Mon, 15 May 2017 17:32:06 +0100 +Subject: [PATCH] [libvirt] fix per-process cgroup collection + +The per-pid cgroup data is in a pseudofile named 'cgroup', and not +'cgroups' as in commit 2523ad5. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/libvirt.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py +index cbb4fb4..674dd67 100644 +--- a/sos/plugins/libvirt.py ++++ b/sos/plugins/libvirt.py +@@ -65,7 +65,7 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + # get details of processes of KVM hosts + for pidfile in glob.glob("/var/run/libvirt/*/*.pid"): + pid = open(pidfile).read().splitlines()[0] +- for pf in ["environ", "cgroups", "maps", "numa_maps", "limits"]: ++ for pf in ["environ", "cgroup", "maps", "numa_maps", "limits"]: + self.add_copy_spec("/proc/%s/%s" % (pid, pf)) + + def postproc(self): +-- +2.7.4 + diff --git a/SOURCES/sos-bz1250346-openstack-tripleo.patch b/SOURCES/sos-bz1250346-openstack-tripleo.patch new file mode 100644 index 0000000..227d360 --- /dev/null +++ b/SOURCES/sos-bz1250346-openstack-tripleo.patch @@ -0,0 +1,239 @@ +From c26ab810bf4b55516a477d96d551f51f0087156c Mon Sep 17 00:00:00 2001 +From: Martin Schuppert +Date: Tue, 2 May 2017 11:56:50 +0200 +Subject: [PATCH] [openstack_*] fix issue with --verify option + +If --verify option got specified, the package list was not handled +properly and resulted in trace. + +Resolves: #1000. + +Signed-off-by: Martin Schuppert +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/openstack_ceilometer.py | 2 +- + sos/plugins/openstack_cinder.py | 2 +- + sos/plugins/openstack_glance.py | 2 +- + sos/plugins/openstack_heat.py | 2 +- + sos/plugins/openstack_horizon.py | 2 +- + sos/plugins/openstack_instack.py | 2 +- + sos/plugins/openstack_ironic.py | 2 +- + sos/plugins/openstack_keystone.py | 2 +- + sos/plugins/openstack_neutron.py | 2 +- + sos/plugins/openstack_nova.py | 2 +- + sos/plugins/openstack_sahara.py | 2 +- + sos/plugins/openstack_swift.py | 2 +- + sos/plugins/openstack_trove.py | 2 +- + 13 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py +index 94b73b6..571723c 100644 +--- a/sos/plugins/openstack_ceilometer.py ++++ b/sos/plugins/openstack_ceilometer.py +@@ -38,7 +38,7 @@ class OpenStackCeilometer(Plugin): + sizelimit=self.limit) + self.add_copy_spec("/etc/ceilometer/") + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py +index 157f23d..a46dd56 100644 +--- a/sos/plugins/openstack_cinder.py ++++ b/sos/plugins/openstack_cinder.py +@@ -45,7 +45,7 @@ class OpenStackCinder(Plugin): + self.add_copy_spec("/var/log/cinder/*.log", sizelimit=self.limit) + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py +index e18be9c..0db5025 100644 +--- a/sos/plugins/openstack_glance.py ++++ b/sos/plugins/openstack_glance.py +@@ -45,7 +45,7 @@ class OpenStackGlance(Plugin): + self.add_copy_spec("/etc/glance/") + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + vars = [p in os.environ for p in [ + 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']] +diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py +index c002bbd..3638aa3 100644 +--- a/sos/plugins/openstack_heat.py ++++ b/sos/plugins/openstack_heat.py +@@ -52,7 +52,7 @@ class OpenStackHeat(Plugin): + self.add_copy_spec("/etc/heat/") + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py +index 25a9916..88ed910 100644 +--- a/sos/plugins/openstack_horizon.py ++++ b/sos/plugins/openstack_horizon.py +@@ -40,7 +40,7 @@ class OpenStackHorizon(Plugin): + self.add_forbidden_path("*.py[co]") + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_instack.py b/sos/plugins/openstack_instack.py +index 30acecf..3cbc008 100644 +--- a/sos/plugins/openstack_instack.py ++++ b/sos/plugins/openstack_instack.py +@@ -30,7 +30,7 @@ class OpenStackInstack(Plugin): + self.add_copy_spec("/home/stack/instackenv.json") + self.add_copy_spec("/home/stack/undercloud.conf") + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + self.limit = self.get_option("log_size") + if self.get_option("all_logs"): +diff --git a/sos/plugins/openstack_ironic.py b/sos/plugins/openstack_ironic.py +index 760ca43..6a75124 100644 +--- a/sos/plugins/openstack_ironic.py ++++ b/sos/plugins/openstack_ironic.py +@@ -38,7 +38,7 @@ class OpenStackIronic(Plugin): + self.add_cmd_output('ls -laRt /var/lib/ironic/') + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + vars = [p in os.environ for p in [ + 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']] +diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py +index ce177fb..e7cda2f 100644 +--- a/sos/plugins/openstack_keystone.py ++++ b/sos/plugins/openstack_keystone.py +@@ -42,7 +42,7 @@ class OpenStackKeystone(Plugin): + self.add_copy_spec("/var/log/keystone/*.log", sizelimit=self.limit) + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + vars = [p in os.environ for p in [ + 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']] +diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py +index 590194c..8cf7357 100644 +--- a/sos/plugins/openstack_neutron.py ++++ b/sos/plugins/openstack_neutron.py +@@ -36,7 +36,7 @@ class OpenStackNeutron(Plugin): + self.add_copy_spec("/etc/neutron/") + self.add_copy_spec("/var/lib/neutron/") + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + vars = [p in os.environ for p in [ + 'OS_USERNAME', 'OS_PASSWORD', 'OS_TENANT_NAME']] +diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py +index 8e0a19a..14bdfbd 100644 +--- a/sos/plugins/openstack_nova.py ++++ b/sos/plugins/openstack_nova.py +@@ -70,7 +70,7 @@ class OpenStackNova(Plugin): + self.add_copy_spec("/etc/nova/") + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py +index 5a2a5c3..cbc5bd9 100644 +--- a/sos/plugins/openstack_sahara.py ++++ b/sos/plugins/openstack_sahara.py +@@ -37,7 +37,7 @@ class OpenStackSahara(Plugin): + self.add_copy_spec("/var/log/sahara/*.log", sizelimit=self.limit) + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py +index 1ac3509..6edc056 100644 +--- a/sos/plugins/openstack_swift.py ++++ b/sos/plugins/openstack_swift.py +@@ -38,7 +38,7 @@ class OpenStackSwift(Plugin): + self.add_copy_spec("/etc/swift/") + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + protect_keys = [ +diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py +index e8306e5..539cbb3 100644 +--- a/sos/plugins/openstack_trove.py ++++ b/sos/plugins/openstack_trove.py +@@ -37,7 +37,7 @@ class OpenStackTrove(Plugin): + self.add_copy_spec('/etc/trove/') + + if self.get_option("verify"): +- self.add_cmd_output("rpm -V %s" % ' '.join(packages)) ++ self.add_cmd_output("rpm -V %s" % ' '.join(self.packages)) + + def postproc(self): + +-- +2.7.4 + +From 02b95e468211406989fd488e649f99bf9e9dfc1c Mon Sep 17 00:00:00 2001 +From: Martin Schuppert +Date: Tue, 2 May 2017 12:14:47 +0200 +Subject: [PATCH] [openstack_instack] extended packages list + +Extended packages list to verify triplo packages if --verify is +specified. + +Resolves: #1001. + +Signed-off-by: Martin Schuppert +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/openstack_instack.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/sos/plugins/openstack_instack.py b/sos/plugins/openstack_instack.py +index 3cbc008..bd836ba 100644 +--- a/sos/plugins/openstack_instack.py ++++ b/sos/plugins/openstack_instack.py +@@ -114,6 +114,15 @@ class RedHatRDOManager(OpenStackInstack, RedHatPlugin): + packages = [ + 'instack', + 'instack-undercloud', ++ 'openstack-tripleo', ++ 'openstack-tripleo-common', ++ 'openstack-tripleo-heat-templates', ++ 'openstack-tripleo-image-elements', ++ 'openstack-tripleo-puppet-elements', ++ 'openstack-tripleo-ui', ++ 'openstack-tripleo-validations', ++ 'puppet-tripleo', ++ 'python-tripleoclient' + ] + + def setup(self): +-- +2.7.4 + diff --git a/SOURCES/sos-bz1260607-ceph-skip-keyring-bindpass-files.patch b/SOURCES/sos-bz1260607-ceph-skip-keyring-bindpass-files.patch deleted file mode 100644 index a4bb5d6..0000000 --- a/SOURCES/sos-bz1260607-ceph-skip-keyring-bindpass-files.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c8f62ea4b6193a175add12e1795c18dad500c38e Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Tue, 2 Aug 2016 11:55:23 +0200 -Subject: [PATCH] [ceph] skip collecting of all keyring and bindpass files - -Do not collect any keyring files - expand the add_forbidden_path -regular expressions accordingly to cover there filenames like: - -/var/lib/ceph/tmp/keyring.mon.magna055 - -Do not either collect any /etc/ceph/*bindpass* that can store LDAP -bind passwords. - -Resolves: #861 - -Signed-off-by: Pavel Moravec ---- - sos/plugins/ceph.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py -index 10fee88..74b7c4c 100644 ---- a/sos/plugins/ceph.py -+++ b/sos/plugins/ceph.py -@@ -59,11 +59,12 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): - "ceph report" - ]) - -- self.add_forbidden_path("/etc/ceph/*keyring") -- self.add_forbidden_path("/var/lib/ceph/*keyring") -- self.add_forbidden_path("/var/lib/ceph/*/*keyring") -- self.add_forbidden_path("/var/lib/ceph/*/*/*keyring") -+ self.add_forbidden_path("/etc/ceph/*keyring*") -+ self.add_forbidden_path("/var/lib/ceph/*keyring*") -+ self.add_forbidden_path("/var/lib/ceph/*/*keyring*") -+ self.add_forbidden_path("/var/lib/ceph/*/*/*keyring*") - self.add_forbidden_path("/var/lib/ceph/osd/*") - self.add_forbidden_path("/var/lib/ceph/osd/mon/*") -+ self.add_forbidden_path("/etc/ceph/*bindpass*") - - # vim: set et ts=4 sw=4 : --- -2.4.11 - diff --git a/SOURCES/sos-bz1299603-omsa-chassis-summary-storage-controller.patch b/SOURCES/sos-bz1299603-omsa-chassis-summary-storage-controller.patch deleted file mode 100644 index bde0cf6..0000000 --- a/SOURCES/sos-bz1299603-omsa-chassis-summary-storage-controller.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6cda8aa3305695133df8dfb12405670953cd8df7 Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 19 Aug 2016 23:18:26 +0200 -Subject: [PATCH] [omsa] add omreport storage controller - -Collect "omreport storage controller". - -Do not collect "omreport chassis summary" as it is invalid command. - -Resolves: #868. - -Signed-off-by: Charles Rose -Signed-off-by: Pavel Moravec ---- - sos/plugins/omsa.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sos/plugins/omsa.py b/sos/plugins/omsa.py -index fa825c8..132e205 100644 ---- a/sos/plugins/omsa.py -+++ b/sos/plugins/omsa.py -@@ -48,7 +48,7 @@ class omsa(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): - "{0} system events".format(self.omreport), - "{0} chassis info".format(self.omreport), - "{0} chassis biossetup".format(self.omreport), -- "{0} chassis summary".format(self.omreport), -+ "{0} storage controller".format(self.omreport), - ], timeout=30) - - # vim: et ts=4 sw=4 --- -2.4.11 - diff --git a/SOURCES/sos-bz1302146-atomichost-info-policy-style.patch b/SOURCES/sos-bz1302146-atomichost-info-policy-style.patch deleted file mode 100644 index 126e48d..0000000 --- a/SOURCES/sos-bz1302146-atomichost-info-policy-style.patch +++ /dev/null @@ -1,142 +0,0 @@ -From ff2820775597e6fc47bada2ce57b01f8cfd81af6 Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Wed, 13 Jul 2016 12:45:36 +0100 -Subject: [PATCH 1/3] [atomichost] fix option list style - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/atomichost.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py -index 46d12e3..ce30ac7 100644 ---- a/sos/plugins/atomichost.py -+++ b/sos/plugins/atomichost.py -@@ -22,8 +22,9 @@ class AtomicHost(Plugin, RedHatPlugin): - """ Atomic Host """ - - plugin_name = "atomichost" -- option_list = [("info", "gather atomic info for each image", -- "fast", False)] -+ option_list = [ -+ ("info", "gather atomic info for each image", "fast", False) -+ ] - - def check_enabled(self): - if not os.path.exists("/host/etc/system-release-cpe"): --- -2.4.11 - -From 46da5439bb79f294dca8019293eecf3096e5b999 Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Wed, 13 Jul 2016 12:47:06 +0100 -Subject: [PATCH 2/3] [atomichost] replace custom logic with - Policy.in_container() - -Don't reinvent the wheel by inspecting file system paths: rely on -the existing policy class in_container() method. - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/atomichost.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py -index ce30ac7..a339557 100644 ---- a/sos/plugins/atomichost.py -+++ b/sos/plugins/atomichost.py -@@ -27,10 +27,7 @@ class AtomicHost(Plugin, RedHatPlugin): - ] - - def check_enabled(self): -- if not os.path.exists("/host/etc/system-release-cpe"): -- return False -- cpe = open("/host/etc/system-release-cpe", "r").readlines() -- return ':atomic-host' in cpe[0] -+ return self.policy().in_container() - - def setup(self): - self.add_copy_spec("/etc/ostree/remotes.d") --- -2.4.11 - -From e2d85366ef5b6f02e12e0ce353a0ccaa22ae8bbc Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Wed, 13 Jul 2016 15:13:35 +0100 -Subject: [PATCH 3/3] [atomichost] improve 'atomic info' collection loop - -Remove redundant code from the loop that drives 'atomic info' -collection and make the bracketing and indenting style match -other plugins. - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/atomichost.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py -index a339557..9b53d56 100644 ---- a/sos/plugins/atomichost.py -+++ b/sos/plugins/atomichost.py -@@ -34,8 +34,9 @@ class AtomicHost(Plugin, RedHatPlugin): - self.add_cmd_output("atomic host status") - - if self.get_option('info'): -- images = self.get_command_output("docker images -q") -- for image in set( -- images['output'].splitlines()): -- if image: -- self.add_cmd_output("atomic info {0}".format(image)) -+ # images output may have trailing whitespace -+ images = self.get_command_output("docker images -q").strip() -+ for image in set(images['output'].splitlines()): -+ self.add_cmd_output("atomic info {0}".format(image)) -+ -+# vim: set et ts=4 sw=4 : --- -2.4.11 - -From b5e0e80ad784054fd2f4cdb8c6867982c0dd1c25 Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Fri, 19 Aug 2016 15:33:34 +0100 -Subject: [PATCH] [atomichost] fix collection of 'docker info' output - -The loop that drives collection of 'docker info' output for each -discovered Image ID incorrectly attempted to call strip() on the -dictionary returned by get_command_output(). - -Since the docker command does not produce leading or trailing -whitespace this is redundant anyway: discard the other entries -in the command dictionary and just split the result into distinct -lines. - -Resolves: #853. - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/atomichost.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py -index 9b53d56..7091a45 100644 ---- a/sos/plugins/atomichost.py -+++ b/sos/plugins/atomichost.py -@@ -34,9 +34,12 @@ class AtomicHost(Plugin, RedHatPlugin): - self.add_cmd_output("atomic host status") - - if self.get_option('info'): -- # images output may have trailing whitespace -- images = self.get_command_output("docker images -q").strip() -- for image in set(images['output'].splitlines()): -+ # The 'docker images' command may include duplicate rows of -+ # output (repeated "IMAGE ID" values). Use a set to filter -+ # these out and only obtain 'docker info' data once per image -+ # identifier. -+ images = self.get_command_output("docker images -q")['output'] -+ for image in set(images.splitlines()): - self.add_cmd_output("atomic info {0}".format(image)) - - # vim: set et ts=4 sw=4 : --- -2.4.11 - diff --git a/SOURCES/sos-bz1351647-docker-more-data-expand-options.patch b/SOURCES/sos-bz1351647-docker-more-data-expand-options.patch deleted file mode 100644 index d16eff6..0000000 --- a/SOURCES/sos-bz1351647-docker-more-data-expand-options.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9d1344055948aecdce77d55893eeb46e288ecbcd Mon Sep 17 00:00:00 2001 -From: Jake Hunsaker -Date: Mon, 11 Jan 2016 10:11:21 -0500 -Subject: [PATCH] [docker] Gather more data and expand plugin options - -This patch changes the behavior of the docker plugin and collects a bit more -data than before. In addition, it also adds 'docker-engine' to the package lists -as that is the current name of the community release of Docker. - -Both 'docker version' and 'docker ps -a' output is now collected. Output from -'docker version' help to validate a given docker binary and 'ps -a' output is -collected to see all terminated, but still existing, containers present on the -system. This is kept separate from normal 'ps' output to keep it simple to only -quickly look at running containers. - -The output of 'docker inspect' is now collected as well, by default only for -running containers. - -Further, plugin options have been changed: - -- 'logs' will now capture 'docker logs' output for all running containers. -Previously this was provided by the 'all' option which would also always include -terminated containers. - -- 'all' will now cause the plugin to also include terminated containers for -'inspect' and 'logs' output. Note that by itself this option no longer captures any -additional information. - -Signed-off-by: Jake Hunsaker ---- - sos/plugins/docker.py | 49 ++++++++++++++++++++++++++++++++----------------- - 1 file changed, 32 insertions(+), 17 deletions(-) - -diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py -index 8c87bfa..452cf76 100644 ---- a/sos/plugins/docker.py -+++ b/sos/plugins/docker.py -@@ -23,39 +23,54 @@ class Docker(Plugin): - - plugin_name = 'docker' - profiles = ('virt',) -- docker_bin = "docker" -+ docker_cmd = "docker" - -- option_list = [("all", "capture all container logs even the " -- "terminated ones", 'fast', False)] -+ option_list = [ -+ ("all", "enable capture for all containers, even containers " -+ "that have terminated", 'fast', False), -+ ("logs", "capture logs for running containers", -+ 'fast', False) -+ ] - - def setup(self): - self.add_copy_spec([ - "/var/lib/docker/repositories-*" - ]) - -- self.add_cmd_output([ -- "{0} info".format(self.docker_bin), -- "{0} ps".format(self.docker_bin), -- "{0} images".format(self.docker_bin) -- ]) -+ for subcmd in ['info', 'ps', 'ps -a', 'images', 'version']: -+ self.add_cmd_output( -+ "{0} {1}".format(self.docker_cmd, subcmd) -+ ) -+ - self.add_journal(units="docker") - -- ps_cmd = "{0} ps".format(self.docker_bin) -+ ps_cmd = "{0} ps -q".format(self.docker_cmd) - if self.get_option('all'): - ps_cmd = "{0} -a".format(ps_cmd) - - result = self.get_command_output(ps_cmd) - if result['status'] == 0: -- for line in result['output'].splitlines()[1:]: -- container_id = line.split(" ")[0] -- self.add_cmd_output([ -- "{0} logs {1}".format(self.docker_bin, container_id) -- ]) -+ containers = [c for c in result['output'].splitlines()] -+ for container in containers: -+ self.add_cmd_output( -+ "{0} inspect {1}".format( -+ self.docker_cmd, -+ container -+ ) -+ ) -+ if self.get_option('logs'): -+ for container in containers: -+ self.add_cmd_output( -+ "{0} logs {1}".format( -+ self.docker_cmd, -+ container -+ ) -+ ) - - - class RedHatDocker(Docker, RedHatPlugin): - -- packages = ('docker', 'docker-io') -+ packages = ('docker', 'docker-latest', 'docker-io', 'docker-engine') - - def setup(self): - super(RedHatDocker, self).setup() -@@ -67,10 +82,10 @@ class RedHatDocker(Docker, RedHatPlugin): - - class UbuntuDocker(Docker, UbuntuPlugin): - -- packages = ('docker.io',) -+ packages = ('docker.io', 'docker-engine') - - # Name collision with another package requires docker binary rename -- docker_bin = 'docker.io' -+ docker_cmd = 'docker.io' - - def setup(self): - super(UbuntuDocker, self).setup() --- -2.4.11 - diff --git a/SOURCES/sos-bz1353552-virtwho-plugin.patch b/SOURCES/sos-bz1353552-virtwho-plugin.patch deleted file mode 100644 index b7bb6af..0000000 --- a/SOURCES/sos-bz1353552-virtwho-plugin.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ba2a2016a3f3c383b265a99deff8867d0d26ea56 Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Thu, 7 Jul 2016 14:51:16 +0100 -Subject: [PATCH] [virtwho] add new plugin for virt-who agent - -Add a new plugin for the virtual guest ID reporting agent. - -RHBZ#1353552 - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/virtwho.py | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 sos/plugins/virtwho.py - -diff --git a/sos/plugins/virtwho.py b/sos/plugins/virtwho.py -new file mode 100644 -index 0000000..e5f3049 ---- /dev/null -+++ b/sos/plugins/virtwho.py -@@ -0,0 +1,34 @@ -+# 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 -+ -+ -+class VirtWho(Plugin, RedHatPlugin): -+ """Virt-Who agent -+ """ -+ -+ plugin_name = 'virtwho' -+ profiles = ('virt', 'system') -+ packages = ('virt-who',) -+ -+ def setup(self): -+ self.add_copy_spec("/etc/virt-who.d/*") -+ -+ def postproc(self): -+ self.do_path_regex_sub(r"\/etc\/virt-who\.d", -+ r"(.*password=)(\S*)", -+ r"\1********") -+ -+# vim: set et ts=4 sw=4 : --- -2.4.11 - diff --git a/SOURCES/sos-bz1356945-monit-copy-spec-string.patch b/SOURCES/sos-bz1356945-monit-copy-spec-string.patch deleted file mode 100644 index a2984fd..0000000 --- a/SOURCES/sos-bz1356945-monit-copy-spec-string.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c746b80e91bbab8c40a0c8cc5607a221b2bed09f Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Fri, 15 Jul 2016 12:02:40 +0100 -Subject: [PATCH] [monit] fix add_copy_spec() arguments - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/monit.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sos/plugins/monit.py b/sos/plugins/monit.py -index 825f770..9b7d30f 100644 ---- a/sos/plugins/monit.py -+++ b/sos/plugins/monit.py -@@ -27,6 +27,7 @@ class Monit(Plugin, RedHatPlugin): - plugin_name = 'monit' - - # Define configuration files -+ # FIXME: direct globs will fail in container environments. - monit_conf = glob("/etc/monit.d/*") - monit_conf.append("/etc/monit.conf") - monit_conf.append("/etc/monitrc") -@@ -38,7 +39,7 @@ class Monit(Plugin, RedHatPlugin): - - def setup(self): - self.add_cmd_output("monit status") -- self.add_copy_spec([self.monit_log, self.monit_conf]) -+ self.add_copy_spec(self.monit_log + self.monit_conf) - - def postproc(self): - # Post process the files included to scrub any --- -2.4.11 - diff --git a/SOURCES/sos-bz1368393-nodejs-npm-plugins.patch b/SOURCES/sos-bz1368393-nodejs-npm-plugins.patch deleted file mode 100644 index 5287a9c..0000000 --- a/SOURCES/sos-bz1368393-nodejs-npm-plugins.patch +++ /dev/null @@ -1,162 +0,0 @@ -From e720c04efdce3ec8dd8e726db22d5eebb47cb016 Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 2 Sep 2016 11:57:16 +0200 -Subject: [PATCH 1/2] [nodejs] new plugin: get runtime info - -Resolves: #847. - -Signed-off-by: Tomas Tomecek -Signed-off-by: Pavel Moravec ---- - sos/plugins/nodejs.py | 43 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - create mode 100644 sos/plugins/nodejs.py - -diff --git a/sos/plugins/nodejs.py b/sos/plugins/nodejs.py -new file mode 100644 -index 0000000..3585ec9 ---- /dev/null -+++ b/sos/plugins/nodejs.py -@@ -0,0 +1,43 @@ -+# Copyright (C) 2016 Red Hat, Inc., Tomas Tomecek -+ -+# 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, \ -+ SuSEPlugin -+ -+ -+class NodeJS(Plugin, RedHatPlugin, SuSEPlugin): -+ """ Get runtime version of NodeJS """ -+ -+ plugin_name = 'nodejs' -+ profiles = ('system',) -+ -+ packages = ('nodejs',) -+ -+ def setup(self): -+ # we could get much more info with: -+ # p = require("process"); console.log(p) -+ # unfortunately 'process' module is not available on 0.10 -+ self.add_cmd_output("node -v", suggest_filename="nodejs-version") -+ -+ -+class NodeJSUbuntu(NodeJS, UbuntuPlugin, DebianPlugin): -+ """ -+ Ubuntu/Debian require nodejs-legacy package in order to -+ have a node executable -+ """ -+ packages = ('nodejs', 'nodejs-legacy') -+ -+# vim: set et ts=4 sw=4 : --- -2.4.11 - -From 470f62c658b37e1691cb87472a15880e9e4596a2 Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 2 Sep 2016 11:59:04 +0200 -Subject: [PATCH 2/2] [npm] new plugin: get project modules and globally - installed modules - -New module for package manager npm for Node.js. - -The plugin collects list of globally installed modules and project modules. - -Resolves: #846. - -Signed-off-by: Tomas Tomecek -Signed-off-by: Pavel Moravec ---- - sos/plugins/npm.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 68 insertions(+) - create mode 100644 sos/plugins/npm.py - -diff --git a/sos/plugins/npm.py b/sos/plugins/npm.py -new file mode 100644 -index 0000000..77464c2 ---- /dev/null -+++ b/sos/plugins/npm.py -@@ -0,0 +1,68 @@ -+# Copyright (C) 2016 Red Hat, Inc., Tomas Tomecek -+ -+# 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, \ -+ SuSEPlugin -+ -+ -+class Npm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, SuSEPlugin): -+ """ -+ Get info about available npm modules -+ """ -+ -+ requires_root = False -+ plugin_name = 'npm' -+ profiles = ('system',) -+ option_list = [("project_path", -+ 'List npm modules of a project specified by path', -+ 'fast', -+ 0)] -+ -+ # in Fedora, Debian, Ubuntu and Suse the package is called npm -+ packages = ('npm',) -+ -+ def _get_npm_output(self, cmd, filename, working_directory=None): -+ # stderr output is already part of the json, key "problems" -+ self.add_cmd_output( -+ cmd, -+ suggest_filename=filename, -+ stderr=False, -+ runat=working_directory -+ ) -+ -+ def setup(self): -+ if self.get_option("project_path") != 0: -+ project_path = os.path.abspath(os.path.expanduser( -+ self.get_option("project_path"))) -+ self._get_npm_output("npm ls --json", "npm-ls-project", -+ working_directory=project_path) -+ self._get_npm_output("npm ls -g --json", "npm-ls-global") -+ -+ -+class NpmViaNodeJS(Npm): -+ """ -+ some distribution methods don't provide 'npm' via npm package -+ """ -+ -+ # upstream doesn't have an npm package, it's just nodejs -+ # also in Fedora 24+ it is just nodejs, no npm package -+ packages = ('nodejs', ) -+ -+# TODO: in RHEL npm and nodejs is available via software collections -+# this should be handled separately -+ -+# vim: set et ts=4 sw=4 : --- -2.4.11 - diff --git a/SOURCES/sos-bz1374152-networking-no-net-tools.patch b/SOURCES/sos-bz1374152-networking-no-net-tools.patch deleted file mode 100644 index 11d43f4..0000000 --- a/SOURCES/sos-bz1374152-networking-no-net-tools.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e62408838d08a962f1e1d6d8970b34ce1883a10c Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 9 Sep 2016 09:21:23 +0200 -Subject: [PATCH 1/2] [reporting] replace six.PY2 to six.PY3 test - -Older versions of python-six package dont have six.PY2 variable. - -Replace it by six.PY3 - -Resolves: #875. - -Signed-off-by: Pavel Moravec ---- - sos/reporting.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sos/reporting.py b/sos/reporting.py -index 23a5005..679284e 100644 ---- a/sos/reporting.py -+++ b/sos/reporting.py -@@ -149,10 +149,10 @@ class PlainTextReport(object): - header, format_) - output = u'\n'.join(map(lambda i: (i if isinstance(i, six.text_type) - else six.u(i)), buf)) -- if six.PY2: -- return output.encode('utf8') -- else: -+ if six.PY3: - return output -+ else: -+ return output.encode('utf8') - - def process_subsection(self, section, key, header, format_): - if key in section: --- -2.4.11 - -From 04435b412f14f6d7eaf0d2138d9f8c84414a8e9a Mon Sep 17 00:00:00 2001 -From: Pavel Moravec -Date: Fri, 9 Sep 2016 09:23:14 +0200 -Subject: [PATCH 2/2] [networking] plugin tracebacks when net-tools not - installed - -Move netstat_pkg assignment grepping for net-tools version into try -block. - -It can be put to the existing block that will catch the exception - -since if net-tools isn't present, we fallback to the default option -of netstat command (if the command is ever present). - -Resolves: #876. - -Signed-off-by: Pavel Moravec ---- - sos/plugins/networking.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py -index 93b8860..1c98b75 100644 ---- a/sos/plugins/networking.py -+++ b/sos/plugins/networking.py -@@ -322,8 +322,8 @@ class RedHatNetworking(Networking, RedHatPlugin): - - def setup(self): - # Handle change from -T to -W in Red Hat netstat 2.0 and greater. -- netstat_pkg = self.policy().package_manager.all_pkgs()['net-tools'] - try: -+ netstat_pkg = self.policy().package_manager.all_pkgs()['net-tools'] - # major version - if int(netstat_pkg['version'][0]) < 2: - self.ns_wide = "-T" --- -2.4.11 - diff --git a/SOURCES/sos-bz1392038-network-name-with-quotemark.patch b/SOURCES/sos-bz1392038-network-name-with-quotemark.patch deleted file mode 100644 index a7498b2..0000000 --- a/SOURCES/sos-bz1392038-network-name-with-quotemark.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d8365090b21c451894b49771959653683caf0f6e Mon Sep 17 00:00:00 2001 -From: "Bryn M. Reeves" -Date: Fri, 8 Jul 2016 18:59:21 +0100 -Subject: [PATCH] [networking] single quote innermost strings in nmcli commands - -Network Manager names may contain embedded quotes (" and '). These will -cause an exception in shlex.split() if the quotes are unbalanced. This -may happen with names like: "Foobar's Wireless Network". Although the -problen will occur for both single and double quote characters the -former is considerably more likely in object names since it is -syntactically valid in many human languages. - -Reverse the normal sos quoting convention here and place double quotes -around the innermost quoted string. - -RHBZ# 1353992 - -Signed-off-by: Bryn M. Reeves ---- - sos/plugins/networking.py | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py -index 8390957..93b8860 100644 ---- a/sos/plugins/networking.py -+++ b/sos/plugins/networking.py -@@ -225,7 +225,17 @@ class Networking(Plugin): - for con in nmcli_con_show_result['output'].splitlines(): - if con[0:7] == 'Warning': - continue -- self.add_cmd_output("%s '%s'" % -+ # nm names may contain embedded quotes (" and '). These -+ # will cause an exception in shlex.split() if the quotes -+ # are unbalanced. This may happen with names like: -+ # "Foobar's Wireless Network". Although the problen will -+ # occur for both single and double quote characters the -+ # former is considerably more likely in object names since -+ # it is syntactically valid in many human languages. -+ # -+ # Reverse the normal sos quoting convention here and place -+ # double quotes around the innermost quoted string. -+ self.add_cmd_output('%s "%s"' % - (nmcli_con_details_cmd, con)) - - nmcli_dev_status_result = self.call_ext_prog( -@@ -234,7 +244,8 @@ class Networking(Plugin): - for dev in nmcli_dev_status_result['output'].splitlines(): - if dev[0:7] == 'Warning': - continue -- self.add_cmd_output("%s '%s'" % -+ # See above comment describing quoting conventions. -+ self.add_cmd_output('%s "%s"' % - (nmcli_dev_details_cmd, dev)) - - # Get ethtool output for every device that does not exist in a --- -2.7.4 - diff --git a/SOURCES/sos-bz1393961-missing-filesystem-nonfatal.patch b/SOURCES/sos-bz1393961-missing-filesystem-nonfatal.patch new file mode 100644 index 0000000..03b5c7b --- /dev/null +++ b/SOURCES/sos-bz1393961-missing-filesystem-nonfatal.patch @@ -0,0 +1,60 @@ +From 4df4897146d4f2a0589a8b32532f912f1ea2ed8c Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Mon, 22 May 2017 16:30:35 +0100 +Subject: [PATCH] [policies/redhat] make missing 'filesystem' package non-fatal + +On Red Hat systems, we use the version of the installed filesystem' +package to enable handling of UsrMove[1] in the PATH used when +running commands from sos. + +If the package is not present (e.g. because of a broken system +configuration, rpm timeout, corrupt database or other cause), +previous versions would fail immediately. In this situation +there was no way for the user to attempt a complete run (short +of fixing the problem related to the 'filesystem' package). + +Now that the timeout has been lengthened for this command, make +the UsrMove determination a bit more robust to prevent users from +being unable to run sos at all: + + - If RPM fails entirely, exit (plugin enablement tests will fail) + - If RPM succeeds but 'filesystem' is missing assume UsrMove + (this is true for all supported Red Hat distros today) + - Otherwise apply the normal PATH logic. + +Signed-off-by: Bryn M. Reeves +--- + sos/policies/redhat.py | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py +index b801b5e..ec1d974 100644 +--- a/sos/policies/redhat.py ++++ b/sos/policies/redhat.py +@@ -58,13 +58,21 @@ class RedHatPolicy(LinuxPolicy): + + pkgs = self.package_manager.all_pkgs() + +- # If rpm query timed out after timeout duration exit ++ # If rpm query failed, exit + if not pkgs: + print("Could not obtain installed package list", file=sys.stderr) + sys.exit(1) + + # handle PATH for UsrMove +- if pkgs['filesystem']['version'][0] == '3': ++ if 'filesystem' not in pkgs: ++ print("Could not find 'filesystem' package: " ++ "assuming PATH settings") ++ usrmove = True ++ else: ++ filesys_version = pkgs['filesystem']['version'] ++ usrmove = True if filesys_version[0] == '3' else False ++ ++ if usrmove: + self.PATH = "/usr/sbin:/usr/bin:/root/bin" + else: + self.PATH = "/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" +-- +2.7.4 + diff --git a/SOURCES/sos-bz1400407-samba-dc-connect.patch b/SOURCES/sos-bz1400407-samba-dc-connect.patch new file mode 100644 index 0000000..f353560 --- /dev/null +++ b/SOURCES/sos-bz1400407-samba-dc-connect.patch @@ -0,0 +1,26 @@ +From ca831062bafa88f5be651d2cf6c8afd2162dea04 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 29 May 2017 15:47:29 +0200 +Subject: [PATCH] [samba] Fix dc-connect winbind logfile path + +Guenther + +Signed-off-by: Guenther Deschner +--- + sos/plugins/samba.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py +index 377eb889..dfe01d49 100644 +--- a/sos/plugins/samba.py ++++ b/sos/plugins/samba.py +@@ -35,7 +35,7 @@ def setup(self): + self.add_copy_spec("/var/log/samba/log.winbindd", sizelimit=self.limit) + self.add_copy_spec("/var/log/samba/log.winbindd-idmap", + sizelimit=self.limit) +- self.add_copy_spec("/var/log/samba/log.winbindd-dc-connet", ++ self.add_copy_spec("/var/log/samba/log.winbindd-dc-connect", + sizelimit=self.limit) + self.add_copy_spec("/var/log/samba/log.wb-*", sizelimit=self.limit) + + diff --git a/SOURCES/sos-bz1416535-pacemaker-user-logs.patch b/SOURCES/sos-bz1416535-pacemaker-user-logs.patch new file mode 100644 index 0000000..fc6e37f --- /dev/null +++ b/SOURCES/sos-bz1416535-pacemaker-user-logs.patch @@ -0,0 +1,123 @@ +From 17809273cecd83c068931e5d7e73d126d98e6ac1 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Tue, 9 May 2017 14:34:13 +0100 +Subject: [PATCH 1/2] [pacemaker] Collect /etc/default/pacemaker for + Debian/Ubuntu + +Make /etc/default/pacemaker the default location for the Pacemaker +defaults file, and have the RedHatPlugin override this to the +/etc/sysconfig/pacemaker location as required. + +Signed-off-by: Pavel Moravec +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/pacemaker.py | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/sos/plugins/pacemaker.py b/sos/plugins/pacemaker.py +index 0dac1da..74de433 100644 +--- a/sos/plugins/pacemaker.py ++++ b/sos/plugins/pacemaker.py +@@ -17,12 +17,13 @@ from datetime import datetime, timedelta + import re + + +-class Pacemaker(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class Pacemaker(Plugin, DebianPlugin, UbuntuPlugin): + """HA Cluster resource manager""" + + plugin_name = "pacemaker" + profiles = ("cluster", ) + packages = ["pacemaker"] ++ defaults = "/etc/default/pacemaker" + + option_list = [ + ("crm_from", "specify the start time for crm_report", "fast", False), +@@ -32,7 +33,7 @@ class Pacemaker(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): + def setup(self): + self.add_copy_spec([ + "/var/lib/pacemaker/cib/cib.xml", +- "/etc/sysconfig/pacemaker", ++ self.defaults, + "/var/log/pacemaker.log", + "/var/log/pcsd/pcsd.log" + ]) +@@ -76,4 +77,13 @@ class Pacemaker(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): + r"\1********" + ) + ++ ++class RedHatPacemaker(Pacemaker, RedHatPlugin): ++ """ Handle alternate location of pacemaker defaults file. ++ """ ++ def setup(self): ++ self.defaults = "/etc/sysconfig/pacemaker" ++ super(RedHatPacemaker, self).setup() ++ ++ + # vim: et ts=4 sw=4 +-- +2.7.4 + + +From 15b01889292ee3fca68ea76523be93af3be138f6 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Wed, 3 May 2017 09:48:29 +0200 +Subject: [PATCH 2/2] [pacemaker] Collect user-defined logfile + +/etc/sysconfig/pacemaker or /etc/default/pacemaker can specify pacemaker's +logfile that sos should collect. + +Resolves: #1002. + +Signed-off-by: Pavel Moravec +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/pacemaker.py | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/sos/plugins/pacemaker.py b/sos/plugins/pacemaker.py +index 74de433..9393831 100644 +--- a/sos/plugins/pacemaker.py ++++ b/sos/plugins/pacemaker.py +@@ -15,6 +15,7 @@ + from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin + from datetime import datetime, timedelta + import re ++import os.path + + + class Pacemaker(Plugin, DebianPlugin, UbuntuPlugin): +@@ -45,6 +46,7 @@ class Pacemaker(Plugin, DebianPlugin, UbuntuPlugin): + "pcs status", + "pcs property list --all" + ]) ++ + # crm_report needs to be given a --from "YYYY-MM-DD HH:MM:SS" start + # time in order to collect data. + crm_from = (datetime.today() - +@@ -70,6 +72,21 @@ class Pacemaker(Plugin, DebianPlugin, UbuntuPlugin): + (crm_scrub, crm_dest, crm_from), + chroot=self.tmp_in_sysroot()) + ++ # collect user-defined logfiles, matching pattern: ++ # PCMK_loggfile=filename ++ # specified in the pacemaker defaults file. ++ pattern = '^\s*PCMK_logfile=[\'\"]?(\S+)[\'\"]?\s*(\s#.*)?$' ++ if os.path.isfile(self.defaults): ++ with open(self.defaults) as f: ++ for line in f: ++ if re.match(pattern, line): ++ # remove trailing and leading quote marks, in case the ++ # line is e.g. PCMK_logfile="/var/log/pacemaker.log" ++ logfile = re.search(pattern, line).group(1) ++ for regexp in [r'^"', r'"$', r'^\'', r'\'$']: ++ logfile = re.sub(regexp, '', logfile) ++ self.add_copy_spec(logfile) ++ + def postproc(self): + self.do_cmd_output_sub( + "pcs config", +-- +2.7.4 + diff --git a/SOURCES/sos-bz1438257-collect-cmds-with-return-1.patch b/SOURCES/sos-bz1438257-collect-cmds-with-return-1.patch new file mode 100644 index 0000000..973f551 --- /dev/null +++ b/SOURCES/sos-bz1438257-collect-cmds-with-return-1.patch @@ -0,0 +1,35 @@ +From a2c387ae1687170e827e0aa2b49faf759c015798 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Wed, 19 Apr 2017 14:22:50 +0100 +Subject: [PATCH] [Pugin] revert 77eb4ab (do not return output from failed + commands) + +Revert this commit: individual plugins must test the command +status (if they care): plugins that attempt to access command +output without testing command status are buggy and need to be +fixed. + +Resolves: #986. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/__init__.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py +index 5286e4b..35edcb1 100644 +--- a/sos/plugins/__init__.py ++++ b/sos/plugins/__init__.py +@@ -692,9 +692,6 @@ class Plugin(object): + if result['status'] == 126 or result['status'] == 127: + return None + +- if result['status'] == 1: +- return None +- + self._log_debug("collected output of '%s' in %s" + % (exe.split()[0], time() - start)) + +-- +2.7.4 + diff --git a/SOURCES/sos-bz1438269-ceph-collect-etc-calamari.patch b/SOURCES/sos-bz1438269-ceph-collect-etc-calamari.patch new file mode 100644 index 0000000..e3901c5 --- /dev/null +++ b/SOURCES/sos-bz1438269-ceph-collect-etc-calamari.patch @@ -0,0 +1,40 @@ +From 44f3e7332516f09738dc865e943eb70eceb50553 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Thu, 20 Apr 2017 16:19:46 +0100 +Subject: [PATCH] [ceph] fix list formatting + +Fix the formatting of the add_copy_spec() lists in ceph: make the +first conform to the sos bracing and indenting rules for lists in +argument tuples, and fix a missing comma in the second. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ceph.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py +index 06b8605..afb6e24 100644 +--- a/sos/plugins/ceph.py ++++ b/sos/plugins/ceph.py +@@ -40,7 +40,8 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): + self.add_copy_spec([ + "/var/log/ceph/*.log", + "/var/log/radosgw/*.log", +- "/var/log/calamari/*.log"], sizelimit=limit) ++ "/var/log/calamari/*.log" ++ ], sizelimit=limit) + else: + self.add_copy_spec([ + "/var/log/ceph/", +@@ -50,7 +51,7 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): + + self.add_copy_spec([ + "/etc/ceph/", +- "/etc/calamari/" ++ "/etc/calamari/", + "/var/lib/ceph/", + "/var/run/ceph/" + ]) +-- +2.7.4 + diff --git a/SOURCES/sos-bz1442078-container-test-oci.patch b/SOURCES/sos-bz1442078-container-test-oci.patch new file mode 100644 index 0000000..3b01b8f --- /dev/null +++ b/SOURCES/sos-bz1442078-container-test-oci.patch @@ -0,0 +1,180 @@ +From 471d8e86c3c174f7b075c306542c732f30893281 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Wed, 3 May 2017 16:39:25 +0100 +Subject: [PATCH 1/3] [reporting] imrove readability of Six string workaround + +Improve the readability of the changes to work around Six issue +emphasise the fact that the buffer contains line oriented data, +and introduce a helper function to test whether the string needs +the workaround to be applied or not: this shortens the list +comprehension which would otherwise overflow a single line due +to the longer buffer variable name. + +Signed-off-by: Bryn M. Reeves +--- + sos/reporting.py | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +diff --git a/sos/reporting.py b/sos/reporting.py +index 0bb7d29..a4941ad 100644 +--- a/sos/reporting.py ++++ b/sos/reporting.py +@@ -118,6 +118,17 @@ class Note(Leaf): + self.data = content + + ++def ends_bs(string): ++ """ Return True if 'string' ends with a backslash, and False otherwise. ++ ++ Define this as a named function for no other reason than that pep8 ++ now forbids binding of a lambda expression to a name: ++ ++ 'E731 do not assign a lambda expression, use a def' ++ """ ++ return string.endswith('\\') ++ ++ + class PlainTextReport(object): + """Will generate a plain text report from a top_level Report object""" + +@@ -134,16 +145,16 @@ class PlainTextReport(object): + (Note, NOTE, "- notes:"), + ) + +- buf = [] ++ line_buf = [] + + def __init__(self, report_node): + self.report_node = report_node + + def unicode(self): +- self.buf = buf = [] ++ self.line_buf = line_buf = [] + for section_name, section_contents in sorted(iteritems( + self.report_node.data)): +- buf.append(section_name + "\n" + self.DIVIDER) ++ line_buf.append(section_name + "\n" + self.DIVIDER) + for type_, format_, header in self.subsections: + self.process_subsection(section_contents, type_.ADDS_TO, + header, format_) +@@ -151,10 +162,10 @@ class PlainTextReport(object): + # Workaround python.six mishandling of strings ending in '/' by + # adding a single space following any '\' at end-of-line. + # See Six issue #60. +- buf = [(val + " ") if val.endswith('\\') else val for val in buf] ++ line_buf = [line + " " if ends_bs(line) else line for line in line_buf] + + output = u'\n'.join(map(lambda i: (i if isinstance(i, six.text_type) +- else six.u(i)), buf)) ++ else six.u(i)), line_buf)) + if six.PY3: + return output + else: +@@ -162,8 +173,8 @@ class PlainTextReport(object): + + def process_subsection(self, section, key, header, format_): + if key in section: +- self.buf.append(header) ++ self.line_buf.append(header) + for item in section.get(key): +- self.buf.append(format_ % item) ++ self.line_buf.append(format_ % item) + + # vim: set et ts=4 sw=4 : +-- +2.7.4 + + +From a81243cdd3f0e7db152251caeb478c19cd801277 Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Wed, 3 May 2017 16:42:10 +0100 +Subject: [PATCH 2/3] [plugins] work around Six string problems in HTML reports + +A workaround for Six string encoding problems involving strings +that end in '\' characters was introduced for plain text reports +in commit 3d23564: a similar fix is also needed for HTML reports, +since the same string encoding problem can occur there too: + +> /usr/lib/python2.7/site-packages/six.py(647)u() +-> return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") +(Pdb) bt + /usr/sbin/sosreport(25)() +-> main(sys.argv[1:]) + /usr/lib/python2.7/site-packages/sos/sosreport.py(1632)main() +-> sos.execute() + /usr/lib/python2.7/site-packages/sos/sosreport.py(1606)execute() +-> self.html_report() + /usr/lib/python2.7/site-packages/sos/sosreport.py(1373)html_report() +-> self._html_report() + /usr/lib/python2.7/site-packages/sos/sosreport.py(1434)_html_report() +-> self.handle_exception() + /usr/lib/python2.7/site-packages/sos/sosreport.py(1432)_html_report() +-> html = plug.report() + /usr/lib/python2.7/site-packages/sos/plugins/__init__.py(930)report() +-> + "/" + _to_u(cmd['file']) + /usr/lib/python2.7/site-packages/sos/plugins/__init__.py(44)_to_u() +-> s = six.u(s) +> /usr/lib/python2.7/site-packages/six.py(647)u() +-> return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") + +Avoid this by applying the same workaround ('\$' -> '\ $') in the +existing Plugin _to_u() helper function. + +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/__init__.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py +index 49da6f2..cd34d19 100644 +--- a/sos/plugins/__init__.py ++++ b/sos/plugins/__init__.py +@@ -36,6 +36,11 @@ from six.moves import zip, filter + + def _to_u(s): + if not isinstance(s, six.text_type): ++ # Workaround python.six mishandling of strings ending in '\' by ++ # adding a single space following any '\' at end-of-line. ++ # See Six issue #60. ++ if s.endswith('\\'): ++ s += " " + s = six.u(s) + return s + +-- +2.7.4 + + +From 5e3ae1cf78cbd7dd122ed229add39e89aefdc21e Mon Sep 17 00:00:00 2001 +From: "Bryn M. Reeves" +Date: Wed, 3 May 2017 16:47:04 +0100 +Subject: [PATCH 3/3] [policies/redhat] accept 'oci' as a valid container type + +Currently the Red Hat container policy accepts 'container=docker' +as a valid indication that we are running in a container and to +enable sysroot and host sysroot checks. + +More recent Red Hat container infrastructure has change to setting +'container=oci', so recognise this value as well. + +Signed-off-by: Bryn M. Reeves +--- + sos/policies/redhat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py +index a1565c6..a6e3712 100644 +--- a/sos/policies/redhat.py ++++ b/sos/policies/redhat.py +@@ -84,7 +84,7 @@ class RedHatPolicy(LinuxPolicy): + specific initialisation based on ENV_HOST_SYSROOT. + """ + if ENV_CONTAINER in os.environ: +- if os.environ[ENV_CONTAINER] == 'docker': ++ if os.environ[ENV_CONTAINER] in ['docker', 'oci']: + self._in_container = True + if ENV_HOST_SYSROOT in os.environ: + self._host_sysroot = os.environ[ENV_HOST_SYSROOT] +-- +2.7.4 + diff --git a/SOURCES/sos-bz1444641-virsh-uncaught-exception.patch b/SOURCES/sos-bz1444641-virsh-uncaught-exception.patch new file mode 100644 index 0000000..34abe2f --- /dev/null +++ b/SOURCES/sos-bz1444641-virsh-uncaught-exception.patch @@ -0,0 +1,50 @@ +From 3b41178154354277efc2f42a425904f32cef2c66 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Sun, 23 Apr 2017 20:41:52 +0200 +Subject: [PATCH] [virsh] Handle properly cases when virsh commands fail + +When parsing output of "virsh -r *" commands, handle properly cases +when either command fails - do not parse the output then. + +Resolves: #997 + +Signed-off-by: Pavel Moravec +--- + sos/plugins/virsh.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py +index bc0a35f..4150522 100644 +--- a/sos/plugins/virsh.py ++++ b/sos/plugins/virsh.py +@@ -52,10 +52,10 @@ class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + # get network, pool and nwfilter elements + for k in ['net', 'nwfilter', 'pool']: + self.add_cmd_output('%s %s-list' % (cmd, k)) +- k_file = self.get_cmd_output_now('%s %s-list' % (cmd, k)) +- if k_file: +- k_lines = open(k_file, 'r').read().splitlines() +- # the 'name' column position changes between virsh cmds ++ k_list = self.get_command_output('%s %s-list' % (cmd, k)) ++ if k_list and k_list['status'] == 0: ++ k_lines = k_list['output'].splitlines() ++ # the 'Name' column position changes between virsh cmds + pos = k_lines[0].split().index('Name') + for j in filter(lambda x: x, k_lines[2:]): + n = j.split()[pos] +@@ -63,9 +63,9 @@ class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + + # cycle through the VMs/domains list, ignore 2 header lines and latest + # empty line, and dumpxml domain name in 2nd column +- domains_file = self.get_cmd_output_now('%s list --all' % cmd) +- if domains_file: +- domains_lines = open(domains_file, "r").read().splitlines()[2:] ++ domains_output = self.get_command_output('%s list --all' % cmd) ++ if domains_output and domains_output['status'] == 0: ++ domains_lines = domains_output['output'].splitlines()[2:] + for domain in filter(lambda x: x, domains_lines): + d = domain.split()[1] + for x in ['dumpxml', 'dominfo', 'domblklist']: +-- +2.7.4 + diff --git a/SOURCES/sos-bz1449904-ceph-tmp-mount-exclude.patch b/SOURCES/sos-bz1449904-ceph-tmp-mount-exclude.patch new file mode 100644 index 0000000..c47ea8d --- /dev/null +++ b/SOURCES/sos-bz1449904-ceph-tmp-mount-exclude.patch @@ -0,0 +1,37 @@ +From 7da0d24619928690f4999ffc1693b643b612f130 Mon Sep 17 00:00:00 2001 +From: Tomas Petr +Date: Thu, 11 May 2017 11:16:33 +0200 +Subject: [PATCH] [ceph] exclude temporary mount locations from collection + +Do not collect temporary mount paths at /var/lib/ceph/tmp/mnt.XXXX. + +Resolves #1006 +Replaces #1005 + +Signed-off-by: Tomas Petr +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ceph.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py +index 1be7fd9..0b375d1 100644 +--- a/sos/plugins/ceph.py ++++ b/sos/plugins/ceph.py +@@ -81,6 +81,13 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): + self.add_forbidden_path("/var/lib/ceph/*/*/*keyring*") + self.add_forbidden_path("/var/lib/ceph/osd/*") + self.add_forbidden_path("/var/lib/ceph/mon/*") ++ ++# Excludes temporary ceph-osd mount location like ++# /var/lib/ceph/tmp/mnt.XXXX from sos collection. ++# In the /var/lib/ceph/tmp/ can still other files of potential ++# interest exists, so exclude only known temporary mount locations. ++ ++ self.add_forbidden_path("/var/lib/ceph/tmp/*mnt*") + self.add_forbidden_path("/etc/ceph/*bindpass*") + + # vim: set et ts=4 sw=4 : +-- +2.7.4 + diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch deleted file mode 100644 index 13eb15b..0000000 --- a/SOURCES/sos-centos-branding.patch +++ /dev/null @@ -1,1380 +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.2.orig/sos/plugins/cs.py sos-3.2/sos/plugins/cs.py ---- sos-3.2.orig/sos/plugins/cs.py 2014-09-30 12:38:28.000000000 -0500 -+++ sos-3.2/sos/plugins/cs.py 2015-03-09 14:58:20.085778645 -0500 -@@ -54,7 +54,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("Certificate System not found.") - return - if csversion == 71: - self.add_copy_spec([ -diff -uNrp sos-3.2.orig/sos/plugins/rhui.py sos-3.2/sos/plugins/rhui.py ---- sos-3.2.orig/sos/plugins/rhui.py 2014-09-30 12:38:28.000000000 -0500 -+++ sos-3.2/sos/plugins/rhui.py 2015-03-09 14:59:16.909478057 -0500 -@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl - - - class Rhui(Plugin, RedHatPlugin): -- """Red Hat Update Infrastructure -+ """Update Infrastructure - """ - - plugin_name = 'rhui' -diff -uNrp sos-3.3.orig/sos/plugins/apache.py sos-3.3/sos/plugins/apache.py ---- sos-3.3.orig/sos/plugins/apache.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/apache.py 2016-11-29 17:52:51.172397399 +0000 -@@ -47,7 +47,7 @@ class RedHatApache(Apache, RedHatPlugin) - # JBoss Enterprise Web Server 2.x - "/etc/httpd22/conf/httpd.conf", - "/etc/httpd22/conf.d/*.conf", -- # Red Hat JBoss Web Server 3.x -+ # JBoss Web Server 3.x - "/etc/httpd24/conf/httpd.conf", - "/etc/httpd24/conf.d/*.conf", - "/etc/httpd24/conf.modules.d/*.conf", -@@ -65,7 +65,7 @@ class RedHatApache(Apache, RedHatPlugin) - self.add_copy_spec_limit("/var/log/httpd22/error_log", 5) - self.add_copy_spec_limit("/var/log/httpd22/ssl_access_log", 5) - self.add_copy_spec_limit("/var/log/httpd22/ssl_error_log", 5) -- # Red Hat JBoss Web Server 3.x -+ # JBoss Web Server 3.x - self.add_copy_spec_limit("/var/log/httpd24/access_log", 5) - self.add_copy_spec_limit("/var/log/httpd24/error_log", 5) - self.add_copy_spec_limit("/var/log/httpd24/ssl_access_log", 5) -@@ -75,7 +75,7 @@ class RedHatApache(Apache, RedHatPlugin) - "/var/log/httpd/*", - # JBoss Enterprise Web Server 2.x - "/var/log/httpd22/*", -- # Red Hat JBoss Web Server 3.x -+ # JBoss Web Server 3.x - "/var/log/httpd24/*" - ]) - -diff -uNrp sos-3.3.orig/sos/plugins/cman.py sos-3.3/sos/plugins/cman.py ---- sos-3.3.orig/sos/plugins/cman.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/cman.py 2016-11-29 17:53:16.213291435 +0000 -@@ -18,7 +18,7 @@ from glob import glob - - - class Cman(Plugin, RedHatPlugin): -- """cman based Red Hat Cluster High Availability -+ """cman based Cluster High Availability - """ - - plugin_name = "cman" -diff -uNrp sos-3.3.orig/sos/plugins/hts.py sos-3.3/sos/plugins/hts.py ---- sos-3.3.orig/sos/plugins/hts.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/hts.py 2016-11-29 17:53:37.484205901 +0000 -@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl - - - class HardwareTestSuite(Plugin, RedHatPlugin): -- """Red Hat Hardware Test Suite -+ """Hardware Test Suite - """ - - plugin_name = 'hts' -diff -uNrp sos-3.3.orig/sos/plugins/__init__.py sos-3.3/sos/plugins/__init__.py ---- sos-3.3.orig/sos/plugins/__init__.py 2016-11-29 17:50:21.145173306 +0000 -+++ sos-3.3/sos/plugins/__init__.py 2016-11-29 17:54:05.412099267 +0000 -@@ -948,7 +948,7 @@ class Plugin(object): - - - class RedHatPlugin(object): -- """Tagging class for Red Hat's Linux distributions""" -+ """Tagging class for CentOS Linux distributions""" - pass - - -diff -uNrp sos-3.3.orig/sos/plugins/insights.py sos-3.3/sos/plugins/insights.py ---- sos-3.3.orig/sos/plugins/insights.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/insights.py 2016-11-29 17:54:28.404015881 +0000 -@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl - - - class RedHatAccessInsights(Plugin, RedHatPlugin): -- '''Collect config and log for Red Hat Access Insights -+ '''Collect config and log for Access Insights - ''' - plugin_name = 'insights' - packages = ['redhat-access-insights'] -diff -uNrp sos-3.3.orig/sos/plugins/kubernetes.py sos-3.3/sos/plugins/kubernetes.py ---- sos-3.3.orig/sos/plugins/kubernetes.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/kubernetes.py 2016-11-29 17:54:48.946944417 +0000 -@@ -23,7 +23,7 @@ class kubernetes(Plugin, RedHatPlugin): - """Kubernetes plugin - """ - -- # Red Hat Atomic Platform and OpenShift Enterprise use the -+ # Atomic Platform and OpenShift Enterprise use the - # atomic-openshift-master package to provide kubernetes - packages = ('kubernetes', 'kubernetes-master', 'atomic-openshift-master') - files = ("/etc/origin/master/master-config.yaml",) -diff -uNrp sos-3.3.orig/sos/plugins/networking.py sos-3.3/sos/plugins/networking.py ---- sos-3.3.orig/sos/plugins/networking.py 2016-11-29 17:50:21.158173284 +0000 -+++ sos-3.3/sos/plugins/networking.py 2016-11-29 17:55:11.772878627 +0000 -@@ -310,7 +310,7 @@ class RedHatNetworking(Networking, RedHa - trace_host = "rhn.redhat.com" - - def setup(self): -- # Handle change from -T to -W in Red Hat netstat 2.0 and greater. -+ # Handle change from -T to -W in netstat 2.0 and greater. - try: - netstat_pkg = self.policy().package_manager.all_pkgs()['net-tools'] - # major version -diff -uNrp sos-3.3.orig/sos/plugins/openstack_sahara.py sos-3.3/sos/plugins/openstack_sahara.py ---- sos-3.3.orig/sos/plugins/openstack_sahara.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/plugins/openstack_sahara.py 2016-11-29 17:55:39.243807483 +0000 -@@ -65,7 +65,7 @@ class DebianSahara(OpenStackSahara, Debi - - - class RedHatSahara(OpenStackSahara, RedHatPlugin): -- """OpenStack sahara related information for Red Hat distributions.""" -+ """OpenStack sahara related information for CentOS distributions.""" - - packages = ( - 'openstack-sahara', -diff -uNrp sos-3.3.orig/sos/policies/redhat.py sos-3.3/sos/policies/redhat.py ---- sos-3.3.orig/sos/policies/redhat.py 2016-06-29 18:24:47.000000000 +0000 -+++ sos-3.3/sos/policies/redhat.py 2016-11-29 17:58:36.427534650 +0000 -@@ -34,9 +34,9 @@ except: - - - 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/" - _redhat_release = '/etc/redhat-release' - _tmp_dir = "/var/tmp" - _rpmq_cmd = 'rpm -qa --queryformat "%{NAME}|%{VERSION}\\n"' -@@ -74,9 +74,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.""" -+ Fedora, RHEL or other CentOS distribution or False otherwise.""" - return False - - def _container_init(self): -@@ -124,14 +124,14 @@ class RedHatPolicy(LinuxPolicy): - def get_local_name(self): - return self.host_name() - --# Container environment variables on Red Hat systems. -+# Container environment variables on CentOS systems. - ENV_CONTAINER = 'container' - ENV_HOST_SYSROOT = 'HOST' - - - class RHELPolicy(RedHatPolicy): -- distro = "Red Hat Enterprise Linux" -- vendor = "Red Hat" -+ distro = "CentOS Linux" -+ vendor = "CentOS" - vendor_url = "https://access.redhat.com/support/" - msg = _("""\ - This command will collect diagnostic and configuration \ -@@ -196,7 +196,7 @@ No changes will be made to system config - - - class RedHatAtomicPolicy(RHELPolicy): -- distro = "Red Hat Atomic Host" -+ distro = "CentOS Atomic Host" - msg = _("""\ - This command will collect diagnostic and configuration \ - information from this %(distro)s system. diff --git a/SPECS/sos.spec b/SPECS/sos.spec index e453c64..5548960 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: A set of tools to gather troubleshooting information from a system Name: sos -Version: 3.3 +Version: 3.4 Release: 5%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz @@ -17,17 +17,16 @@ Requires: bzip2 Requires: xz Obsoletes: sos-plugins-openstack Patch0: skip-generating-doc.patch -Patch1: sos-bz1116670-grub2-mkconfig-dont-load-kernel-modules.patch -Patch2: sos-bz1260607-ceph-skip-keyring-bindpass-files.patch -Patch3: sos-bz1353552-virtwho-plugin.patch -Patch4: sos-bz1302146-atomichost-info-policy-style.patch -Patch5: sos-bz1356945-monit-copy-spec-string.patch -Patch6: sos-bz1299603-omsa-chassis-summary-storage-controller.patch -Patch7: sos-bz1351647-docker-more-data-expand-options.patch -Patch8: sos-bz1368393-nodejs-npm-plugins.patch -Patch9: sos-bz1374152-networking-no-net-tools.patch -Patch10: sos-bz1392038-network-name-with-quotemark.patch -Patch11: sos-centos-branding.patch +Patch1: sos-bz1438257-collect-cmds-with-return-1.patch +Patch2: sos-bz1438269-ceph-collect-etc-calamari.patch +Patch3: sos-bz1444641-virsh-uncaught-exception.patch +Patch4: sos-bz1250346-openstack-tripleo.patch +Patch5: sos-bz1442078-container-test-oci.patch +Patch6: sos-bz1416535-pacemaker-user-logs.patch +Patch7: sos-bz1148381-libvirt-cgroups-collection.patch +Patch8: sos-bz1449904-ceph-tmp-mount-exclude.patch +Patch9: sos-bz1393961-missing-filesystem-nonfatal.patch +Patch10: sos-bz1400407-samba-dc-connect.patch %description Sos is a set of tools that gathers information about system @@ -48,7 +47,6 @@ support technicians and developers. %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 %build make @@ -72,12 +70,40 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/sos.conf %changelog -* Tue Dec 06 2016 CentOS Sources - 3.3-5.el7.centos -- Roll in CentOS Branding +* Tue May 30 2017 Pavel Moravec = 3.4-5 +- [samba] Fix dc-connect winbind logfile path + Resolves: bz1400407 + +* Mon May 22 2017 Pavel Moravec = 3.4-4 +- [libvirt] fix per-process cgroup collection + Resolves: bz1148381 +- [ceph] exclude temporary mount locations from collection + Resolves: bz1449904 +- [policies/redhat] make missing 'filesystem' package non-fatal + Resolves: bz1393961 + +* Wed May 10 2017 Pavel Moravec = 3.4-3 +- [ceph] fix list formatting + Resolves: bz1438269 +- [virsh] Handle properly cases when virsh commands fail + Resolves: bz1444641 +- [openstack_*] fix issue with --verify option, extend pkglist for instack + Resolves: bz1250346 +- [policies/redhat] accept 'oci' as a valid container type + Resolves: bz1442078 +- [pacemaker] Collect user-defined logfile + Resolves: bz1416535 + +* Wed Apr 19 2017 Pavel Moravec = 3.4-2 +- [Pugin] revert 77eb4ab (do not return output from failed cmds) + Resolves: bz1438257 + +* Tue Mar 28 2017 Pavel Moravec = 3.4-1 +- New upstream release sos-3.4 * Fri Nov 04 2016 Pavel Moravec = 3.3-5 - [networking] plugin crash with quotemark in network name - Resolves: bz1392038 + Resolves: bz1353992 * Fri Sep 09 2016 Pavel Moravec = 3.3-4 - [networking][reporting] plugin tracebacks when net-tools missing