sosreport: update sosreport to v4.1
1) sosreport 4.1 has enabled IndependentPlugin for all
the plugins common to all OS to avoid enabling plugins using
corresponding OS plugins.
2) change sos.conf as per the new format.
BUG=b/183245257
TEST=presubmit
RELEASE_NOTE=update sosreport to v4.1
Change-Id: I95a975e32f5d06a19dbacf46c0a872ca87dadd9c
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/20032
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/app-admin/sosreport/Manifest b/project-lakitu/app-admin/sosreport/Manifest
index 5a280d9..0c28ba3 100644
--- a/project-lakitu/app-admin/sosreport/Manifest
+++ b/project-lakitu/app-admin/sosreport/Manifest
@@ -1 +1 @@
-DIST sosreport-4.0.tar.gz 328771 BLAKE2B a2a59631a6163c61c6ec6b1988ff1fd6b5016b88adf8f8d23d93ff89c14d1b0c6c7654c555f14952235d5cdbbae29c1977b99c6d6ada5b0bec3492c2c2d92d15 SHA512 a98a6b4309c982fea73df9c1f7bafec13eb3a40dc7ef613332bb753520850c1e23514efcf61cf3ca144a467abc1b720fae8c2791a972894520bf1b5a72b6774b
+DIST sosreport-4.1.tar.gz 344061 BLAKE2B c5cc7f1fe1995818d28224fe0e57863f77b1c77d96bfa3d38b28cd143dc1b2d7f481a7348e6a3045825423595dbaf239518c7243e3bb7adbfaf97d2cd3342f93 SHA512 dff6526383531d615a3b8ffe5d9f10b5f5f342220efc3d94ab2490106c52db0ed0a1947596790c2ef8432d2831332885396cf0d22027b4a2d3079fb22a37d4a7
diff --git a/project-lakitu/app-admin/sosreport/files/0004-release-add-Linux-release-support-on-COS.patch b/project-lakitu/app-admin/sosreport/files/0004-release-add-Linux-release-support-on-COS.patch
index c4c6078..6a36420 100644
--- a/project-lakitu/app-admin/sosreport/files/0004-release-add-Linux-release-support-on-COS.patch
+++ b/project-lakitu/app-admin/sosreport/files/0004-release-add-Linux-release-support-on-COS.patch
@@ -8,10 +8,10 @@
sos/plugins/release.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/sos/plugins/release.py b/sos/plugins/release.py
+diff --git a/sos/report/plugins/release.py b/sos/report/plugins/release.py
index 62b59255..c90b5d21 100644
---- a/sos/plugins/release.py
-+++ b/sos/plugins/release.py
+--- 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.
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
new file mode 100644
index 0000000..63ed786
--- /dev/null
+++ b/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy-and-COSPlugin-to-valid-subclasses.patch
@@ -0,0 +1,43 @@
+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/0005-add-remote-exec-arg-to-COS-policy.patch b/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy.patch
deleted file mode 100644
index c67a966..0000000
--- a/project-lakitu/app-admin/sosreport/files/0005-add-remote-exec-arg-to-COS-policy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sos/policies/cos.py b/sos/policies/cos.py
-index 8d696e8..4f190f2 100644
---- a/sos/policies/cos.py
-+++ b/sos/policies/cos.py
-@@ -33,6 +33,12 @@ class CosPolicy(LinuxPolicy):
- 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)
-+
- @classmethod
- def check(cls, remote=''):
- if remote:
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
index b79cc64..68a8d42 100644
--- 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
@@ -1,23 +1,21 @@
diff --git a/sos/report/plugins/logs.py b/sos/report/plugins/logs.py
-index 5aeee9b0..ef0aa705 100644
+index 3f4c4c5b..ebf77ff5 100644
--- a/sos/report/plugins/logs.py
+++ b/sos/report/plugins/logs.py
-@@ -12,7 +12,7 @@ from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
- UbuntuPlugin, CosPlugin)
+@@ -8,7 +8,7 @@
+
+ import os
+ import glob
+-from sos.report.plugins import Plugin, IndependentPlugin
++from sos.report.plugins import Plugin, IndependentPlugin, CosPlugin
--class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
-+class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
-
- short_desc = 'System logs'
-
-@@ -108,4 +108,22 @@ class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
+ class Logs(Plugin, IndependentPlugin):
+@@ -106,4 +106,20 @@ class Logs(Plugin, IndependentPlugin):
r"pwd=[******]"
)
-+
+class CosLogs(Logs, CosPlugin):
-+
+ option_list = [
+ ("log_days", "the number of days logs to collect", "", 3)
+ ]
@@ -34,3 +32,4 @@
+ self.add_journal(since="-%ddays" % days)
+
# vim: set et ts=4 sw=4 :
+
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
index 9ab1812..b93667d 100644
--- 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
@@ -12,7 +12,7 @@
class KDump(Plugin):
-@@ -100,4 +101,25 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
+@@ -103,4 +103,25 @@ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
"/etc/default/kdump-tools"
])
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
new file mode 100644
index 0000000..b0f8f62
--- /dev/null
+++ b/project-lakitu/app-admin/sosreport/files/0009-prevent-sos.conf-to-be-installed-automatically.patch
@@ -0,0 +1,23 @@
+From: Varsha Teratipally <teratipally@google.com>
+Date: Mon, 26 Jul 2021 15:26:14 +0000
+Subject: [PATCH] prevent sos.conf to be installed automatically
+
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 1e8d8e2d..168994d5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -94,7 +94,6 @@ setup(
+ ('share/man/man5', ['man/en/sos.conf.5']),
+ ('share/licenses/sos', ['LICENSE']),
+ ('share/doc/sos', ['AUTHORS', 'README.md']),
+- ('config', ['sos.conf'])
+ ],
+ packages=[
+ 'sos', 'sos.presets', 'sos.presets.redhat', 'sos.policies',
+--
+2.32.0.432.gabb21c7263-goog
+
diff --git a/project-lakitu/app-admin/sosreport/files/sos.conf b/project-lakitu/app-admin/sosreport/files/sos.conf
index 0962cde..3310671 100644
--- a/project-lakitu/app-admin/sosreport/files/sos.conf
+++ b/project-lakitu/app-admin/sosreport/files/sos.conf
@@ -1,6 +1,6 @@
-[plugins]
+[report]
-#disable = docker, kernel, logs
+only-plugins = cgroups, devices, docker, filesys, kdump, kernel, logs, memory, process, release, systemd
[plugin_options]
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.0-r2.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.0-r2.ebuild
deleted file mode 120000
index bcab8ee..0000000
--- a/project-lakitu/app-admin/sosreport/sosreport-4.0-r2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-sosreport-4.0.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.1-r1.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.1-r1.ebuild
new file mode 120000
index 0000000..933e204
--- /dev/null
+++ b/project-lakitu/app-admin/sosreport/sosreport-4.1-r1.ebuild
@@ -0,0 +1 @@
+sosreport-4.1.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-admin/sosreport/sosreport-4.0.ebuild b/project-lakitu/app-admin/sosreport/sosreport-4.1.ebuild
similarity index 86%
rename from project-lakitu/app-admin/sosreport/sosreport-4.0.ebuild
rename to project-lakitu/app-admin/sosreport/sosreport-4.1.ebuild
index 2bf1a75..1555ad6 100644
--- a/project-lakitu/app-admin/sosreport/sosreport-4.0.ebuild
+++ b/project-lakitu/app-admin/sosreport/sosreport-4.1.ebuild
@@ -28,10 +28,11 @@
PATCHES=(
# TODO(b/172074394): Open upstream PR(s) to apply these changes.
- "${FILESDIR}/0005-add-remote-exec-arg-to-COS-policy.patch"
+ "${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"
)
src_prepare() {
