Compare commits
No commits in common. "c8" and "c8-beta" have entirely different histories.
|
@ -1,2 +1,2 @@
|
||||||
SOURCES/sos-4.7.1.tar.gz
|
SOURCES/sos-4.6.0.tar.gz
|
||||||
SOURCES/sos-audit-0.3.tgz
|
SOURCES/sos-audit-0.3.tgz
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
9ced981872d308e13c5dc47fee21071592ceefc2 SOURCES/sos-4.7.1.tar.gz
|
90d8b664a4e0593d60357342bb5f73af9908e29d SOURCES/sos-4.6.0.tar.gz
|
||||||
9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz
|
9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
From a0c2586e230c9600d3d3f70ab89c9f6eb52ed3ed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pavel Moravec <pmoravec@redhat.com>
|
|
||||||
Date: Tue, 23 Apr 2024 11:00:11 +0200
|
|
||||||
Subject: [PATCH] [archive] Fix get_archive_root after files reordering
|
|
||||||
|
|
||||||
Commit d5d8c21 reordered files in the archive, such that the first
|
|
||||||
member is not the archive root directory further more. Let change the
|
|
||||||
get_archive_root method accordingly to prevent self.archive_root being
|
|
||||||
empty.
|
|
||||||
|
|
||||||
Resolves: #3616
|
|
||||||
|
|
||||||
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
||||||
---
|
|
||||||
sos/cleaner/archives/__init__.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/sos/cleaner/archives/__init__.py b/sos/cleaner/archives/__init__.py
|
|
||||||
index f7c5eb587..0fa1ef43f 100644
|
|
||||||
--- a/sos/cleaner/archives/__init__.py
|
|
||||||
+++ b/sos/cleaner/archives/__init__.py
|
|
||||||
@@ -104,7 +104,7 @@ def get_archive_root(self):
|
|
||||||
if toplevel.isdir():
|
|
||||||
return toplevel.name
|
|
||||||
else:
|
|
||||||
- return os.sep
|
|
||||||
+ return os.path.dirname(toplevel.name) or os.sep
|
|
||||||
return os.path.abspath(self.archive_path)
|
|
||||||
|
|
||||||
def report_msg(self, msg):
|
|
|
@ -0,0 +1,126 @@
|
||||||
|
From 43714aa5aeb3dcb0dec17dd026ca5c394cc06afd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
Date: Fri, 11 Aug 2023 14:30:42 +0200
|
||||||
|
Subject: [PATCH] Collect additional ovnkube node logs
|
||||||
|
|
||||||
|
With Interconnect support in latest OVN-Kubernetes, ovnkube-nodes
|
||||||
|
logs grew large. This commit adds the ability to collect those
|
||||||
|
additional logs.
|
||||||
|
|
||||||
|
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
---
|
||||||
|
sos/report/plugins/openshift_ovn.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
|
||||||
|
index d81fc97aa..2d804e9ae 100644
|
||||||
|
--- a/sos/report/plugins/openshift_ovn.py
|
||||||
|
+++ b/sos/report/plugins/openshift_ovn.py
|
||||||
|
@@ -30,7 +30,8 @@ def setup(self):
|
||||||
|
# Collect ovn interconnect specific files if exists.
|
||||||
|
self.add_copy_spec([
|
||||||
|
"/var/lib/ovn-ic/etc/ovnnb_db.db",
|
||||||
|
- "/var/lib/ovn-ic/etc/ovnsb_db.db"
|
||||||
|
+ "/var/lib/ovn-ic/etc/ovnsb_db.db",
|
||||||
|
+ "/var/lib/ovn-ic/etc/libovsdb*log*"
|
||||||
|
])
|
||||||
|
|
||||||
|
# The ovn cluster/status is not valid anymore for interconnect setup.
|
||||||
|
From e11a594f942f9ae98aeb644c573293b391050657 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
Date: Tue, 15 Aug 2023 11:47:20 +0200
|
||||||
|
Subject: [PATCH] Collect ovn logs as much as possible
|
||||||
|
|
||||||
|
The sosreport limits to collect logs at maximum of 25 MB in a given
|
||||||
|
collection passed into add_copy_spec method. so this may lead into
|
||||||
|
logs wouldn't have fully collected when user collected sos report
|
||||||
|
without --all-logs option.
|
||||||
|
Hence this commit ensures logs and dbs collected as much as possible
|
||||||
|
when --all-logs option is not specified.
|
||||||
|
|
||||||
|
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
---
|
||||||
|
sos/report/plugins/openshift_ovn.py | 25 +++++++++++++++++--------
|
||||||
|
1 file changed, 17 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
|
||||||
|
index 2d804e9ae..347b15eea 100644
|
||||||
|
--- a/sos/report/plugins/openshift_ovn.py
|
||||||
|
+++ b/sos/report/plugins/openshift_ovn.py
|
||||||
|
@@ -20,19 +20,28 @@ class OpenshiftOVN(Plugin, RedHatPlugin):
|
||||||
|
profiles = ('openshift',)
|
||||||
|
|
||||||
|
def setup(self):
|
||||||
|
+ all_logs = self.get_option("all_logs")
|
||||||
|
+
|
||||||
|
self.add_copy_spec([
|
||||||
|
"/var/lib/ovn/etc/ovnnb_db.db",
|
||||||
|
"/var/lib/ovn/etc/ovnsb_db.db",
|
||||||
|
- "/var/lib/openvswitch/etc/keys",
|
||||||
|
- "/var/log/openvswitch/libreswan.log",
|
||||||
|
- "/var/log/openvswitch/ovs-monitor-ipsec.log"
|
||||||
|
- ])
|
||||||
|
- # Collect ovn interconnect specific files if exists.
|
||||||
|
+ "/var/lib/openvswitch/etc/keys"
|
||||||
|
+ ], sizelimit=300)
|
||||||
|
+
|
||||||
|
+ # Collect ovn interconnect specific db files if exists.
|
||||||
|
self.add_copy_spec([
|
||||||
|
"/var/lib/ovn-ic/etc/ovnnb_db.db",
|
||||||
|
- "/var/lib/ovn-ic/etc/ovnsb_db.db",
|
||||||
|
- "/var/lib/ovn-ic/etc/libovsdb*log*"
|
||||||
|
- ])
|
||||||
|
+ "/var/lib/ovn-ic/etc/ovnsb_db.db"
|
||||||
|
+ ], sizelimit=300)
|
||||||
|
+
|
||||||
|
+ # Collect libovsdb logs in case of ovn interconnect setup.
|
||||||
|
+ if not all_logs:
|
||||||
|
+ self.add_copy_spec([
|
||||||
|
+ "/var/lib/ovn-ic/etc/libovsdb.log",
|
||||||
|
+ "/var/lib/ovn-ic/etc/libovsdb*log.gz"
|
||||||
|
+ ], sizelimit=100)
|
||||||
|
+ else:
|
||||||
|
+ self.add_copy_spec("/var/lib/ovn-ic/etc/libovsdb*log*")
|
||||||
|
|
||||||
|
# The ovn cluster/status is not valid anymore for interconnect setup.
|
||||||
|
self.add_cmd_output([
|
||||||
|
From 7cd6f61fd15ae7fc93d62cca927204351cdc1322 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
Date: Wed, 30 Aug 2023 09:56:40 +0200
|
||||||
|
Subject: [PATCH] Collect logs from ovnkube-controller container
|
||||||
|
|
||||||
|
This enables ovn sos report plugin to collect logs ovnkube-controller
|
||||||
|
container because ovn-kubernetes now provides option to run both
|
||||||
|
ovnkube-node and ovnkube-controller in same container with this
|
||||||
|
PR https://github.com/ovn-org/ovn-kubernetes/pull/3807.
|
||||||
|
|
||||||
|
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
|
||||||
|
---
|
||||||
|
sos/report/plugins/openshift_ovn.py | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
|
||||||
|
index 347b15eea..cb48057d3 100644
|
||||||
|
--- a/sos/report/plugins/openshift_ovn.py
|
||||||
|
+++ b/sos/report/plugins/openshift_ovn.py
|
||||||
|
@@ -16,7 +16,8 @@ class OpenshiftOVN(Plugin, RedHatPlugin):
|
||||||
|
"""
|
||||||
|
short_desc = 'Openshift OVN'
|
||||||
|
plugin_name = "openshift_ovn"
|
||||||
|
- containers = ('ovnkube-master', 'ovnkube-node', 'ovn-ipsec')
|
||||||
|
+ containers = ('ovnkube-master', 'ovnkube-node', 'ovn-ipsec',
|
||||||
|
+ 'ovnkube-controller')
|
||||||
|
profiles = ('openshift',)
|
||||||
|
|
||||||
|
def setup(self):
|
||||||
|
@@ -54,6 +55,10 @@ def setup(self):
|
||||||
|
'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
|
||||||
|
'ct-zone-list'],
|
||||||
|
container='ovnkube-node')
|
||||||
|
+ self.add_cmd_output([
|
||||||
|
+ 'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
|
||||||
|
+ 'ct-zone-list'],
|
||||||
|
+ container='ovnkube-controller')
|
||||||
|
# Collect ovs ct-zone-list directly on host for interconnect setup.
|
||||||
|
self.add_cmd_output([
|
||||||
|
'ovs-appctl -t /var/run/ovn-ic/ovn-controller.*.ctl ' +
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Summary: A set of tools to gather troubleshooting information from a system
|
Summary: A set of tools to gather troubleshooting information from a system
|
||||||
Name: sos
|
Name: sos
|
||||||
Version: 4.7.1
|
Version: 4.6.0
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||||
|
@ -22,7 +22,7 @@ Recommends: python3-pexpect
|
||||||
Recommends: python3-pyyaml
|
Recommends: python3-pyyaml
|
||||||
Conflicts: vdsm < 4.40
|
Conflicts: vdsm < 4.40
|
||||||
Obsoletes: sos-collector
|
Obsoletes: sos-collector
|
||||||
Patch1: sos-RHEL-35945-sos-clean-on-archive.patch
|
Patch1: sos-SUPDEV145-ovnkube-logs.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Sos is a set of tools that gathers information about system
|
Sos is a set of tools that gathers information about system
|
||||||
|
@ -107,32 +107,6 @@ of the system. Currently storage and filesystem commands are audited.
|
||||||
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
%ghost /etc/audit/rules.d/40-sos-storage.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-2
|
|
||||||
- [archive] Fix get_archive_root after files reordering
|
|
||||||
Resolves: RHEL-35945
|
|
||||||
|
|
||||||
* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
|
|
||||||
- rebase to upstream 4.7.1
|
|
||||||
Resolves: RHEL-32104
|
|
||||||
|
|
||||||
* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
|
|
||||||
- rebase to upstream 4.7.0
|
|
||||||
Resolves: RHEL-26111
|
|
||||||
|
|
||||||
* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
|
|
||||||
- rebase to upstream 4.6.1
|
|
||||||
Resolves: RHEL-21173
|
|
||||||
- [redhat] Change authentication method for RHEL
|
|
||||||
Resolves: RHEL-21177
|
|
||||||
|
|
||||||
* Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
|
|
||||||
[pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
|
|
||||||
Resolves: RHEL-13697
|
|
||||||
|
|
||||||
* Tue Oct 17 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-4
|
|
||||||
- [pulp] Fix dynaconf obfuscation and add AUTH_LDAP_BIND_PASSWORD
|
|
||||||
Resolves: RHEL-13697
|
|
||||||
|
|
||||||
* Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
|
* Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
|
||||||
- [openshift_ovn] Collect additional ovnkube node logs
|
- [openshift_ovn] Collect additional ovnkube node logs
|
||||||
Resolves: SUPDEV145
|
Resolves: SUPDEV145
|
||||||
|
|
Loading…
Reference in New Issue