Update to 4.11.2-2
Resolves: RHEL-189440 Signed-off-by: Jan Jansky <jjansky@redhat.com>
This commit is contained in:
Jan Jansky
parent
137208b801
commit
8f9b76ca73
@ -115,6 +115,33 @@
|
||||
pwd = match.group("pwd")
|
||||
return f"-u balancer:{pwd}"
|
||||
|
||||
--- a/sos/report/plugins/__init__.py
|
||||
+++ b/sos/report/plugins/__init__.py
|
||||
@@ -3262,7 +3262,10 @@
|
||||
# skip forbidden paths; since we might recursivelly copied
|
||||
# whole directory, we must find the forbidden files in dest
|
||||
# path and delete the unwanted
|
||||
- base_dir = dest.removesuffix(f"{path.lstrip('/')}")
|
||||
+ _suffix = path.lstrip('/')
|
||||
+ base_dir = (dest[:-len(_suffix)]
|
||||
+ if dest.endswith(_suffix) and _suffix
|
||||
+ else dest)
|
||||
for relname in [file.relative_to(base_dir).as_posix()
|
||||
for file in Path(dest).rglob('*')]:
|
||||
absname = f"/{relname}"
|
||||
|
||||
--- a/sos/cleaner/__init__.py
|
||||
+++ b/sos/cleaner/__init__.py
|
||||
@@ -846,6 +846,8 @@
|
||||
# *all* mapping.all(item) methods - so replaying this will
|
||||
# generate the right datasets!
|
||||
archive.load_parser_entries()
|
||||
+ archive.soslog = logging.getLogger('sos')
|
||||
+ archive.ui_log = logging.getLogger('sos_ui')
|
||||
|
||||
try:
|
||||
self.obfuscate_directory_names(archive)
|
||||
|
||||
--- a/sos/report/plugins/charmed_mongodb.py 2026-07-16 14:48:09.639484635 +0200
|
||||
+++ b/sos/report/plugins/charmed_mongodb.py 2026-07-16 14:49:02.337015148 +0200
|
||||
@@ -122,8 +122,8 @@
|
||||
|
||||
97
0006-foremanctl-valkey-PR4376.patch
Normal file
97
0006-foremanctl-valkey-PR4376.patch
Normal file
@ -0,0 +1,97 @@
|
||||
From 5e7a01d9df2bc4e1f2659ace959ea52228ee1eee Mon Sep 17 00:00:00 2001
|
||||
From: akumari <akumari@redhat.com>
|
||||
Date: Wed, 1 Jul 2026 09:26:52 +0530
|
||||
Subject: [PATCH 1/2] [foremanctl] Enable plugin for containerized deployments
|
||||
|
||||
The plugin required foremanctl package which doesn't exist in
|
||||
containerized mode. Add container detection to enable the plugin
|
||||
and collect foremanctl health diagnostics for support cases.
|
||||
|
||||
Signed-off-by: akumari <akumari@redhat.com>
|
||||
---
|
||||
sos/report/plugins/foremanctl.py | 29 +++++++++++++++++++++++++----
|
||||
1 file changed, 25 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/sos/report/plugins/foremanctl.py b/sos/report/plugins/foremanctl.py
|
||||
index 1b6ba4a4..0425cc05 100644
|
||||
--- a/sos/report/plugins/foremanctl.py
|
||||
+++ b/sos/report/plugins/foremanctl.py
|
||||
@@ -19,6 +19,7 @@ class Foremanctl(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
|
||||
plugin_name = 'foremanctl'
|
||||
profiles = ('sysmgmt',)
|
||||
packages = ('foremanctl', )
|
||||
+ containers = ('foreman', 'foreman-proxy',)
|
||||
|
||||
def setup(self):
|
||||
self.add_copy_spec([
|
||||
@@ -29,14 +30,34 @@ class Foremanctl(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
|
||||
|
||||
self.add_cmd_output([
|
||||
"foremanctl features",
|
||||
+ "foremanctl health",
|
||||
])
|
||||
|
||||
self.add_dir_listing(["/var/lib/foremanctl/"], recursive=True)
|
||||
|
||||
def postproc(self):
|
||||
- self.do_path_regex_sub("/var/lib/foremanctl/parameters.yaml",
|
||||
- r"(foreman_initial_admin_password:\s*)(.*)",
|
||||
- r"\1********")
|
||||
-
|
||||
+ # Scrub passwords, credentials, tokens, secrets, and keys
|
||||
+ self.do_path_regex_sub(
|
||||
+ "/var/lib/foremanctl/parameters.yaml",
|
||||
+ r"((.*)?(passw|cred|token|secret|key).*(\:\s|=))(.*)",
|
||||
+ r"\1********")
|
||||
+
|
||||
+ # Scrub passwords from foremanctl logs - Pattern 1: key=value format
|
||||
+ self.do_path_regex_sub(
|
||||
+ "/var/log/foremanctl/foremanctl.*log*",
|
||||
+ r"((passw|cred|token|secret|key)\w*\s*=\s*)(.*?)(\s|,|\"|'|$)",
|
||||
+ r"\1********\4")
|
||||
+
|
||||
+ # Scrub passwords from foremanctl logs - Pattern 2: "password something" format
|
||||
+ self.do_path_regex_sub(
|
||||
+ "/var/log/foremanctl/foremanctl.*log*",
|
||||
+ r"(password\s+)(.*?)(\s|,|\"|$)",
|
||||
+ r"\1********\3")
|
||||
+
|
||||
+ # Scrub admin credentials in username:password format
|
||||
+ self.do_path_regex_sub(
|
||||
+ "/var/log/foremanctl/foremanctl.*log*",
|
||||
+ r"(Admin credentials:\s+\w+:)(.*?)(\"|,|$)",
|
||||
+ r"\1********\3")
|
||||
|
||||
# vim: set et ts=4 sw=4 :
|
||||
--
|
||||
2.54.0
|
||||
|
||||
From 3b6bbcb819e05aecf0fec4767588ea0376c9f218 Mon Sep 17 00:00:00 2001
|
||||
From: akumari <akumari@redhat.com>
|
||||
Date: Tue, 7 Jul 2026 14:06:40 +0530
|
||||
Subject: [PATCH 2/2] [valkey] Add container support for containerized
|
||||
deployments
|
||||
|
||||
Adds container support to the valkey plugin to enable it
|
||||
for containerized deployments using foremanctl/quadlet.
|
||||
|
||||
Signed-off-by: akumari <akumari@redhat.com>
|
||||
---
|
||||
sos/report/plugins/valkey.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/sos/report/plugins/valkey.py b/sos/report/plugins/valkey.py
|
||||
index 26a74a56..f7b49253 100644
|
||||
--- a/sos/report/plugins/valkey.py
|
||||
+++ b/sos/report/plugins/valkey.py
|
||||
@@ -19,6 +19,7 @@ class Valkey(Plugin, IndependentPlugin):
|
||||
profiles = ('services',)
|
||||
|
||||
packages = ('valkey',)
|
||||
+ containers = ('valkey',)
|
||||
|
||||
var_puppet_gen = "/var/lib/config-data/puppet-generated/valkey"
|
||||
|
||||
--
|
||||
2.54.0
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 3b6bbcb819e05aecf0fec4767588ea0376c9f218 Mon Sep 17 00:00:00 2001
|
||||
From: akumari <akumari@redhat.com>
|
||||
Date: Tue, 7 Jul 2026 14:06:40 +0530
|
||||
Subject: [PATCH] [valkey] Add container support for containerized deployments
|
||||
|
||||
Adds container support to the valkey plugin to enable it
|
||||
for containerized deployments using foremanctl/quadlet.
|
||||
|
||||
Signed-off-by: akumari <akumari@redhat.com>
|
||||
---
|
||||
sos/report/plugins/valkey.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/sos/report/plugins/valkey.py b/sos/report/plugins/valkey.py
|
||||
index 26a74a56..f7b49253 100644
|
||||
--- a/sos/report/plugins/valkey.py
|
||||
+++ b/sos/report/plugins/valkey.py
|
||||
@@ -19,6 +19,7 @@ class Valkey(Plugin, IndependentPlugin):
|
||||
profiles = ('services',)
|
||||
|
||||
packages = ('valkey',)
|
||||
+ containers = ('valkey',)
|
||||
|
||||
var_puppet_gen = "/var/lib/config-data/puppet-generated/valkey"
|
||||
|
||||
--
|
||||
2.54.0
|
||||
|
||||
7
sos.spec
7
sos.spec
@ -5,7 +5,7 @@
|
||||
Summary: A set of tools to gather troubleshooting information from a system
|
||||
Name: sos
|
||||
Version: 4.11.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Group: Applications/System
|
||||
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
|
||||
Source1: sos-audit-%{auditversion}.tgz
|
||||
@ -27,7 +27,7 @@ Patch2: 0002-remove-unsupported-python36-plugins.patch
|
||||
Patch3: 0003-sosreport-binary.patch
|
||||
Patch4: 0004-revert-PR4092-and-PR4275.patch
|
||||
Patch5: 0005-foreman-installer-Scrub-secrets-in-CLI-arg-dumps.patch
|
||||
Patch6: 0006-valkey-Add-container-support-for-containerized-deplo.patch
|
||||
Patch6: 0006-foremanctl-valkey-PR4376.patch
|
||||
|
||||
%description
|
||||
Sos is a set of tools that gathers information about system
|
||||
@ -116,6 +116,9 @@ of the system. Currently storage and filesystem commands are audited.
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Jan Jansky <jjansky@redhat.com> - 4.11.2-2
|
||||
- Update to 4.11.2-2
|
||||
|
||||
* Wed Jul 15 2026 Jan Jansky <jjansky@redhat.com> = 4.11.2-1
|
||||
- Update to 4.11.2-1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user