From 8ebe5f42e964b6d51b5f45ef8c666d58336d7fd9 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Mon, 10 Jan 2022 19:49:39 +0100 Subject: [PATCH] sos updates to RHEL9.0 Resolves: bz2037350 Signed-off-by: Pavel Moravec --- sos-bz2037350-ocp-backports.patch | 24 ++++++++++++++++++++++++ sos.spec | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sos-bz2037350-ocp-backports.patch b/sos-bz2037350-ocp-backports.patch index d10d4fd..a47dc91 100644 --- a/sos-bz2037350-ocp-backports.patch +++ b/sos-bz2037350-ocp-backports.patch @@ -5624,3 +5624,27 @@ index ffd63bc63..3e22bca3e 100644 self.log_error(msg) try: self.close_all_connections() +From ef27a6ee6737c23b3beda1437768a91679024697 Mon Sep 17 00:00:00 2001 +From: Nadia Pinaeva +Date: Fri, 3 Dec 2021 15:41:35 +0100 +Subject: [PATCH] Add journal logs for NetworkManager plugin + +Signed-off-by: Nadia Pinaeva +--- + sos/report/plugins/networkmanager.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sos/report/plugins/networkmanager.py b/sos/report/plugins/networkmanager.py +index 30f99a1140..3aca0c7460 100644 +--- a/sos/report/plugins/networkmanager.py ++++ b/sos/report/plugins/networkmanager.py +@@ -25,6 +25,8 @@ def setup(self): + "/etc/NetworkManager/dispatcher.d" + ]) + ++ self.add_journal(units="NetworkManager") ++ + # There are some incompatible changes in nmcli since + # the release of NetworkManager >= 0.9.9. In addition, + # NetworkManager >= 0.9.9 will use the long names of + diff --git a/sos.spec b/sos.spec index c054d8e..5094ccc 100644 --- a/sos.spec +++ b/sos.spec @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 4.2 -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -137,8 +137,8 @@ of the system. Currently storage and filesystem commands are audited. %changelog -* Mon Jan 10 2022 Pavel Moravec = 4.2-10 -- [collector] Cleanup cluster only if defined +* Mon Jan 10 2022 Pavel Moravec = 4.2-11 +- [reort] Add journal logs for NetworkManager plugin Resolves: bz2037350 * Fri Jan 07 2022 Pavel Moravec = 4.2-9