sosreport: update sosreport to v4.5.3
BUG=b/270594235
TEST=presubmit
RELEASE_NOTE=Update sosreport to v4.5.3
Change-Id: I5be014d30eb89fc461c1c4128e314f74568c2d73
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/49671
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-admin/sosreport/Manifest b/project-lakitu/app-admin/sosreport/Manifest
index e4dd7ca..1bb4544 100644
--- a/project-lakitu/app-admin/sosreport/Manifest
+++ b/project-lakitu/app-admin/sosreport/Manifest
@@ -1 +1 @@
-DIST sosreport-4.4.tar.gz 11124819 BLAKE2B dbda01dd1ddeab8ecc459b97121389e4ebb61425b9ae070657354e02f4cc25a45d44bf7bdeddbe1f3abbb07c8527a5185cd0b214c4a21619d561a611f25a8279 SHA512 0e040bd48463960872e7f14ac773edcce40a5bfb1e05967498c8c9dc41560dfe901c60f08aad5e2a987d5de8068b21729d2317ae99602c739aa4f78eb7f72251
+DIST sosreport-4.5.3.tar.gz 11157193 BLAKE2B 18d35159d78bdd2bfa3b2d33e59a2f9d580df42946c72131c391645aff4c6b85bb76e11f0696fc475d5f3d09a8e3ceaee495eac8917fea5f68342f839a487157 SHA512 c3864a0589b3c278b98023e6814407e401f8afd6a5a8d346fa561e179f3b09ee2d94504b171251a0789b1dff147963f6a1deb32851c22a1e4ba11d92e806b9b1
diff --git a/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch b/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch
deleted file mode 100644
index 63ed786..0000000
--- a/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ec37996b80973a5a3f4a05262a6bdac58437ea5 Mon Sep 17 00:00:00 2001
-From: Varsha Teratipally <teratipally@google.com>
-Date: Wed, 28 Jul 2021 20:00:55 +0000
-Subject: [PATCH] add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclass
-
----
- sos/policies/distros/cos.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/sos/policies/distros/cos.py b/sos/policies/distros/cos.py
-index e70693f6..7b03b9d9 100644
---- a/sos/policies/distros/cos.py
-+++ b/sos/policies/distros/cos.py
-@@ -8,7 +8,7 @@
- #
- # See the LICENSE file in the source distribution for further information.
-
--from sos.report.plugins import CosPlugin, IndependentPlugin
-+from sos.report.plugins import CosPlugin
- from sos.policies.distros import LinuxPolicy
-
-
-@@ -33,9 +33,15 @@ class CosPolicy(LinuxPolicy):
- ('Distribution Website',
- 'https://cloud.google.com/container-optimized-os/')
- ]
-- valid_subclasses = [CosPlugin, IndependentPlugin]
-+ valid_subclasses = [CosPlugin]
- PATH = "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-
-+ def __init__(self, sysroot=None, init=None, probe_runtime=True,
-+ remote_exec=None):
-+ super(CosPolicy, self).__init__(sysroot=sysroot, init=init,
-+ probe_runtime=probe_runtime)
-+ self.valid_subclasses += [CosPlugin]
-+
- @classmethod
- def check(cls, remote=''):
- if remote:
---
-2.32.0.432.gabb21c7263-goog
-
-
diff --git a/project-lakitu/app-admin/sosreport/files/0006-add-journalctl-o-export-to-COS-logs.patch b/project-lakitu/app-admin/sosreport/files/0006-add-journalctl-o-export-to-COS-logs.patch
deleted file mode 100644
index d859669..0000000
--- a/project-lakitu/app-admin/sosreport/files/0006-add-journalctl-o-export-to-COS-logs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/sos/report/plugins/logs.py b/sos/report/plugins/logs.py
-index 3f4c4c5b..ebf77ff5 100644
---- a/sos/report/plugins/logs.py
-+++ b/sos/report/plugins/logs.py
-@@ -8,7 +8,7 @@
-
- import os
- import glob
--from sos.report.plugins import Plugin, IndependentPlugin
-+from sos.report.plugins import Plugin, PluginOpt, IndependentPlugin, CosPlugin
-
-
- class Logs(Plugin, IndependentPlugin):
-@@ -106,4 +106,20 @@ class Logs(Plugin, IndependentPlugin):
- r"pwd=[******]"
- )
-
-+class CosLogs(Logs, CosPlugin):
-+ option_list = [
-+ PluginOpt(name="log_days", desc="the number of days logs to collect", default=3)
-+ ]
-+
-+ def setup(self):
-+ super(CosLogs, self).setup()
-+ if self.get_option("all_logs"):
-+ self.add_cmd_output("journalctl -o export")
-+ else:
-+ try:
-+ days = int(self.get_option("log_days"))
-+ except ValueError:
-+ days = 3
-+ self.add_journal(since="-%ddays" % days)
-+
- # vim: set et ts=4 sw=4 :
-
diff --git a/project-lakitu/app-admin/sosreport/files/0007-add-Linux-release-support-for-COS-on-sos-4-0.patch b/project-lakitu/app-admin/sosreport/files/0007-add-Linux-release-support-for-COS-on-sos-4-0.patch
deleted file mode 100644
index ecadcc4..0000000
--- a/project-lakitu/app-admin/sosreport/files/0007-add-Linux-release-support-for-COS-on-sos-4-0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/sos/report/plugins/release.py b/sos/report/plugins/release.py
-index 52919972..3731cf5f 100644
---- a/sos/report/plugins/release.py
-+++ b/sos/report/plugins/release.py
-@@ -6,10 +6,11 @@
- #
- # See the LICENSE file in the source distribution for further information.
-
--from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-+from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
-+ UbuntuPlugin, CosPlugin)
-
-
--class Release(Plugin, UbuntuPlugin):
-+class Release(Plugin, UbuntuPlugin, CosPlugin):
-
- short_desc = 'Linux release information'
-
diff --git a/project-lakitu/app-admin/sosreport/files/0008-add-kdump-support-on-COS.patch b/project-lakitu/app-admin/sosreport/files/0008-add-kdump-support-on-COS.patch
deleted file mode 100644
index 605c0a4..0000000
--- a/project-lakitu/app-admin/sosreport/files/0008-add-kdump-support-on-COS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/sos/report/plugins/kdump.py b/sos/report/plugins/kdump.py
-index 41d08b5b..d57ef5f3 100644
---- a/sos/report/plugins/kdump.py
-+++ b/sos/report/plugins/kdump.py
-@@ -8,7 +8,8 @@
-
- import os
- import platform
--from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-+from sos.report.plugins import (Plugin, PluginOpt, RedHatPlugin, DebianPlugin,
-+ UbuntuPlugin, CosPlugin)
-
-
- class KDump(Plugin):
-@@ -103,4 +103,25 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
- "/etc/default/kdump-tools"
- ])
-
-+
-+class CosKDump(KDump, CosPlugin):
-+
-+ option_list = [
-+ PluginOpt(name="all_dumps", desc="enable capture for all kernel dumps", default=False),
-+ PluginOpt(name="latest_dump", desc="enable capture for latest kernel crash dump",
-+ default=False),
-+ ]
-+
-+ def setup(self):
-+ super(CosKDump, self).setup()
-+ self.add_cmd_output('ls -alRh /var/kdump*')
-+ if self.get_option("all_dumps"):
-+ self.add_copy_spec([
-+ "/var/kdump-*"
-+ ])
-+ if self.get_option("latest_dump"):
-+ self.add_copy_spec([
-+ "/var/kdump"
-+ ])
-+
- # vim: set et ts=4 sw=4 :
diff --git a/project-lakitu/app-admin/sosreport/files/0009-prevent-sos.conf-to-be-installed-automatically.patch b/project-lakitu/app-admin/sosreport/files/0009-prevent-sos.conf-to-be-installed-automatically.patch
index b0f8f62..b2045d1 100644
--- a/project-lakitu/app-admin/sosreport/files/0009-prevent-sos.conf-to-be-installed-automatically.patch
+++ b/project-lakitu/app-admin/sosreport/files/0009-prevent-sos.conf-to-be-installed-automatically.patch
@@ -10,14 +10,15 @@
index 1e8d8e2d..168994d5 100644
--- a/setup.py
+++ b/setup.py
-@@ -94,7 +94,6 @@ setup(
+@@ -26,7 +26,6 @@ setup(
('share/man/man5', ['man/en/sos.conf.5']),
('share/licenses/sos', ['LICENSE']),
('share/doc/sos', ['AUTHORS', 'README.md']),
-- ('config', ['sos.conf'])
+- ('config', ['sos.conf', 'tmpfiles/tmpfilesd-sos-rh.conf'])
],
- packages=[
- 'sos', 'sos.presets', 'sos.presets.redhat', 'sos.policies',
+ packages=find_packages(include=['sos', 'sos.*'])
+ )
+
--
2.32.0.432.gabb21c7263-goog
diff --git a/project-lakitu/app-admin/sosreport/files/0011-add-crictl-plugin.patch b/project-lakitu/app-admin/sosreport/files/0011-add-crictl-plugin.patch
deleted file mode 100644
index 7851de2..0000000
--- a/project-lakitu/app-admin/sosreport/files/0011-add-crictl-plugin.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From fa15f163c340e73b53cd703bb199d15808f7bec8 Mon Sep 17 00:00:00 2001
-From: Sam Kunz <samkunz@google.com>
-Date: Tue, 28 Sep 2021 18:33:01 +0000
-Subject: [PATCH] [plugins] Add crictl plugin.
-
----
- sos/report/plugins/crictl.py | 84 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 84 insertions(+)
- create mode 100644 sos/report/plugins/crictl.py
-
-diff --git a/sos/report/plugins/crictl.py b/sos/report/plugins/crictl.py
-new file mode 100644
-index 00000000..48367a73
---- /dev/null
-+++ b/sos/report/plugins/crictl.py
-@@ -0,0 +1,84 @@
-+# This file is part of the sos project: https://github.com/sosreport/sos
-+#
-+# This copyrighted material is made available to anyone wishing to use,
-+# modify, copy, or redistribute it subject to the terms and conditions of
-+# version 2 of the GNU General Public License.
-+#
-+# See the LICENSE file in the source distribution for further information.
-+
-+from sos.report.plugins import Plugin, PluginOpt, CosPlugin, SoSPredicate
-+
-+
-+class Crictl(Plugin, CosPlugin):
-+
-+ short_desc = 'crictl containers'
-+ plugin_name = 'crictl'
-+ profiles = ('container',)
-+ packages = ('cri-tools')
-+
-+ option_list = [
-+ PluginOpt(name="all", desc="enable capture for all containers, even containers "
-+ "that have terminated", default=False),
-+ PluginOpt(name="logs", desc="capture logs for running containers",
-+ default=False),
-+ ]
-+
-+ def setup(self):
-+ self.add_copy_spec([
-+ "/etc/crictl.yaml",
-+ ])
-+
-+ self.add_journal(units='containerd')
-+
-+ # cri-tools supplies the crictl utility
-+ self.set_cmd_predicate(SoSPredicate(self, packages=['cri-tools']))
-+
-+ subcmds = [
-+ 'info',
-+ 'images',
-+ 'pods',
-+ 'pods -v',
-+ 'ps',
-+ 'ps -a',
-+ 'ps -v',
-+ 'stats',
-+ 'version',
-+ ]
-+
-+ self.add_cmd_output(["crictl %s" % s for s in subcmds])
-+
-+ ps_cmd = 'crictl ps --quiet'
-+ if self.get_option('all'):
-+ ps_cmd = "%s -a" % ps_cmd
-+
-+ img_cmd = 'crictl images --quiet'
-+ pod_cmd = 'crictl pods --quiet'
-+
-+ containers = self._get_crictl_list(ps_cmd)
-+ images = self._get_crictl_list(img_cmd)
-+ pods = self._get_crictl_list(pod_cmd)
-+
-+ for container in containers:
-+ self.add_cmd_output("crictl inspect %s" % container)
-+ if self.get_option('logs'):
-+ self.add_cmd_output("crictl logs -t %s" % container,
-+ subdir="containers")
-+
-+ for image in images:
-+ self.add_cmd_output("crictl inspecti %s" % image, subdir="images")
-+
-+ for pod in pods:
-+ self.add_cmd_output("crictl inspectp %s" % pod, subdir="pods")
-+
-+ def _get_crictl_list(self, cmd):
-+ ret = []
-+ result = self.exec_cmd(cmd)
-+ if result['status'] == 0:
-+ for ent in result['output'].splitlines():
-+ ret.append(ent)
-+ # Prevent the socket deprecation warning from being iterated over
-+ if ret and 'deprecated' in ret[0]:
-+ ret.pop(0)
-+ return ret
-+
-+# vim: set et ts=4 sw=4 :
---
-2.31.0
-
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.4-r1.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.4-r1.ebuild
deleted file mode 120000
index d092b00..0000000
--- a/project-lakitu/app-admin/sosreport/sosreport-4.4-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-./sosreport-4.4.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.5.3-r1.ebuild
similarity index 71%
rename from project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild
rename to project-lakitu/app-admin/sosreport/sosreport-4.5.3-r1.ebuild
index 9efe903..bee84b6 100644
--- a/project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild
+++ b/project-lakitu/app-admin/sosreport/sosreport-4.5.3-r1.ebuild
@@ -29,14 +29,8 @@
S="${WORKDIR}/sos-${PV}"
PATCHES=(
- # TODO(b/172074394,b/201429334): Open upstream PR(s) to apply these changes.
- "${FILESDIR}/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch"
- "${FILESDIR}/0006-add-journalctl-o-export-to-COS-logs.patch"
- "${FILESDIR}/0007-add-Linux-release-support-for-COS-on-sos-4-0.patch"
- "${FILESDIR}/0008-add-kdump-support-on-COS.patch"
"${FILESDIR}/0009-prevent-sos.conf-to-be-installed-automatically.patch"
"${FILESDIR}/0010-add-package-manager-for-COS.patch"
- "${FILESDIR}/0011-add-crictl-plugin.patch"
)
src_prepare() {
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.5.3.ebuild
similarity index 71%
copy from project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild
copy to project-lakitu/app-admin/sosreport/sosreport-4.5.3.ebuild
index 9efe903..bee84b6 100644
--- a/project-lakitu/app-admin/sosreport/sosreport-4.4.ebuild
+++ b/project-lakitu/app-admin/sosreport/sosreport-4.5.3.ebuild
@@ -29,14 +29,8 @@
S="${WORKDIR}/sos-${PV}"
PATCHES=(
- # TODO(b/172074394,b/201429334): Open upstream PR(s) to apply these changes.
- "${FILESDIR}/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch"
- "${FILESDIR}/0006-add-journalctl-o-export-to-COS-logs.patch"
- "${FILESDIR}/0007-add-Linux-release-support-for-COS-on-sos-4-0.patch"
- "${FILESDIR}/0008-add-kdump-support-on-COS.patch"
"${FILESDIR}/0009-prevent-sos.conf-to-be-installed-automatically.patch"
"${FILESDIR}/0010-add-package-manager-for-COS.patch"
- "${FILESDIR}/0011-add-crictl-plugin.patch"
)
src_prepare() {
