diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/sos-3.6-centos-branding.patch b/SOURCES/sos-3.6-centos-branding.patch deleted file mode 100644 index f88d36e..0000000 --- a/SOURCES/sos-3.6-centos-branding.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -uNrp sos-3.6.orig/sos/policies/redhat.py sos-3.6/sos/policies/redhat.py ---- sos-3.6.orig/sos/policies/redhat.py 2018-11-04 17:44:59.513116585 +0000 -+++ sos-3.6/sos/policies/redhat.py 2018-11-04 17:53:28.333731059 +0000 -@@ -32,9 +32,9 @@ OS_RELEASE = "/etc/os-release" - - - 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}|%{RELEASE}\\n"' -@@ -92,9 +92,9 @@ class RedHatPolicy(LinuxPolicy): - - @classmethod - def check(cls): -- """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 CentOS distribution or False otherwise.""" - return False - - def check_usrmove(self, pkgs): -@@ -185,7 +185,7 @@ class RedHatPolicy(LinuxPolicy): - return self.host_name() - - --# Container environment variables on Red Hat systems. -+# Container environment variables on CentOS systems. - ENV_CONTAINER = 'container' - ENV_HOST_SYSROOT = 'HOST' - -@@ -195,22 +195,22 @@ _opts_all_logs_verify = SoSOptions(all_l - _opts_all_logs_no_lsof = SoSOptions(all_logs=True, - plugopts=['process.lsof=off']) - --RHEL_RELEASE_STR = "Red Hat Enterprise Linux" -+RHEL_RELEASE_STR = "CentOS Linux" - - RHV = "rhv" --RHV_DESC = "Red Hat Virtualization" -+RHV_DESC = "CentOS Virtualization" - - RHEL = "rhel" - RHEL_DESC = RHEL_RELEASE_STR - - RHOSP = "rhosp" --RHOSP_DESC = "Red Hat OpenStack Platform" -+RHOSP_DESC = "RDO" - - RHOCP = "ocp" --RHOCP_DESC = "OpenShift Container Platform by Red Hat" -+RHOCP_DESC = "OpenShift" - - RH_SATELLITE = "satellite" --RH_SATELLITE_DESC = "Red Hat Satellite" -+RH_SATELLITE_DESC = "Satellite" - - NOTE_SIZE = "This preset may increase report size" - NOTE_TIME = "This preset may increase report run time" -@@ -230,9 +230,9 @@ rhel_presets = { - - - class RHELPolicy(RedHatPolicy): -- distro = RHEL_RELEASE_STR -- vendor = "Red Hat" -- vendor_url = "https://access.redhat.com/support/" -+ distro = "CentOS Linux" -+ vendor = "CentOS" -+ vendor_url = "https://wiki.centos.org/" - msg = _("""\ - This command will collect diagnostic and configuration \ - information from this %(distro)s system and installed \ -@@ -262,7 +262,7 @@ No changes will be made to system config - def check(cls): - """Test to see if the running host is a RHEL installation. - -- Checks for the presence of the "Red Hat Enterprise Linux" -+ Checks for the presence of the "CentOS Linux" - release string at the beginning of the NAME field in the - `/etc/os-release` file and returns ``True`` if it is - found, and ``False`` otherwise. -@@ -324,7 +324,7 @@ No changes will be made to system config - - ATOMIC = "atomic" - ATOMIC_RELEASE_STR = "Atomic" --ATOMIC_DESC = "Red Hat Enterprise Linux Atomic Host" -+ATOMIC_DESC = "CentOS Linux Atomic Host" - - atomic_presets = { - ATOMIC: PresetDefaults(name=ATOMIC, desc=ATOMIC_DESC, note=NOTE_TIME, -@@ -333,7 +333,7 @@ atomic_presets = { - - - 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/SOURCES/sos-bz1751171-vdsm-bin-sh.patch b/SOURCES/sos-bz1751171-vdsm-bin-sh.patch new file mode 100644 index 0000000..c0949fa --- /dev/null +++ b/SOURCES/sos-bz1751171-vdsm-bin-sh.patch @@ -0,0 +1,36 @@ +From 0c83c8245ffab2ff3f568078651553f59ef475bb Mon Sep 17 00:00:00 2001 +From: Martin Perina +Date: Wed, 21 Aug 2019 11:17:44 +0200 +Subject: [PATCH] [vdsm]: Fix executing shell commands + +During review process of [1] it was suggested to replace '/bin/sh' with +just 'sh', but unfortunately this change caused an error to not include +information about VDSM mount points as described in [2]. This fix +restores previous state and add full path to shell executions. + +[1] https://github.com/sosreport/sos/pull/1205 +[2] https://bugzilla.redhat.com/1743304 + +Resolves: #1761 + +Signed-off-by: Martin Perina +Signed-off-by: Pavel Moravec +--- + sos/plugins/vdsm.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sos/plugins/vdsm.py b/sos/plugins/vdsm.py +index 35eec5093..c4e2af5f6 100644 +--- a/sos/plugins/vdsm.py ++++ b/sos/plugins/vdsm.py +@@ -93,8 +93,8 @@ def setup(self): + ]) + self.add_cmd_output([ + "ls -ldZ /etc/vdsm", +- "su vdsm -s sh -c 'tree -l /rhev/data-center'", +- "su vdsm -s sh -c 'ls -lR /rhev/data-center'" ++ "su vdsm -s /bin/sh -c 'tree -l /rhev/data-center'", ++ "su vdsm -s /bin/sh -c 'ls -lR /rhev/data-center'" + ]) + self.add_cmd_output([ + "lvm vgs -v -o +tags --config \'%s\'" % LVM_CONFIG, diff --git a/SOURCES/sos-bz1767359-ovn-plugins-containerized-env.patch b/SOURCES/sos-bz1767359-ovn-plugins-containerized-env.patch new file mode 100644 index 0000000..9a97377 --- /dev/null +++ b/SOURCES/sos-bz1767359-ovn-plugins-containerized-env.patch @@ -0,0 +1,326 @@ +From cc6374914a47eb3777c5b8306506df43522a31e0 Mon Sep 17 00:00:00 2001 +From: Daniel Alvarez +Date: Thu, 18 Jul 2019 14:08:27 +0200 +Subject: [PATCH] [ovn_central] add additional show commands + +This patch is adding 'show' commands for both OVN +NorthBound and SouthBound databases. + +Signed-off-by: Daniel Alvarez +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ovn_central.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sos/plugins/ovn_central.py b/sos/plugins/ovn_central.py +index e05856872..2d2526253 100644 +--- a/sos/plugins/ovn_central.py ++++ b/sos/plugins/ovn_central.py +@@ -57,6 +57,8 @@ def setup(self): + + # Some user-friendly versions of DB output + cmds = [ ++ 'ovn-nbctl show', ++ 'ovn-sbctl show', + 'ovn-sbctl lflow-list', + 'ovn-nbctl get-ssl', + 'ovn-nbctl get-connection', +From 5fd4e850ad9a6636d0fb206954e8ab016584974d Mon Sep 17 00:00:00 2001 +From: Daniel Alvarez +Date: Wed, 11 Sep 2019 16:19:15 +0100 +Subject: [PATCH] [ovn_host] fix Open_vSwitch table name + +Signed-off-by: Daniel Alvarez +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ovn_host.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sos/plugins/ovn_host.py b/sos/plugins/ovn_host.py +index 542516279..ba35d87e7 100644 +--- a/sos/plugins/ovn_host.py ++++ b/sos/plugins/ovn_host.py +@@ -35,7 +35,7 @@ def setup(self): + self.add_cmd_output([ + 'ovs-ofctl -O OpenFlow13 dump-flows br-int', + 'ovs-vsctl list-br', +- 'ovs-vsctl list OpenVswitch', ++ 'ovs-vsctl list Open_vSwitch', + ]) + + self.add_journal(units="ovn-controller") +From 3c842046e9c4c5b371566347f51e5e242daf4f8d Mon Sep 17 00:00:00 2001 +From: Daniel Alvarez +Date: Tue, 23 Jul 2019 12:44:07 +0200 +Subject: [PATCH] [ovn_central] Add support to containerized setups + +This patch is adding support in ovn_central plugin to containerized +setups. + +Now it's detecting if the OVN central services are running in +container and execute the relevant commands inside it. The support +covers both podman and docker runtimes. + +Signed-off-by: Daniel Alvarez +--- + sos/plugins/ovn_central.py | 94 ++++++++++++++++++++++++++++---------- + 1 file changed, 69 insertions(+), 25 deletions(-) + +diff --git a/sos/plugins/ovn_central.py b/sos/plugins/ovn_central.py +index 2d2526253..a9fcdf33e 100644 +--- a/sos/plugins/ovn_central.py ++++ b/sos/plugins/ovn_central.py +@@ -19,30 +19,64 @@ class OVNCentral(Plugin): + """ + plugin_name = "ovn_central" + profiles = ('network', 'virt') +- +- def add_database_output(self, filename, cmds, ovn_cmd, skip=[]): ++ _container_runtime = None ++ _container_name = None ++ ++ def get_tables_from_schema(self, filename, skip=[]): ++ if self._container_name: ++ cmd = "%s exec %s cat %s" % ( ++ self._container_runtime, self._container_name, filename) ++ res = self.get_command_output(cmd) ++ if res['status'] != 0: ++ self._log_error("Could not retrieve DB schema file from " ++ "container %s" % self._container_name) ++ return ++ try: ++ db = json.loads(res['output']) ++ except Exception: ++ self._log_error("Cannot parse JSON file %s" % filename) ++ return ++ else: ++ try: ++ with open(filename, 'r') as f: ++ try: ++ db = json.load(f) ++ except Exception: ++ self._log_error( ++ "Cannot parse JSON file %s" % filename) ++ return ++ except IOError as ex: ++ self._log_error( ++ "Could not open DB schema file %s: %s" % (filename, ex)) ++ return + try: +- with open(filename, 'r') as f: +- try: +- db = json.load(f) +- except Exception: +- # If json can't be parsed, then exit early +- self._log_error("Cannot parse JSON file %s" % filename) +- return +- try: +- for table in six.iterkeys(db['tables']): +- if table not in skip: +- cmds.append('%s list %s' % (ovn_cmd, table)) +- except AttributeError: +- self._log_error("DB schema %s has no 'tables' key" % +- filename) +- return +- except IOError as ex: +- self._log_error("Could not open DB schema file %s: %s" % (filename, +- ex)) +- return ++ return [table for table in six.iterkeys( ++ db['tables']) if table not in skip] ++ except AttributeError: ++ self._log_error("DB schema %s has no 'tables' key" % filename) ++ ++ def add_database_output(self, tables, cmds, ovn_cmd): ++ for table in tables: ++ cmds.append('%s list %s' % (ovn_cmd, table)) ++ ++ def running_in_container(self): ++ for runtime in ["podman", "docker"]: ++ container_status = self.get_command_output(runtime + " ps") ++ if container_status['status'] == 0: ++ for line in container_status['output'].splitlines(): ++ if "ovn-dbs-bundle" in line: ++ self._container_name = line.split()[-1] ++ self._container_runtime = runtime ++ return True ++ return False ++ ++ def check_enabled(self): ++ return (self.running_in_container() or ++ super(OVNCentral, self).check_enabled()) + + def setup(self): ++ containerized = self.running_in_container() ++ + ovs_rundir = os.environ.get('OVS_RUNDIR') + for pidfile in ['ovnnb_db.pid', 'ovnsb_db.pid', 'ovn-northd.pid']: + self.add_copy_spec([ +@@ -68,10 +102,20 @@ def setup(self): + + schema_dir = '/usr/share/openvswitch' + +- self.add_database_output(os.path.join(schema_dir, 'ovn-nb.ovsschema'), +- cmds, 'ovn-nbctl') +- self.add_database_output(os.path.join(schema_dir, 'ovn-sb.ovsschema'), +- cmds, 'ovn-sbctl', ['Logical_Flow']) ++ nb_tables = self.get_tables_from_schema(os.path.join( ++ schema_dir, 'ovn-nb.ovsschema')) ++ sb_tables = self.get_tables_from_schema(os.path.join( ++ schema_dir, 'ovn-sb.ovsschema'), ['Logical_Flow']) ++ ++ self.add_database_output(nb_tables, cmds, 'ovn-nbctl') ++ self.add_database_output(sb_tables, cmds, 'ovn-sbctl') ++ ++ # If OVN is containerized, we need to run the above commands inside ++ # the container. ++ if containerized: ++ cmds = ['%s exec %s %s' % (self._container_runtime, ++ self._container_name, ++ cmd) for cmd in cmds] + + self.add_cmd_output(cmds) + +From a895bf4096f1dbd71c9dbd4defb47783f4ef9840 Mon Sep 17 00:00:00 2001 +From: Daniel Alvarez +Date: Thu, 25 Jul 2019 11:42:16 +0200 +Subject: [PATCH] [ovn_host] Add support for containerized setups + +Prior to this patch, ovn_host was disabled on containerized +setups due to the fact that ovn-controller package is not +installed in the host. + +This patch fixes it by checking if the ovn-controller process +is running. + +Resolves: #1767 + +Signed-off-by: Daniel Alvarez +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ovn_host.py | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/sos/plugins/ovn_host.py b/sos/plugins/ovn_host.py +index ba35d87e7..5225f010e 100644 +--- a/sos/plugins/ovn_host.py ++++ b/sos/plugins/ovn_host.py +@@ -12,6 +12,15 @@ + from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin + + ++pidfile = 'ovn-controller.pid' ++pid_paths = [ ++ '/var/lib/openvswitch/ovn', ++ '/usr/local/var/run/openvswitch', ++ '/var/run/openvswitch', ++ '/run/openvswitch' ++] ++ ++ + class OVNHost(Plugin): + """ OVN Controller + """ +@@ -19,13 +28,6 @@ class OVNHost(Plugin): + profiles = ('network', 'virt') + + def setup(self): +- pidfile = 'ovn-controller.pid' +- pid_paths = [ +- '/var/lib/openvswitch/ovn', +- '/usr/local/var/run/openvswitch', +- '/var/run/openvswitch', +- '/run/openvswitch' +- ] + if os.environ.get('OVS_RUNDIR'): + pid_paths.append(os.environ.get('OVS_RUNDIR')) + self.add_copy_spec([os.path.join(pp, pidfile) for pp in pid_paths]) +@@ -40,6 +42,11 @@ def setup(self): + + self.add_journal(units="ovn-controller") + ++ def check_enabled(self): ++ return (any([os.path.isfile( ++ os.path.join(pp, pidfile)) for pp in pid_paths]) or ++ super(OVNHost, self).check_enabled()) ++ + + class RedHatOVNHost(OVNHost, RedHatPlugin): + +From 6d623ceb2bc973a603c2abb1c8c64f2980667a0d Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Wed, 2 Oct 2019 12:19:19 +0200 +Subject: [PATCH] [ovn_central] dont add db outputs when no table is found in + schema + +When get_tables_from_schema method returns None (i.e. due to a +parsing error or missing config file), add_database_output tries +to iterate over None object, what raises an exception. + +Resolves: #1808 + +Signed-off-by: Pavel Moravec +--- + sos/plugins/ovn_central.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sos/plugins/ovn_central.py b/sos/plugins/ovn_central.py +index a9fcdf33e..b5ff96f66 100644 +--- a/sos/plugins/ovn_central.py ++++ b/sos/plugins/ovn_central.py +@@ -56,6 +56,8 @@ def get_tables_from_schema(self, filename, skip=[]): + self._log_error("DB schema %s has no 'tables' key" % filename) + + def add_database_output(self, tables, cmds, ovn_cmd): ++ if not tables: ++ return + for table in tables: + cmds.append('%s list %s' % (ovn_cmd, table)) + +From 0c9a1f0cb98c5256a0ec1dec83b7c94d3bb39170 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Wed, 4 Dec 2019 15:53:16 +0100 +Subject: [PATCH] [ovn_central] call podman exec without a timeout + +This is a workaround fix of a podman bug (see rhbz1732525) where +"podman ps" can hang when "podman exec .." is invoked in detached +mode under "timeout". + +Calling it without timeout works fine. + +This commit can be reverted once the podman bug is fixed. + +Resolves: #1875 + +Signed-off-by: Pavel Moravec +--- + sos/plugins/ovn_central.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sos/plugins/ovn_central.py b/sos/plugins/ovn_central.py +index c74bf403..32a5e1cb 100644 +--- a/sos/plugins/ovn_central.py ++++ b/sos/plugins/ovn_central.py +@@ -26,7 +26,8 @@ class OVNCentral(Plugin): + if self._container_name: + cmd = "%s exec %s cat %s" % ( + self._container_runtime, self._container_name, filename) +- res = self.get_command_output(cmd) ++ # the timeout=None is just a workaround for "podman ps" hung bug ++ res = self.get_command_output(cmd, timeout=None) + if res['status'] != 0: + self._log_error("Could not retrieve DB schema file from " + "container %s" % self._container_name) +@@ -118,7 +119,8 @@ class OVNCentral(Plugin): + self._container_name, + cmd) for cmd in cmds] + +- self.add_cmd_output(cmds) ++ # the timeout=None is just a workaround for "podman ps" hung bug ++ self.add_cmd_output(cmds, timeout=None) + + self.add_copy_spec("/etc/sysconfig/ovn-northd") + +-- +2.21.0 + diff --git a/SOURCES/sos-bz1767360-ipa-new-logs.patch b/SOURCES/sos-bz1767360-ipa-new-logs.patch new file mode 100644 index 0000000..a120ae5 --- /dev/null +++ b/SOURCES/sos-bz1767360-ipa-new-logs.patch @@ -0,0 +1,84 @@ +From f2350aece8a6980f80cfa0036382055239fd8a6b Mon Sep 17 00:00:00 2001 +From: Thorsten Scherf +Date: Mon, 1 Jul 2019 11:37:47 +0200 +Subject: [PATCH] [ipa] copy httpd cert from new location + +With the FreeIPA 4.7.0 release, httpd moved from mod_nss to mod_ssl. As a +result the httpd X.509 certificate is now no longer stored in NSS DB but as +plain PEM text file: /var/lib/ipa/certs/httpd.crt. The plugin needs to copy +this file into the sos archive. + +Closes: #1715 +Resolves: #1716 + +Signed-off-by: Thorsten Scherf +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ipa.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py +index 50f42f259..310c0fa31 100644 +--- a/sos/plugins/ipa.py ++++ b/sos/plugins/ipa.py +@@ -115,6 +115,7 @@ def setup(self): + "/var/lib/certmonger/requests/[0-9]*", + "/var/lib/certmonger/cas/[0-9]*", + "/var/lib/ipa/ra-agent.pem", ++ "/var/lib/ipa/certs/httpd.crt", + "/var/kerberos/krb5kdc/kdc.crt", + "/var/lib/ipa/sysrestore/sysrestore.state" + ]) +From 5c0b2d56313b6fa58b46802317c98b89e5a68508 Mon Sep 17 00:00:00 2001 +From: Rob Crittenden +Date: Thu, 12 Sep 2019 12:02:34 -0400 +Subject: [PATCH] [ipa] collect ipa-healthcheck logs + +Resolves: #1782 + +Signed-off-by: Rob Crittenden +Signed-off-by: Bryn M. Reeves +--- + sos/plugins/ipa.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py +index 310c0fa31..750cb6fae 100644 +--- a/sos/plugins/ipa.py ++++ b/sos/plugins/ipa.py +@@ -117,7 +117,8 @@ def setup(self): + "/var/lib/ipa/ra-agent.pem", + "/var/lib/ipa/certs/httpd.crt", + "/var/kerberos/krb5kdc/kdc.crt", +- "/var/lib/ipa/sysrestore/sysrestore.state" ++ "/var/lib/ipa/sysrestore/sysrestore.state", ++ "/var/log/ipa/healthcheck/healthcheck.log*" + ]) + + # Make sure to use the right PKI config and NSS DB folders +From 823dbabde82ee941c421482a71be572984607ad4 Mon Sep 17 00:00:00 2001 +From: Pavel Moravec +Date: Tue, 1 Oct 2019 08:26:24 +0200 +Subject: [PATCH] [ipa] collect kdcproxy configs + +Resolves: #1806 + +Signed-off-by: Pavel Moravec +--- + sos/plugins/ipa.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py +index 750cb6fae..d3454de98 100644 +--- a/sos/plugins/ipa.py ++++ b/sos/plugins/ipa.py +@@ -111,6 +111,9 @@ def setup(self): + "/etc/named.*", + "/etc/ipa/ca.crt", + "/etc/ipa/default.conf", ++ "/etc/ipa/kdcproxy/kdcproxy.conf", ++ "/etc/ipa/kdcproxy/ipa-kdc-proxy.conf", ++ "/etc/ipa/kdcproxy.conf", + "/root/.ipa/log/cli.log", + "/var/lib/certmonger/requests/[0-9]*", + "/var/lib/certmonger/cas/[0-9]*", diff --git a/SOURCES/sos-bz1767361-ovirt-hosted-cockpit-logs.patch b/SOURCES/sos-bz1767361-ovirt-hosted-cockpit-logs.patch new file mode 100644 index 0000000..e0337b2 --- /dev/null +++ b/SOURCES/sos-bz1767361-ovirt-hosted-cockpit-logs.patch @@ -0,0 +1,30 @@ +From 8203bdeb77ac0d3f32f1a88304b9a34de66ae7b6 Mon Sep 17 00:00:00 2001 +From: Gobinda Das +Date: Sat, 10 Aug 2019 13:36:36 +0530 +Subject: [PATCH] [ovirt_hosted_engine] Add gluster deployment and cleanup log + +Resolves: #1748 + +Signed-off-by: Gobinda Das +Signed-off-by: Pavel Moravec +--- + sos/plugins/ovirt_hosted_engine.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/sos/plugins/ovirt_hosted_engine.py b/sos/plugins/ovirt_hosted_engine.py +index 3d1bfe36c..fefc02947 100644 +--- a/sos/plugins/ovirt_hosted_engine.py ++++ b/sos/plugins/ovirt_hosted_engine.py +@@ -48,6 +48,12 @@ def setup(self): + '/var/log/ovirt-hosted-engine-ha/agent.log', + '/var/log/ovirt-hosted-engine-ha/broker.log', + ]) ++ ++ # Add gluster deployment and cleanup log ++ self.add_copy_spec([ ++ '/var/log/cockpit/ovirt-dashboard' ++ ]) ++ + # Add older ovirt-hosted-engine-ha log files only if requested + if self.get_option('all_logs'): + self.add_copy_spec(self.HA_LOG_GLOB) diff --git a/SPECS/sos.spec b/SPECS/sos.spec index bce3e63..c144962 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 3.7 -Release: 6%{?dist} +Release: 8%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -40,6 +40,10 @@ Patch17: sos-bz1665929-nvme-config.patch Patch18: sos-bz1745017-openvswitch-enable-by-openvswitch2.patch Patch19: sos-bz1756094-kernel-no-trace-by-default.patch Patch20: sos-bz1767356-interim-sysroot-forbidden-paths.patch +Patch21: sos-bz1767361-ovirt-hosted-cockpit-logs.patch +Patch22: sos-bz1751171-vdsm-bin-sh.patch +Patch23: sos-bz1767359-ovn-plugins-containerized-env.patch +Patch24: sos-bz1767360-ipa-new-logs.patch %description Sos is a set of tools that gathers information about system @@ -69,6 +73,10 @@ support technicians and developers. %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %setup -T -D -a1 -q %build @@ -121,8 +129,19 @@ of the system. Currently storage and filesystem commands are audited. %ghost /etc/audit/rules.d/40-sos-storage.rules %changelog -* Wed Nov 06 2019 CentOS Sources - 3.7-6.el8.centos -- Apply debranding changes +* Thu Dec 05 2019 Pavel Moravec = 3.7-8 +- [ovn_central] call podman exec without a timeout + Resolves: bz1767359 + +* Thu Nov 07 2019 Pavel Moravec = 3.7-7 +- [ovirt_hosted_engine] Add gluster deployment and cleanup log + Resolves: bz1767361 +- [vdsm]: Fix executing shell commands + Resolves: bz1751171 +- [ovn_*] Add support to containerized setups + Resolves: bz1767359 +- [ipa] collect ipa-healthcheck logs, kdcproxy configs, httpd cert + Resolves: bz1767360 * Mon Nov 04 2019 Pavel Moravec = 3.7-6 - [Plugin, kernel] interim sysroot fixes