[sos/f20] Backport oVirt plugin from upstream
Bryn Reeves
bmr at fedoraproject.org
Tue Jun 17 22:49:46 UTC 2014
commit 3ffec08130bc562711440b8bbb68b0ae5ade2fa5
Author: Bryn M. Reeves <bmr at redhat.com>
Date: Tue Jun 17 23:28:52 2014 +0100
Backport oVirt plugin from upstream
[ovirt] add ovirt-scheduler-proxy logs
[ovirt] Add dwh and reports packages to plugin package list
Add reports support to oVirt plugin
Add oVirt Data Warehouse support
[ovirt] add package list to ovirt plugin
[ovirt] elide passwords in logcollector.conf
[ovirt] elide passwords in {iso,image}uploader.conf
Add oVirt plugin
Make do_path_regex_sub() honour string regex arguments
0001-Fix-cluster-module-crm_report-support.patch | 4 +-
...bsolete-diagnostics-code-from-ldap-plugin.patch | 4 +-
...rclass-postproc-method-is-called-in-ldap-.patch | 4 +-
0004-Fix-cluster-postproc-regression.patch | 4 +-
0005-Fix-get_option-use-in-cluster-plugin.patch | 4 +-
0006-Fix-verbose-file-logging.patch | 4 +-
...ays-treat-rhevm-vdsmlogs-option-as-string.patch | 4 +-
0008-Add-rhsm-debug-collection-to-yum-plugin.patch | 4 +-
...ke-get_cmd_output_now-behaviour-match-2.2.patch | 4 +-
...-geo-replication-status-in-gluster-plugin.patch | 4 +-
0011-postgresql-minor-fixes.patch | 4 +-
...postgresql-add-logs-about-errors-warnings.patch | 4 +-
0013-postgresql-added-license-and-copyright.patch | 4 +-
0014-postgresql-allow-use-TCP-socket.patch | 4 +-
0015-Pass-no-archive-to-rhsm-debug-script.patch | 4 +-
...ed-fds-are-closed-when-calling-subprocess.patch | 4 +-
0017-Fix-gluster-volume-name-extraction.patch | 4 +-
0018-Add-distupgrade-plugin.patch | 4 +-
...Fix-command-output-substitution-exception.patch | 4 +-
...or-message-when-cluster.crm_from-is-inval.patch | 4 +-
...ove-useless-check_enabled-from-sar-plugin.patch | 4 +-
...hard-coded-var-log-sa-paths-in-sar-plugin.patch | 4 +-
...p_default_authtok-password-in-sssd-plugin.patch | 4 +-
...-package-check-with-file-check-in-anacron.patch | 4 +-
0025-Remove-the-rhevm-plugin.patch | 4 +-
...c-Move-VPD-related-tool-under-common-code.patch | 4 +-
0027-Add-PowerNV-specific-debug-data.patch | 4 +-
...ng-use-of-obsolete-get_cmd_dir-in-plugins.patch | 4 +-
0029-Update-systemd-support.patch | 4 +-
0030-Add-tuned-plugin.patch | 4 +-
...t_cmd_path-make_cmd_path-make_cmd_dirs-me.patch | 4 +-
...oken-binary-detection-in-satellite-plugin.patch | 4 +-
...-Rename-validatePlugin-to-validate_plugin.patch | 4 +-
...olicy_tests.py-for-validate_plugin-change.patch | 4 +-
0035-Match-plugins-against-policies.patch | 4 +-
0036-Do-not-collect-isos-in-cobbler-plugin.patch | 4 +-
0037-Call-rhsm-debug-with-the-sos-switch.patch | 4 +-
0038-Fix-plugin_test-exception-on-six.PY2.patch | 4 +-
0039-Remove-profile-support.patch | 4 +-
0040-Dead-code-removal-sos_relative_path.patch | 4 +-
0041-Dead-code-removal-DirTree.patch | 4 +-
0042-Dead-code-removal-utilities.checksum.patch | 4 +-
0043-Add-vim-tags-to-all-python-source-files.patch | 4 +-
...ad-code-removal-sos.plugins.common_prefix.patch | 4 +-
0045-Dead-code-removal-PluginException.patch | 4 +-
0046-Convert-infiniband-to-package-list.patch | 4 +-
...elf.policy-.pkg_by_name-us-in-Logs-plugin.patch | 4 +-
...ean-up-package-checks-in-processor-plugin.patch | 4 +-
0049-Pythonify-Plugin._path_in_pathlist.patch | 4 +-
...ix-x86-arch-detection-in-processor-plugin.patch | 4 +-
0051-Refactor-Plugin.collect-pathway.patch | 4 +-
...lete-checksum-reference-from-utilities_te.patch | 4 +-
...plugin_tests.py-to-match-new-method-names.patch | 4 +-
0054-Drop-RedHatPlugin-from-procenv.patch | 4 +-
...e-sub-parameter-from-Plugin.add_copy_spec.patch | 4 +-
...rences-to-sub-parameter-from-plugin-tests.patch | 4 +-
0057-Use-a-set-for-Plugin.copy_paths.patch | 4 +-
...Plugin-tests-to-treat-copy_paths-as-a-set.patch | 4 +-
...s-for-Plugin.add_copy_spec-add_copy_specs.patch | 4 +-
...eError-if-add_copy_specs-is-called-with-a.patch | 4 +-
...ion-of-grub-configuration-for-UEFI-system.patch | 4 +-
0062-Add-Plugin.do_path_regex_sub.patch | 43 +++++
...h_regex_sub-honour-string-regex-arguments.patch | 58 ++++++
0064-Add-oVirt-plugin.patch | 159 +++++++++++++++++
0065-Fix-call_ext_prog-use-in-oVirt-plugin.patch | 30 ++++
...lide-passwords-in-iso-image-uploader.conf.patch | 40 +++++
...virt-elide-passwords-in-logcollector.conf.patch | 44 +++++
0068-ovirt-add-package-list-to-ovirt-plugin.patch | 32 ++++
0069-Add-oVirt-Data-Warehouse-support.patch | 50 ++++++
0070-Add-reports-support-to-oVirt-plugin.patch | 29 +++
...wh-and-reports-packages-to-plugin-package.patch | 36 ++++
0072-ovirt-add-ovirt-scheduler-proxy-logs.patch | 25 +++
sos-silence-could-not-run.patch | 24 ---
sos.spec | 183 ++++++++++----------
74 files changed, 763 insertions(+), 234 deletions(-)
---
diff --git a/0001-Fix-cluster-module-crm_report-support.patch b/0001-Fix-cluster-module-crm_report-support.patch
index 795b82c..b352c8f 100644
--- a/0001-Fix-cluster-module-crm_report-support.patch
+++ b/0001-Fix-cluster-module-crm_report-support.patch
@@ -1,7 +1,7 @@
From 4ab4b086c1011997246c40d4c97079c3c001031c Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 31 Jan 2014 15:08:28 +0000
-Subject: [PATCH 01/61] Fix cluster module crm_report support
+Subject: [PATCH 01/72] Fix cluster module crm_report support
The cluster plugin used an obsolete sos-2.2 method to determine
the command output directory. This causes an excaption at runtime
@@ -77,5 +77,5 @@ index 50e0e0b..c2ce42b 100644
r"(.*fence.*\.passwd=)(.*)",
r"\1******")
--
-1.7.11.7
+1.9.3
diff --git a/0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch b/0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
index ba959b1..dbb4d00 100644
--- a/0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
+++ b/0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
@@ -1,7 +1,7 @@
From c344b0396b4ef4435860eb6e3954972e028e3491 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 31 Jan 2014 15:25:15 +0000
-Subject: [PATCH 02/61] Remove obsolete diagnostics code from ldap plugin
+Subject: [PATCH 02/72] Remove obsolete diagnostics code from ldap plugin
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -32,5 +32,5 @@ index 361de73..f1032a9 100644
super(Ldap, self).setup()
self.add_copy_spec("/etc/ldap.conf")
--
-1.7.11.7
+1.9.3
diff --git a/0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch b/0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
index 81e116b..d533e5c 100644
--- a/0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
+++ b/0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
@@ -1,7 +1,7 @@
From 3c52bbd14c881748998c0edfb328c8c0ca92842f Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 31 Jan 2014 15:43:44 +0000
-Subject: [PATCH 03/61] Ensure superclass postproc method is called in ldap
+Subject: [PATCH 03/72] Ensure superclass postproc method is called in ldap
plugin
Since the ldap plugins add files and post-processing methods at
@@ -35,5 +35,5 @@ index f1032a9..79d8394 100644
"ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(!(objectClass=olcSchemaConfig))'",
r"(olcRootPW\: \s*)\S+", r"\1********")
--
-1.7.11.7
+1.9.3
diff --git a/0004-Fix-cluster-postproc-regression.patch b/0004-Fix-cluster-postproc-regression.patch
index 33fca95..586f040 100644
--- a/0004-Fix-cluster-postproc-regression.patch
+++ b/0004-Fix-cluster-postproc-regression.patch
@@ -1,7 +1,7 @@
From 43268795e09c91ef7cc8dbef3cb1ddfc5c2bf686 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 31 Jan 2014 16:03:31 +0000
-Subject: [PATCH 04/61] Fix cluster postproc regression
+Subject: [PATCH 04/72] Fix cluster postproc regression
Commit 4ab4b08 inadvertently removed the postprocessing rules for
luci configuration. Revert that part of the commit.
@@ -25,5 +25,5 @@ index c2ce42b..0fc4ded 100644
r"(.*fence.*\.passwd=)(.*)",
r"\1******")
--
-1.7.11.7
+1.9.3
diff --git a/0005-Fix-get_option-use-in-cluster-plugin.patch b/0005-Fix-get_option-use-in-cluster-plugin.patch
index 2fc6014..4e581ae 100644
--- a/0005-Fix-get_option-use-in-cluster-plugin.patch
+++ b/0005-Fix-get_option-use-in-cluster-plugin.patch
@@ -1,7 +1,7 @@
From c73207037d86a96550b1e0aca9fb8172f4e68754 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 11:48:46 +0000
-Subject: [PATCH 05/61] Fix get_option() use in cluster plugin
+Subject: [PATCH 05/72] Fix get_option() use in cluster plugin
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -28,5 +28,5 @@ index 0fc4ded..eeacdab 100644
crm_dest = os.path.join(self.get_cmd_dir(), 'crm_report')
self.add_cmd_output('crm_report -S -d --dest %s --from "%s"'
--
-1.7.11.7
+1.9.3
diff --git a/0006-Fix-verbose-file-logging.patch b/0006-Fix-verbose-file-logging.patch
index 01d2122..cdf4f8c 100644
--- a/0006-Fix-verbose-file-logging.patch
+++ b/0006-Fix-verbose-file-logging.patch
@@ -1,7 +1,7 @@
From 0338a955a930286beaa7b66c5167be9b15d34d78 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 12:09:57 +0000
-Subject: [PATCH 06/61] Fix verbose file logging
+Subject: [PATCH 06/72] Fix verbose file logging
Prior versions of sos enable debug logging to the embedded log
file (sos_logs/sos.log) when a single '-v' is given. Restore this
@@ -40,5 +40,5 @@ index 4b52572..0faa364 100644
console.setLevel(logging.WARNING)
self.soslog.addHandler(console)
--
-1.7.11.7
+1.9.3
diff --git a/0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch b/0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
index 695046c..0cfcb76 100644
--- a/0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
+++ b/0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
@@ -1,7 +1,7 @@
From 03662edf4405ab66c0284a76bf68662c1657d5ab Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 12:26:45 +0000
-Subject: [PATCH 07/61] Always treat rhevm vdsmlogs option as string
+Subject: [PATCH 07/72] Always treat rhevm vdsmlogs option as string
The rhevm plugin has a 'vdsmlogs' option to pass in a set of log
files to be collected. When run with '-a' (or with
@@ -29,5 +29,5 @@ index 39b32f4..8068e05 100644
def postproc(self):
"""
--
-1.7.11.7
+1.9.3
diff --git a/0008-Add-rhsm-debug-collection-to-yum-plugin.patch b/0008-Add-rhsm-debug-collection-to-yum-plugin.patch
index ea2535a..0a515a0 100644
--- a/0008-Add-rhsm-debug-collection-to-yum-plugin.patch
+++ b/0008-Add-rhsm-debug-collection-to-yum-plugin.patch
@@ -1,7 +1,7 @@
From 3b727c296b86172a64dae83cb02a42fe4c5c6af9 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 13:03:04 +0000
-Subject: [PATCH 08/61] Add rhsm-debug collection to yum plugin
+Subject: [PATCH 08/72] Add rhsm-debug collection to yum plugin
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -22,5 +22,5 @@ index 867302c..a9ae4e4 100644
if self.get_option("yumlist"):
# List various information about available packages
--
-1.7.11.7
+1.9.3
diff --git a/0009-Make-get_cmd_output_now-behaviour-match-2.2.patch b/0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
index 52065e9..0b5fdb2 100644
--- a/0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
+++ b/0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
@@ -1,7 +1,7 @@
From a9bf294a6898bb1defb396c0c0bca29234855db6 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 14:36:46 +0000
-Subject: [PATCH 09/61] Make get_cmd_output_now() behaviour match 2.2
+Subject: [PATCH 09/72] Make get_cmd_output_now() behaviour match 2.2
The equivalent method in sos-2.2, collectOutputNow() returned an
absolute path to the collected file. Since the archive changes in
@@ -31,5 +31,5 @@ index 8df430d..7130c7a 100644
# For adding output
def add_alert(self, alertstring):
--
-1.7.11.7
+1.9.3
diff --git a/0010-Include-geo-replication-status-in-gluster-plugin.patch b/0010-Include-geo-replication-status-in-gluster-plugin.patch
index 0baf562..101386a 100644
--- a/0010-Include-geo-replication-status-in-gluster-plugin.patch
+++ b/0010-Include-geo-replication-status-in-gluster-plugin.patch
@@ -1,7 +1,7 @@
From 722f87787eaf8b50d16a3964892b16880c8bdbbb Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Feb 2014 15:17:55 +0000
-Subject: [PATCH 10/61] Include geo-replication status in gluster plugin
+Subject: [PATCH 10/72] Include geo-replication status in gluster plugin
Add the output of 'gluster volume geo-replication status' for
each discovered gluster volume to the report.
@@ -30,5 +30,5 @@ index 7c54fa0..02dbac3 100644
# collect this last as some of the other actions create log entries
self.add_copy_spec("/var/log/glusterfs")
--
-1.7.11.7
+1.9.3
diff --git a/0011-postgresql-minor-fixes.patch b/0011-postgresql-minor-fixes.patch
index 592b80e..313dbef 100644
--- a/0011-postgresql-minor-fixes.patch
+++ b/0011-postgresql-minor-fixes.patch
@@ -1,7 +1,7 @@
From ec82bf842d2c8537bf020909cfd406ec0ec3f023 Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo at redhat.com>
Date: Tue, 4 Feb 2014 15:15:10 +0000
-Subject: [PATCH 11/61] postgresql: minor fixes
+Subject: [PATCH 11/72] postgresql: minor fixes
- pep8 / style fixes
- Avoid redefining built-in 'file'
@@ -128,5 +128,5 @@ index 0a8e5ac..478faff 100644
-
+# vim: expandtab tabstop=4 shiftwidth=4
--
-1.7.11.7
+1.9.3
diff --git a/0012-postgresql-add-logs-about-errors-warnings.patch b/0012-postgresql-add-logs-about-errors-warnings.patch
index 31ce0b9..d125d19 100644
--- a/0012-postgresql-add-logs-about-errors-warnings.patch
+++ b/0012-postgresql-add-logs-about-errors-warnings.patch
@@ -1,7 +1,7 @@
From 7c53bbe37e1841777a95331ccaf6a43f39e23f86 Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo at redhat.com>
Date: Tue, 4 Feb 2014 15:15:51 +0000
-Subject: [PATCH 12/61] postgresql: add logs about errors / warnings
+Subject: [PATCH 12/72] postgresql: add logs about errors / warnings
give more info to support about what happened while
collecting the report.
@@ -64,5 +64,5 @@ index 478faff..0aa67a1 100644
class RedHatPostgreSQL(PostgreSQL, RedHatPlugin):
--
-1.7.11.7
+1.9.3
diff --git a/0013-postgresql-added-license-and-copyright.patch b/0013-postgresql-added-license-and-copyright.patch
index 7e2a475..2fc6dbe 100644
--- a/0013-postgresql-added-license-and-copyright.patch
+++ b/0013-postgresql-added-license-and-copyright.patch
@@ -1,7 +1,7 @@
From b2cc567aa3c6671de9992375032dedeec9d2d4bd Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo at redhat.com>
Date: Tue, 4 Feb 2014 15:18:24 +0000
-Subject: [PATCH 13/61] postgresql: added license and copyright
+Subject: [PATCH 13/72] postgresql: added license and copyright
Signed-off-by: Sandro Bonazzola <sbonazzo at redhat.com>
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
@@ -37,5 +37,5 @@ index 0aa67a1..df14f86 100644
import tempfile
--
-1.7.11.7
+1.9.3
diff --git a/0014-postgresql-allow-use-TCP-socket.patch b/0014-postgresql-allow-use-TCP-socket.patch
index ae36e48..76cc5ed 100644
--- a/0014-postgresql-allow-use-TCP-socket.patch
+++ b/0014-postgresql-allow-use-TCP-socket.patch
@@ -1,7 +1,7 @@
From cfef4d7ee758bffe6242c0d342261300a0e8194c Mon Sep 17 00:00:00 2001
From: Sandro Bonazzola <sbonazzo at redhat.com>
Date: Tue, 4 Feb 2014 15:19:19 +0000
-Subject: [PATCH 14/61] postgresql: allow use TCP socket
+Subject: [PATCH 14/72] postgresql: allow use TCP socket
allow to use TCP socket and not only UNIX socket
for connecting to postgresql database
@@ -52,5 +52,5 @@ index df14f86..cc51195 100644
os.environ["PGPASSWORD"] = str(old_env_pgpassword)
if (status == 0):
--
-1.7.11.7
+1.9.3
diff --git a/0015-Pass-no-archive-to-rhsm-debug-script.patch b/0015-Pass-no-archive-to-rhsm-debug-script.patch
index 9af36c7..12905fe 100644
--- a/0015-Pass-no-archive-to-rhsm-debug-script.patch
+++ b/0015-Pass-no-archive-to-rhsm-debug-script.patch
@@ -1,7 +1,7 @@
From f57c793a07e86c1659b2f5c6b49b93f5007c139c Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 4 Feb 2014 15:43:56 +0000
-Subject: [PATCH 15/61] Pass --no-archive to rhsm-debug script
+Subject: [PATCH 15/72] Pass --no-archive to rhsm-debug script
Versions of subscription-manager since 1.10.11-2.el7 support the
--no-archive option to disable creation of a zip archive. Pass
@@ -27,5 +27,5 @@ index a9ae4e4..81788f1 100644
if self.get_option("yumlist"):
--
-1.7.11.7
+1.9.3
diff --git a/0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch b/0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
index 51ba6ef..13fc79f 100644
--- a/0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
+++ b/0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
@@ -1,7 +1,7 @@
From a96a5e8397b465f556c5a10274a4c7248e737fbf Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 4 Feb 2014 11:37:15 +0000
-Subject: [PATCH 16/61] Ensure unused fds are closed when calling subprocesses
+Subject: [PATCH 16/72] Ensure unused fds are closed when calling subprocesses
via Popen
When sos communicates with a child process using Popen all IO
@@ -77,5 +77,5 @@ index 7a8674a..a9aca74 100644
return (p.returncode, stdout.decode('utf-8'), 0)
else:
--
-1.7.11.7
+1.9.3
diff --git a/0017-Fix-gluster-volume-name-extraction.patch b/0017-Fix-gluster-volume-name-extraction.patch
index 03ffb97..d728d41 100644
--- a/0017-Fix-gluster-volume-name-extraction.patch
+++ b/0017-Fix-gluster-volume-name-extraction.patch
@@ -1,7 +1,7 @@
From aa0a14db011c59116beb51413ee9a0b253e04f1a Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 10 Feb 2014 15:07:36 +0000
-Subject: [PATCH 17/61] Fix gluster volume name extraction
+Subject: [PATCH 17/72] Fix gluster volume name extraction
The get_volume_names() function in the gluster plugin tries to
extract volume names from the output of the "gluster volume info"
@@ -27,5 +27,5 @@ index 02dbac3..4286b59 100644
fp.close()
return out
--
-1.7.11.7
+1.9.3
diff --git a/0018-Add-distupgrade-plugin.patch b/0018-Add-distupgrade-plugin.patch
index e731d0f..5faad2b 100644
--- a/0018-Add-distupgrade-plugin.patch
+++ b/0018-Add-distupgrade-plugin.patch
@@ -1,7 +1,7 @@
From 7f6d34d154b9fe110c168a5b44083d8e35bb2068 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 10 Feb 2014 15:27:24 +0000
-Subject: [PATCH 18/61] Add distupgrade plugin
+Subject: [PATCH 18/72] Add distupgrade plugin
Add a new plugin to collect data relating to completed or
attempted distribution upgrades. Currently supports the Red Hat
@@ -61,5 +61,5 @@ index 0000000..b45d099
+
+
--
-1.7.11.7
+1.9.3
diff --git a/0019-Fix-command-output-substitution-exception.patch b/0019-Fix-command-output-substitution-exception.patch
index 42ff946..a3ce205 100644
--- a/0019-Fix-command-output-substitution-exception.patch
+++ b/0019-Fix-command-output-substitution-exception.patch
@@ -1,7 +1,7 @@
From c48b762c2e98ee05a17375af7427af702f9c9925 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 11 Feb 2014 16:53:16 +0000
-Subject: [PATCH 19/61] Fix command output substitution exception
+Subject: [PATCH 19/72] Fix command output substitution exception
If a comand has a substitution registered via do_cmd_output_sub()
but no data was collected (e.g. command not found) the postproc
@@ -45,5 +45,5 @@ index 7130c7a..9b643ab 100644
time_passed = time() - start_time
self.proflog.debug("subst: %-75s time: %f"
--
-1.7.11.7
+1.9.3
diff --git a/0020-Improve-error-message-when-cluster.crm_from-is-inval.patch b/0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
index 66474ff..9e00d93 100644
--- a/0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
+++ b/0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
@@ -1,7 +1,7 @@
From 61e8147e436533c5ccb75a6061a4fcc7368970b6 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 11 Feb 2014 16:56:37 +0000
-Subject: [PATCH 20/61] Improve error message when cluster.crm_from is invalid
+Subject: [PATCH 20/72] Improve error message when cluster.crm_from is invalid
If a user passes a non-date string value as the crm_from parameter
of the cluster plugin an error message is logged:
@@ -34,5 +34,5 @@ index eeacdab..8d73dc1 100644
crm_dest = os.path.join(self.get_cmd_dir(), 'crm_report')
--
-1.7.11.7
+1.9.3
diff --git a/0021-Remove-useless-check_enabled-from-sar-plugin.patch b/0021-Remove-useless-check_enabled-from-sar-plugin.patch
index 8d9749a..a687033 100644
--- a/0021-Remove-useless-check_enabled-from-sar-plugin.patch
+++ b/0021-Remove-useless-check_enabled-from-sar-plugin.patch
@@ -1,7 +1,7 @@
From 2591ac0719c256af3ed3b392f5bc5972ed3a1104 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 14 Feb 2014 16:54:15 +0000
-Subject: [PATCH 21/61] Remove useless check_enabled() from sar plugin
+Subject: [PATCH 21/72] Remove useless check_enabled() from sar plugin
The sar plugin implemented a check_enabled() to catch cases where
the plugin is force-enabled on a system with no sar installation.
@@ -34,5 +34,5 @@ index 1086208..cf53d5b 100644
if self.get_option("all_sar"):
self.sa_size = 0
--
-1.7.11.7
+1.9.3
diff --git a/0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch b/0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
index 816db87..f86007c 100644
--- a/0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
+++ b/0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
@@ -1,7 +1,7 @@
From 80e251f4c30d9f8263c472e07d18a4b0b21ebf4e Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 14 Feb 2014 17:20:25 +0000
-Subject: [PATCH 22/61] Eliminate hard-coded /var/log/sa paths in sar plugin
+Subject: [PATCH 22/72] Eliminate hard-coded /var/log/sa paths in sar plugin
The Sar plugin classes define a self.sa_path - use it consistently
throughout the plugin when generating strings containing the path.
@@ -36,5 +36,5 @@ index cf53d5b..470d82f 100644
# find all the sa file that don't have an existing sar file
for fname in dirList:
--
-1.7.11.7
+1.9.3
diff --git a/0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch b/0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
index e9a917b..da126a8 100644
--- a/0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
+++ b/0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
@@ -1,7 +1,7 @@
From fec14d2d9e0114e959d9626ca1457cd578c1d029 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 14 Feb 2014 20:12:14 +0000
-Subject: [PATCH 23/61] Scrub ldap_default_authtok password in sssd plugin
+Subject: [PATCH 23/72] Scrub ldap_default_authtok password in sssd plugin
The file sssd.conf collected by the sssd plugin may contain an
ldap password. Add a postproc() method to replace the string with
@@ -34,5 +34,5 @@ index b28f4b4..0d201f4 100644
class RedHatSssd(Sssd, RedHatPlugin):
"""sssd-related Diagnostic Information on Red Hat based distributions
--
-1.7.11.7
+1.9.3
diff --git a/0024-Replace-package-check-with-file-check-in-anacron.patch b/0024-Replace-package-check-with-file-check-in-anacron.patch
index 687b243..aed48ff 100644
--- a/0024-Replace-package-check-with-file-check-in-anacron.patch
+++ b/0024-Replace-package-check-with-file-check-in-anacron.patch
@@ -1,7 +1,7 @@
From 3dac227dde7af1168fa3c668836d7dde711981bd Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Mon, 3 Mar 2014 13:56:23 +0000
-Subject: [PATCH 24/61] Replace package check with file check in anacron
+Subject: [PATCH 24/72] Replace package check with file check in anacron
The anacron facility may be provided by packages named 'anacron',
'chronie-anacron' etc. They all use a common /etc/anacrontab file
@@ -29,5 +29,5 @@ index a60c85e..e9595a8 100644
- self.add_copy_spec("/etc/anacrontab")
+ self.add_copy_specs(list(self.files))
--
-1.7.11.7
+1.9.3
diff --git a/0025-Remove-the-rhevm-plugin.patch b/0025-Remove-the-rhevm-plugin.patch
index c049307..56bdda6 100644
--- a/0025-Remove-the-rhevm-plugin.patch
+++ b/0025-Remove-the-rhevm-plugin.patch
@@ -1,7 +1,7 @@
From 3758b10e367117945148c797b4b709d77277b84b Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood at redhat.com>
Date: Tue, 4 Mar 2014 16:18:00 +0000
-Subject: [PATCH 25/61] Remove the rhevm plugin.
+Subject: [PATCH 25/72] Remove the rhevm plugin.
This functionality is now provided by the ovirt-log-collector project [1] and independently shipped
VDSM sos plugin [2].
@@ -47,5 +47,5 @@ index 8068e05..0000000
- r"Password.type=(.*)",
- r'Password.type=********')
--
-1.7.11.7
+1.9.3
diff --git a/0026-powerpc-Move-VPD-related-tool-under-common-code.patch b/0026-powerpc-Move-VPD-related-tool-under-common-code.patch
index a0efa0a..f968677 100644
--- a/0026-powerpc-Move-VPD-related-tool-under-common-code.patch
+++ b/0026-powerpc-Move-VPD-related-tool-under-common-code.patch
@@ -1,7 +1,7 @@
From 6fb9d5df14b3b0e21db458fd5fcd10691bb9fd0e Mon Sep 17 00:00:00 2001
From: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
Date: Tue, 11 Mar 2014 11:07:51 +0000
-Subject: [PATCH 26/61] powerpc: Move VPD related tool under common code
+Subject: [PATCH 26/72] powerpc: Move VPD related tool under common code
VPD related tools (lsvpd, lscfg, lsmcode) is supported on both
pSeries and PowerNV platform. Hence moving these commands under
@@ -41,5 +41,5 @@ index dfaacb9..8fd6b4f 100644
self.add_cmd_output("servicelog --dump")
self.add_cmd_output("servicelog_notify --list")
--
-1.7.11.7
+1.9.3
diff --git a/0027-Add-PowerNV-specific-debug-data.patch b/0027-Add-PowerNV-specific-debug-data.patch
index ef5ef48..8d61786 100644
--- a/0027-Add-PowerNV-specific-debug-data.patch
+++ b/0027-Add-PowerNV-specific-debug-data.patch
@@ -1,7 +1,7 @@
From a66d4fccfe093dfa29dfaa4808f361bc7063c742 Mon Sep 17 00:00:00 2001
From: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
Date: Tue, 11 Mar 2014 12:18:26 +0000
-Subject: [PATCH 27/61] Add PowerNV specific debug data
+Subject: [PATCH 27/72] Add PowerNV specific debug data
This patch adds support to collect more debug files on
PowerNV platform.
@@ -29,5 +29,5 @@ index 8fd6b4f..9681094 100644
+ self.add_cmd_output("ls -l /var/log/dump")
+
--
-1.7.11.7
+1.9.3
diff --git a/0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch b/0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
index 9c7ae57..3e95621 100644
--- a/0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
+++ b/0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
@@ -1,7 +1,7 @@
From 877f93bcd469b939ec044539b9ea4a0d33e9f177 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 11 Mar 2014 15:27:31 +0000
-Subject: [PATCH 28/61] Fix remaining use of obsolete 'get_cmd_dir()' in
+Subject: [PATCH 28/72] Fix remaining use of obsolete 'get_cmd_dir()' in
plugins
The get_cmd_dir() method was renamed to get_cmd_path(). Fix the
@@ -40,5 +40,5 @@ index 81788f1..aa8cb18 100644
if self.get_option("yumlist"):
# List various information about available packages
--
-1.7.11.7
+1.9.3
diff --git a/0029-Update-systemd-support.patch b/0029-Update-systemd-support.patch
index 1a56ea1..66d5922 100644
--- a/0029-Update-systemd-support.patch
+++ b/0029-Update-systemd-support.patch
@@ -1,7 +1,7 @@
From 7146472eb85bb4ea39a244ca252e66478b3e30dd Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 12 Mar 2014 13:02:39 +0000
-Subject: [PATCH 29/61] Update systemd support
+Subject: [PATCH 29/72] Update systemd support
- Drop support for 'systemctl dump' as this no longer exists.
- Add 'systemctl list-units' for convenience
@@ -31,5 +31,5 @@ index 915c8fc..38be63e 100644
self.add_cmd_output("journalctl --verify")
self.add_cmd_output("journalctl --all --this-boot --no-pager")
--
-1.7.11.7
+1.9.3
diff --git a/0030-Add-tuned-plugin.patch b/0030-Add-tuned-plugin.patch
index 7939fa8..bec42b1 100644
--- a/0030-Add-tuned-plugin.patch
+++ b/0030-Add-tuned-plugin.patch
@@ -1,7 +1,7 @@
From c55c58cf2dabf93c924c839c8ed045c18e31ba1c Mon Sep 17 00:00:00 2001
From: Peter Portante <peter.portante at redhat.com>
Date: Wed, 29 Jan 2014 21:50:27 -0500
-Subject: [PATCH 30/61] Add tuned plugin
+Subject: [PATCH 30/72] Add tuned plugin
Resolves Issue #232.
@@ -49,5 +49,5 @@ index 0000000..60c22bc
+ self.add_copy_spec("/var/log/tuned/tuned.log")
+
--
-1.7.11.7
+1.9.3
diff --git a/0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch b/0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
index 07e4ef2..db0d449 100644
--- a/0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
+++ b/0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
@@ -1,7 +1,7 @@
From ef4e4b60eeaef33fa5e4ee074c6736cd3412397b Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 12 Mar 2014 16:27:34 +0000
-Subject: [PATCH 31/61] Clean up get_cmd_path/make_cmd_path/make_cmd_dirs mess
+Subject: [PATCH 31/72] Clean up get_cmd_path/make_cmd_path/make_cmd_dirs mess
Clean up the Plugin helper methods for handling command output
paths. This better matches the proposal in Issue #181 and
@@ -169,5 +169,5 @@ index aa8cb18..c978842 100644
if self.get_option("yumlist"):
# List various information about available packages
--
-1.7.11.7
+1.9.3
diff --git a/0032-Fix-broken-binary-detection-in-satellite-plugin.patch b/0032-Fix-broken-binary-detection-in-satellite-plugin.patch
index 484e211..27a64f0 100644
--- a/0032-Fix-broken-binary-detection-in-satellite-plugin.patch
+++ b/0032-Fix-broken-binary-detection-in-satellite-plugin.patch
@@ -1,7 +1,7 @@
From 15f46d44afa055edc169670303c81fb97dcfd0ae Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 12 Mar 2014 17:57:34 +0000
-Subject: [PATCH 32/61] Fix broken binary detection in satellite plugin
+Subject: [PATCH 32/72] Fix broken binary detection in satellite plugin
The satellite plugin attempts to check for the existence of the
'satellite-debug' binary before running it. This was broken by
@@ -31,5 +31,5 @@ index 474933a..28c8bca 100644
if self.proxy:
self.add_copy_specs(["/etc/squid", "/var/log/squid"])
--
-1.7.11.7
+1.9.3
diff --git a/0033-Rename-validatePlugin-to-validate_plugin.patch b/0033-Rename-validatePlugin-to-validate_plugin.patch
index 10372e1..4d9f744 100644
--- a/0033-Rename-validatePlugin-to-validate_plugin.patch
+++ b/0033-Rename-validatePlugin-to-validate_plugin.patch
@@ -1,7 +1,7 @@
From db8839351479c60234bb6873394d93b56f0174eb Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 12 Mar 2014 19:36:02 +0000
-Subject: [PATCH 33/61] Rename validatePlugin to validate_plugin
+Subject: [PATCH 33/72] Rename validatePlugin to validate_plugin
This one somehow didn't get the memo about camelCase not being
cool any more in sos. Rename the method to comply with pep8 and
@@ -40,5 +40,5 @@ index 0faa364..fe78abd 100644
if self.opts.verbosity > 0:
self._skip(plugin_class, _("does not validate"))
--
-1.7.11.7
+1.9.3
diff --git a/0034-Update-policy_tests.py-for-validate_plugin-change.patch b/0034-Update-policy_tests.py-for-validate_plugin-change.patch
index 101861e..438f130 100644
--- a/0034-Update-policy_tests.py-for-validate_plugin-change.patch
+++ b/0034-Update-policy_tests.py-for-validate_plugin-change.patch
@@ -1,7 +1,7 @@
From 3eb24386719ee06c9e726550065c5427f1021c6f Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 13 Mar 2014 10:48:36 +0000
-Subject: [PATCH 34/61] Update policy_tests.py for validate_plugin change
+Subject: [PATCH 34/72] Update policy_tests.py for validate_plugin change
The policy_tests unit tests call validatePlugin(). Update them to
use the new name.
@@ -46,5 +46,5 @@ index aa74da7..764af83 100644
def test_can_import(self):
self.assertTrue(import_policy('redhat') is not None)
--
-1.7.11.7
+1.9.3
diff --git a/0035-Match-plugins-against-policies.patch b/0035-Match-plugins-against-policies.patch
index 6debc83..f80fac7 100644
--- a/0035-Match-plugins-against-policies.patch
+++ b/0035-Match-plugins-against-policies.patch
@@ -1,7 +1,7 @@
From 4d1351efbd09220c36e889e222c40fe3ae68958a Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 12 Mar 2014 20:25:19 +0000
-Subject: [PATCH 35/61] Match plugins against policies
+Subject: [PATCH 35/72] Match plugins against policies
Fixes Issue #238.
@@ -146,5 +146,5 @@ index fe78abd..13a46bf 100644
self.soslog.warning(_("plugin %s does not install, skipping: %s") % (plug, e))
if self.raise_plugins:
--
-1.7.11.7
+1.9.3
diff --git a/0036-Do-not-collect-isos-in-cobbler-plugin.patch b/0036-Do-not-collect-isos-in-cobbler-plugin.patch
index 9473816..5b26bfb 100644
--- a/0036-Do-not-collect-isos-in-cobbler-plugin.patch
+++ b/0036-Do-not-collect-isos-in-cobbler-plugin.patch
@@ -1,7 +1,7 @@
From 3ff674035d8962bf3ca3320900fccc6619af7a3d Mon Sep 17 00:00:00 2001
From: Adam Stokes <adam.stokes at ubuntu.com>
Date: Fri, 14 Mar 2014 15:03:29 -0400
-Subject: [PATCH 36/61] Do not collect isos in cobbler plugin
+Subject: [PATCH 36/72] Do not collect isos in cobbler plugin
In Ubuntu isos are being added to the tarball, do not do that.
@@ -20,5 +20,5 @@ index e3d289e..b754813 100644
self.add_copy_spec("/var/lib/cobbler")
+ self.add_forbidden_path("/var/lib/cobbler/isos")
--
-1.7.11.7
+1.9.3
diff --git a/0037-Call-rhsm-debug-with-the-sos-switch.patch b/0037-Call-rhsm-debug-with-the-sos-switch.patch
index 60d1806..f9cc992 100644
--- a/0037-Call-rhsm-debug-with-the-sos-switch.patch
+++ b/0037-Call-rhsm-debug-with-the-sos-switch.patch
@@ -1,7 +1,7 @@
From f617db3b8232c5864726c60b11a91162409d867f Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 20 Mar 2014 18:56:58 +0000
-Subject: [PATCH 37/61] Call rhsm-debug with the --sos switch
+Subject: [PATCH 37/72] Call rhsm-debug with the --sos switch
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -22,5 +22,5 @@ index c978842..b05c0fe 100644
if self.get_option("yumlist"):
--
-1.7.11.7
+1.9.3
diff --git a/0038-Fix-plugin_test-exception-on-six.PY2.patch b/0038-Fix-plugin_test-exception-on-six.PY2.patch
index 391beba..8ba9c5a 100644
--- a/0038-Fix-plugin_test-exception-on-six.PY2.patch
+++ b/0038-Fix-plugin_test-exception-on-six.PY2.patch
@@ -1,7 +1,7 @@
From eb2b77cc38130882db71b73a5a026a454d261684 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 25 Mar 2014 17:26:11 +0000
-Subject: [PATCH 38/61] Fix plugin_test exception on six.PY2
+Subject: [PATCH 38/72] Fix plugin_test exception on six.PY2
Replace explicit test for six.PY2 with try/exception handling of
StringIO import.
@@ -28,5 +28,5 @@ index c4b540f..31ffae4 100644
from sos.plugins import Plugin, regex_findall, sos_relative_path, mangle_command
--
-1.7.11.7
+1.9.3
diff --git a/0039-Remove-profile-support.patch b/0039-Remove-profile-support.patch
index b46de42..44b0487 100644
--- a/0039-Remove-profile-support.patch
+++ b/0039-Remove-profile-support.patch
@@ -1,7 +1,7 @@
From 4553f0942c00b47342deea7fc47bb9822484a65e Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Tue, 25 Mar 2014 17:28:31 +0000
-Subject: [PATCH 39/61] Remove --profile support
+Subject: [PATCH 39/72] Remove --profile support
The handrolled profile logging support in sos hasn't been widely
used in a long time and is a problem better solved with external
@@ -240,5 +240,5 @@ index 31ffae4..0f8ef5d 100644
class PluginToolTests(unittest.TestCase):
--
-1.7.11.7
+1.9.3
diff --git a/0040-Dead-code-removal-sos_relative_path.patch b/0040-Dead-code-removal-sos_relative_path.patch
index 4ab2e65..72079b4 100644
--- a/0040-Dead-code-removal-sos_relative_path.patch
+++ b/0040-Dead-code-removal-sos_relative_path.patch
@@ -1,7 +1,7 @@
From e708041c050245bf05a7205e6661f8402e8e6a66 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 12:22:29 +0000
-Subject: [PATCH 40/61] Dead code removal: sos_relative_path()
+Subject: [PATCH 40/72] Dead code removal: sos_relative_path()
The function is defined and even has test cases. But no callers..
Remove the function and the test cases that exercise it.
@@ -74,5 +74,5 @@ index 0f8ef5d..5eb1304 100644
self.assertEquals("foo", mangle_command("/usr/bin/foo"))
self.assertEquals("foo_-x", mangle_command("/usr/bin/foo -x"))
--
-1.7.11.7
+1.9.3
diff --git a/0041-Dead-code-removal-DirTree.patch b/0041-Dead-code-removal-DirTree.patch
index fec2b9f..24acfee 100644
--- a/0041-Dead-code-removal-DirTree.patch
+++ b/0041-Dead-code-removal-DirTree.patch
@@ -1,7 +1,7 @@
From 6b3b56ee17e14a0f0de8a16a6a52b3708d01146b Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 12:24:33 +0000
-Subject: [PATCH 41/61] Dead code removal: DirTree
+Subject: [PATCH 41/72] Dead code removal: DirTree
The DirTree class has remained unused since it was implemented.
Remove the definition and associated test cases.
@@ -142,5 +142,5 @@ index 04c5241..da0987f 100644
def test_simple_hash(self):
--
-1.7.11.7
+1.9.3
diff --git a/0042-Dead-code-removal-utilities.checksum.patch b/0042-Dead-code-removal-utilities.checksum.patch
index ef15e25..beb43fd 100644
--- a/0042-Dead-code-removal-utilities.checksum.patch
+++ b/0042-Dead-code-removal-utilities.checksum.patch
@@ -1,7 +1,7 @@
From 9c88a8ff071c9a74e3b412bd4f4ef19cd9248611 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 12:40:17 +0000
-Subject: [PATCH 42/61] Dead code removal: utilities.checksum()
+Subject: [PATCH 42/72] Dead code removal: utilities.checksum()
Has test case but no callers. Delete it.
@@ -68,5 +68,5 @@ index da0987f..395fde1 100644
def test_nonexe_file(self):
--
-1.7.11.7
+1.9.3
diff --git a/0043-Add-vim-tags-to-all-python-source-files.patch b/0043-Add-vim-tags-to-all-python-source-files.patch
index e6957a1..6ceb4b2 100644
--- a/0043-Add-vim-tags-to-all-python-source-files.patch
+++ b/0043-Add-vim-tags-to-all-python-source-files.patch
@@ -1,7 +1,7 @@
From 747189c07e5536151de3e656bc8fa5d23d8baf3c Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 13:07:13 +0000
-Subject: [PATCH 43/61] Add vim tags to all python source files
+Subject: [PATCH 43/72] Add vim tags to all python source files
Fixes Issue #243.
@@ -1826,5 +1826,5 @@ index 395fde1..f3b1629 100644
+
+# vim: et ts=4 sw=4
--
-1.7.11.7
+1.9.3
diff --git a/0044-Dead-code-removal-sos.plugins.common_prefix.patch b/0044-Dead-code-removal-sos.plugins.common_prefix.patch
index 676eefc..4c273ee 100644
--- a/0044-Dead-code-removal-sos.plugins.common_prefix.patch
+++ b/0044-Dead-code-removal-sos.plugins.common_prefix.patch
@@ -1,7 +1,7 @@
From e39258bacc722ea9e7446c93b6443b8e1923e3a4 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 17:38:26 +0000
-Subject: [PATCH 44/61] Dead code removal: sos.plugins.common_prefix()
+Subject: [PATCH 44/72] Dead code removal: sos.plugins.common_prefix()
Unused. Delete.
@@ -35,5 +35,5 @@ index 9ee0b61..4de8c0d 100644
'''Return a list of all non overlapping matches in the string(s)'''
try:
--
-1.7.11.7
+1.9.3
diff --git a/0045-Dead-code-removal-PluginException.patch b/0045-Dead-code-removal-PluginException.patch
index e7dac27..02881cb 100644
--- a/0045-Dead-code-removal-PluginException.patch
+++ b/0045-Dead-code-removal-PluginException.patch
@@ -1,7 +1,7 @@
From 6182367ec0672721d1381e40aaa97c3d2f504a95 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Wed, 26 Mar 2014 17:39:43 +0000
-Subject: [PATCH 45/61] Dead code removal: PluginException
+Subject: [PATCH 45/72] Dead code removal: PluginException
Defined but never used. Delete.
@@ -27,5 +27,5 @@ index 4de8c0d..0c4b9b4 100644
""" This is the base class for sosreport plugins. Plugins should subclass
this and set the class variables where applicable.
--
-1.7.11.7
+1.9.3
diff --git a/0046-Convert-infiniband-to-package-list.patch b/0046-Convert-infiniband-to-package-list.patch
index 0bd3381..0845c4a 100644
--- a/0046-Convert-infiniband-to-package-list.patch
+++ b/0046-Convert-infiniband-to-package-list.patch
@@ -1,7 +1,7 @@
From 3f742644ebbf27b7b024a2f7061c347196312308 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 11:39:30 +0000
-Subject: [PATCH 46/61] Convert infiniband to package list
+Subject: [PATCH 46/72] Convert infiniband to package list
Remove infiniband's open-coded check_enabled() and use a package
list to control plugin activation.
@@ -29,5 +29,5 @@ index 2c890a5..d3ec982 100644
def setup(self):
self.add_copy_specs([
--
-1.7.11.7
+1.9.3
diff --git a/0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch b/0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
index d39650a..9bf94d7 100644
--- a/0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
+++ b/0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
@@ -1,7 +1,7 @@
From 1bd31b763a11f15c89b1e2ae16788867ff62a84e Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 11:40:40 +0000
-Subject: [PATCH 47/61] Replace self.policy().pkg_by_name() us in Logs plugin
+Subject: [PATCH 47/72] Replace self.policy().pkg_by_name() us in Logs plugin
Use self.is_installed() for simple package presence tests.
@@ -24,5 +24,5 @@ index 1cd767c..318377d 100644
logs += self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", "/etc/rsyslog.conf")
for i in logs:
--
-1.7.11.7
+1.9.3
diff --git a/0048-Clean-up-package-checks-in-processor-plugin.patch b/0048-Clean-up-package-checks-in-processor-plugin.patch
index 297602f..d123385 100644
--- a/0048-Clean-up-package-checks-in-processor-plugin.patch
+++ b/0048-Clean-up-package-checks-in-processor-plugin.patch
@@ -1,7 +1,7 @@
From 426549369f818091935712936514382786502094 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 11:50:33 +0000
-Subject: [PATCH 48/61] Clean up package checks in processor plugin
+Subject: [PATCH 48/72] Clean up package checks in processor plugin
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -48,5 +48,5 @@ index 391c64f..0b236f8 100644
# vim: et ts=4 sw=4
--
-1.7.11.7
+1.9.3
diff --git a/0049-Pythonify-Plugin._path_in_pathlist.patch b/0049-Pythonify-Plugin._path_in_pathlist.patch
index 09015d7..b2d9e5c 100644
--- a/0049-Pythonify-Plugin._path_in_pathlist.patch
+++ b/0049-Pythonify-Plugin._path_in_pathlist.patch
@@ -1,7 +1,7 @@
From 691e1811a2c6557c062a76e754a3b5228ce40fbf Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 13:05:41 +0000
-Subject: [PATCH 49/61] Pythonify Plugin._path_in_pathlist()
+Subject: [PATCH 49/72] Pythonify Plugin._path_in_pathlist()
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -25,5 +25,5 @@ index 0c4b9b4..55c2d48 100644
def copy_symlink(self, srcpath, sub=None):
# the target stored in the original symlink
--
-1.7.11.7
+1.9.3
diff --git a/0050-Fix-x86-arch-detection-in-processor-plugin.patch b/0050-Fix-x86-arch-detection-in-processor-plugin.patch
index bfbb90d..fede35c 100644
--- a/0050-Fix-x86-arch-detection-in-processor-plugin.patch
+++ b/0050-Fix-x86-arch-detection-in-processor-plugin.patch
@@ -1,7 +1,7 @@
From 36055d3d069a1176787e4dfb722fc5ca9a804ac5 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 13:46:40 +0000
-Subject: [PATCH 50/61] Fix x86 arch detection in processor plugin
+Subject: [PATCH 50/72] Fix x86 arch detection in processor plugin
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -22,5 +22,5 @@ index 0b236f8..14d800e 100644
--
-1.7.11.7
+1.9.3
diff --git a/0051-Refactor-Plugin.collect-pathway.patch b/0051-Refactor-Plugin.collect-pathway.patch
index 0478db0..b17aceb 100644
--- a/0051-Refactor-Plugin.collect-pathway.patch
+++ b/0051-Refactor-Plugin.collect-pathway.patch
@@ -1,7 +1,7 @@
From f98ae415bbff3f633641633a1c99c13021d4b352 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 13:47:10 +0000
-Subject: [PATCH 51/61] Refactor Plugin.collect() pathway
+Subject: [PATCH 51/72] Refactor Plugin.collect() pathway
Clean up and refactor the collect() path in preparation for
fixing the recursive tree copying code.
@@ -148,5 +148,5 @@ index 55c2d48..807bd3f 100644
"""
pass
--
-1.7.11.7
+1.9.3
diff --git a/0052-Remove-obsolete-checksum-reference-from-utilities_te.patch b/0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
index a150a8f..d697bb6 100644
--- a/0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
+++ b/0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
@@ -1,7 +1,7 @@
From 01ef1eaed6f1228fcb8f3d6bc1746396d638282d Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 13:59:14 +0000
-Subject: [PATCH 52/61] Remove obsolete checksum reference from
+Subject: [PATCH 52/72] Remove obsolete checksum reference from
utilities_tests.py
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
@@ -23,5 +23,5 @@ index f3b1629..22b2bbe 100644
TEST_DIR = os.path.dirname(__file__)
--
-1.7.11.7
+1.9.3
diff --git a/0053-Update-plugin_tests.py-to-match-new-method-names.patch b/0053-Update-plugin_tests.py-to-match-new-method-names.patch
index 17519c5..03a52ab 100644
--- a/0053-Update-plugin_tests.py-to-match-new-method-names.patch
+++ b/0053-Update-plugin_tests.py-to-match-new-method-names.patch
@@ -1,7 +1,7 @@
From fbd60e01cfce143757b6de13aaf2209319f3eee9 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 14:15:28 +0000
-Subject: [PATCH 53/61] Update plugin_tests.py to match new method names
+Subject: [PATCH 53/72] Update plugin_tests.py to match new method names
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -50,5 +50,5 @@ index 9a21b61..4ba5968 100644
def test_single_file_over_limit(self):
fn = create_file(2) # create 2MB file, consider a context manager
--
-1.7.11.7
+1.9.3
diff --git a/0054-Drop-RedHatPlugin-from-procenv.patch b/0054-Drop-RedHatPlugin-from-procenv.patch
index 0bfb664..0b65e0d 100644
--- a/0054-Drop-RedHatPlugin-from-procenv.patch
+++ b/0054-Drop-RedHatPlugin-from-procenv.patch
@@ -1,7 +1,7 @@
From 2f7baff1e206831945c83894fbc0ba5250178b5b Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 14:45:53 +0000
-Subject: [PATCH 54/61] Drop RedHatPlugin from procenv
+Subject: [PATCH 54/72] Drop RedHatPlugin from procenv
The procenv package is not shipped in Red Hat distributions so
remove the RedHatPlugin tagging class from it.
@@ -28,5 +28,5 @@ index e776e14..4367555 100644
"""
--
-1.7.11.7
+1.9.3
diff --git a/0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch b/0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
index b38535c..8ee6eb5 100644
--- a/0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
+++ b/0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
@@ -1,7 +1,7 @@
From a09090ab98b10e2eca363a4919397545d64f1c85 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 16:09:35 +0000
-Subject: [PATCH 55/61] Remove 'sub' parameter from Plugin.add_copy_spec*()
+Subject: [PATCH 55/72] Remove 'sub' parameter from Plugin.add_copy_spec*()
The 'sub' parameter to these functions allowed substituting part
of the path in the generated archive. E.g. transforming 'etc/'
@@ -160,5 +160,5 @@ index 807bd3f..de278d0 100644
def collect_cmd_output(self):
for progs in zip(self.collect_cmds):
--
-1.7.11.7
+1.9.3
diff --git a/0056-Remove-references-to-sub-parameter-from-plugin-tests.patch b/0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
index c7fa642..950d9e4 100644
--- a/0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
+++ b/0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
@@ -1,7 +1,7 @@
From f5be64704096d5bdf9f75cc78dc571c6d9325fcb Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 16:38:29 +0000
-Subject: [PATCH 56/61] Remove references to 'sub' parameter from plugin tests
+Subject: [PATCH 56/72] Remove references to 'sub' parameter from plugin tests
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -42,5 +42,5 @@ index 4ba5968..cf874f1 100644
self.assertEquals(1024 * 1024, len(content))
os.unlink(fn)
--
-1.7.11.7
+1.9.3
diff --git a/0057-Use-a-set-for-Plugin.copy_paths.patch b/0057-Use-a-set-for-Plugin.copy_paths.patch
index 83eba4b..4ee8577 100644
--- a/0057-Use-a-set-for-Plugin.copy_paths.patch
+++ b/0057-Use-a-set-for-Plugin.copy_paths.patch
@@ -1,7 +1,7 @@
From 81b06ca7406aee6ecb47f7afe33fc56caafee570 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 20:33:40 +0000
-Subject: [PATCH 57/61] Use a set for Plugin.copy_paths
+Subject: [PATCH 57/72] Use a set for Plugin.copy_paths
We want to remove any duplicates from the list of paths to
collect. Use a set and update it with the expansion of each copy
@@ -54,5 +54,5 @@ index de278d0..7b6180c 100644
def collect_cmd_output(self):
--
-1.7.11.7
+1.9.3
diff --git a/0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch b/0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
index 292a122..efcddd9 100644
--- a/0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
+++ b/0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
@@ -1,7 +1,7 @@
From cfefd80c828c309745cc40d8498223b4fbc7b5ca Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 20:52:49 +0000
-Subject: [PATCH 58/61] Update Plugin tests to treat copy_paths as a set
+Subject: [PATCH 58/72] Update Plugin tests to treat copy_paths as a set
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
---
@@ -22,5 +22,5 @@ index cf874f1..5074cbf 100644
def test_single_file_over_limit(self):
fn = create_file(2) # create 2MB file, consider a context manager
--
-1.7.11.7
+1.9.3
diff --git a/0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch b/0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
index 6dc90e9..ebcb7f3 100644
--- a/0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
+++ b/0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
@@ -1,7 +1,7 @@
From c613b172a44c98f40919c763eb4bf088476cbefa Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 21:04:42 +0000
-Subject: [PATCH 59/61] Add tests for Plugin.add_copy_spec()/add_copy_specs()
+Subject: [PATCH 59/72] Add tests for Plugin.add_copy_spec()/add_copy_specs()
Give add_copy_spec() and add_copy_specs() their own test cases.
@@ -57,5 +57,5 @@ index 5074cbf..a4905cf 100644
def test_single_file_over_limit(self):
fn = create_file(2) # create 2MB file, consider a context manager
--
-1.7.11.7
+1.9.3
diff --git a/0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch b/0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
index 92511d5..fb3ce4a 100644
--- a/0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
+++ b/0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
@@ -1,7 +1,7 @@
From 0bedab23f3eb86878d894419614e1728c395a84e Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Thu, 27 Mar 2014 21:06:24 +0000
-Subject: [PATCH 60/61] Raise a TypeError if add_copy_specs() is called with a
+Subject: [PATCH 60/72] Raise a TypeError if add_copy_specs() is called with a
string
Since strings are iterable a plugin attempting to call
@@ -44,5 +44,5 @@ index a4905cf..c44c162 100644
def test_single_file_over_limit(self):
--
-1.7.11.7
+1.9.3
diff --git a/0061-Add-collection-of-grub-configuration-for-UEFI-system.patch b/0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
index bfe18bc..45cdc13 100644
--- a/0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
+++ b/0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
@@ -1,7 +1,7 @@
From efc3b09c2b41c166e54593f0956b9f0eaf374925 Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr at redhat.com>
Date: Fri, 28 Mar 2014 16:29:38 +0000
-Subject: [PATCH 61/61] Add collection of grub configuration for UEFI systems
+Subject: [PATCH 61/72] Add collection of grub configuration for UEFI systems
UEFI systems store the grub configuration at:
@@ -57,5 +57,5 @@ index c9f64b0..95c1218 100644
self.add_cmd_output("ls -lanR /boot")
self.add_cmd_output("grub2-mkconfig")
--
-1.7.11.7
+1.9.3
diff --git a/0062-Add-Plugin.do_path_regex_sub.patch b/0062-Add-Plugin.do_path_regex_sub.patch
new file mode 100644
index 0000000..e742bd5
--- /dev/null
+++ b/0062-Add-Plugin.do_path_regex_sub.patch
@@ -0,0 +1,43 @@
+From f4c55faa2a369688b2f8d5885d2861522fb1f7de Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 3 Apr 2014 21:22:50 +0100
+Subject: [PATCH 62/72] Add Plugin.do_path_regex_sub()
+
+Add a method to the Plugin class to apply a regex substitution
+to a set of paths maching a path regex. For e.g.:
+
+ self.do_path_regex_sub(r'/etc/foo.*', 'pw=(.*)', 'pw=****')
+
+The oVirt plugin will use this.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/__init__.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
+index 7e865cd..88c909f 100644
+--- a/sos/plugins/__init__.py
++++ b/sos/plugins/__init__.py
+@@ -191,6 +191,18 @@ class Plugin(object):
+ replacements = 0
+ return replacements
+
++ def do_path_regex_sub(self, pathexp, regexp, subst):
++ '''Apply a regexp substituation to a set of files archived by
++ sos. The set of files to be substituted is generated by matching
++ collected file pathnames against pathexp which may be a regular
++ expression string or compiled re object. The portion of the file
++ to be replaced is specified via regexp and the replacement string
++ is passed in subst.'''
++ match = pathexp.match
++ file_list = [f for f in self.copied_files if match(f['srcpath'])]
++ for file in file_list:
++ self.do_file_sub(file['srcpath'], regexp, subst)
++
+ def do_regex_find_all(self, regex, fname):
+ return regex_findall(regex, fname)
+
+--
+1.9.3
+
diff --git a/0063-Make-do_path_regex_sub-honour-string-regex-arguments.patch b/0063-Make-do_path_regex_sub-honour-string-regex-arguments.patch
new file mode 100644
index 0000000..ce8de2e
--- /dev/null
+++ b/0063-Make-do_path_regex_sub-honour-string-regex-arguments.patch
@@ -0,0 +1,58 @@
+From ae3d6498965f7396a6fa7e2f10f799a354060c6f Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Mon, 2 Jun 2014 14:51:16 +0100
+Subject: [PATCH 63/72] Make do_path_regex_sub() honour string regex arguments
+
+The Plugin.do_path_regex_sub() method to apply regex substitutions
+to paths matching a pattern documents that it accepts either a
+compiled re object or a regular expression as a string:
+
+ '''Apply a regexp substituation to a set of files archived by
+ sos. The set of files to be substituted is generated by matching
+ collected file pathnames against pathexp which may be a regular
+ expression string or compiled re object. The portion of the file
+ to be replaced is specified via regexp and the replacement string
+ is passed in subst.'''
+
+It lies. Attempting to pass a string for the 'pathexp' parameter
+will result in:
+
+ Traceback (most recent call last):
+ File "/usr/sbin/sosreport", line 23, in <module>
+ main(sys.argv[1:])
+ File "/usr/lib/python2.6/site-packages/sos/sosreport.py", line 1229, in main
+ sos.execute()
+ AttributeError: 'str' object has no attribute 'match'
+
+ > /usr/lib/python2.6/site-packages/sos/plugins/__init__.py(219)do_path_regex_sub()
+ -> match = pathexp.match
+
+Look to see if the object we are passed has a 'match()' method and
+call re.compile on it if it does not.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+
+Conflicts:
+ sos/plugins/__init__.py
+---
+ sos/plugins/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
+index 88c909f..cf37d89 100644
+--- a/sos/plugins/__init__.py
++++ b/sos/plugins/__init__.py
+@@ -198,7 +198,9 @@ class Plugin(object):
+ expression string or compiled re object. The portion of the file
+ to be replaced is specified via regexp and the replacement string
+ is passed in subst.'''
+- match = pathexp.match
++ if not hasattr(pathexp, "match"):
++ pathexp = re.compile(pathexp)
++ match = pathexp.match
+ file_list = [f for f in self.copied_files if match(f['srcpath'])]
+ for file in file_list:
+ self.do_file_sub(file['srcpath'], regexp, subst)
+--
+1.9.3
+
diff --git a/0064-Add-oVirt-plugin.patch b/0064-Add-oVirt-plugin.patch
new file mode 100644
index 0000000..d1b19ee
--- /dev/null
+++ b/0064-Add-oVirt-plugin.patch
@@ -0,0 +1,159 @@
+From 3aba67d53584ba81bcebe87bb0e7612f18e56c7a Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 3 Apr 2014 21:30:07 +0100
+Subject: [PATCH 64/72] Add oVirt plugin
+
+Add a plugin for oVirt based on the RHEV log collector plugin
+with improvements and suggestions from Sandro Bonazzola.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 136 insertions(+)
+ create mode 100644 sos/plugins/ovirt.py
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+new file mode 100644
+index 0000000..3e64538
+--- /dev/null
++++ b/sos/plugins/ovirt.py
+@@ -0,0 +1,136 @@
++## Copyright (C) 2014 Red Hat, Inc., Sandro Bonazzola <sbonazzo at redhat.com>
++## Copyright (C) 2014 Red Hat, Inc., Bryn M. Reeves <bmr at redhat.com>
++## Copyright (C) 2010 Red Hat, Inc.
++
++### This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++## GNU General Public License for more details.
++
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++import os
++import re
++import signal
++
++
++from sos.plugins import Plugin, RedHatPlugin
++
++
++# Class name must be the same as file name and method names must not change
++class Ovirt(Plugin, RedHatPlugin):
++ """oVirt Engine related information"""
++
++ DB_PASS_FILES = re.compile(
++ flags=re.VERBOSE,
++ pattern=r"""
++ ^
++ /etc/
++ (rhevm|ovirt-engine)/
++ engine.conf
++ (\.d/.+.conf)?
++ $
++ """
++ )
++
++ DEFAULT_SENSITIVE_KEYS = (
++ 'ENGINE_DB_PASSWORD:ENGINE_PKI_TRUST_STORE_PASSWORD:'
++ 'ENGINE_PKI_ENGINE_STORE_PASSWORD'
++ )
++
++ plugin_name = "ovirt"
++
++ option_list = [
++ ('jbosstrace', 'Enable oVirt Engine JBoss stack trace collection', '', True),
++ ('sensitive_keys', 'Sensitive keys to be masked', '', DEFAULT_SENSITIVE_KEYS)
++ ]
++
++ def setup(self):
++ if self.get_option('jbosstrace'):
++ engine_pattern = "^ovirt-engine\ -server.*jboss-modules.jar"
++ pgrep = "pgrep -f '%s'" % engine_pattern
++ lines = self.call_ext_prog(pgrep)[1].splitlines()
++ engine_pids = [int(x) for x in lines]
++ if not engine_pids:
++ self.soslog.error('Unable to get ovirt-engine pid')
++ self.add_alert('Unable to get ovirt-engine pid')
++ for pid in engine_pids:
++ try:
++ # backtrace written to '/var/log/ovirt-engine/console.log
++ os.kill(pid, signal.SIGQUIT)
++ except OSError as e:
++ self.soslog.error('Unable to send signal to %d' % pid, e)
++
++ self.add_forbidden_path('/etc/ovirt-engine/.pgpass')
++ self.add_forbidden_path('/etc/rhevm/.pgpass')
++ # Copy engine config files.
++ self.add_copy_specs([
++ "/etc/ovirt-engine",
++ "/etc/rhevm",
++ "/var/log/ovirt-engine",
++ "/var/log/rhevm",
++ "/etc/sysconfig/ovirt-engine",
++ "/usr/share/ovirt-engine/conf",
++ "/var/log/ovirt-guest-agent",
++ "/var/lib/ovirt-engine/setup-history.txt",
++ "/var/lib/ovirt-engine/setup/answers",
++ "/var/lib/ovirt-engine/external_truststore",
++ "/var/tmp/ovirt-engine/config"
++ ])
++
++ def postproc(self):
++ """
++ Obfuscate sensitive keys.
++ """
++ self.do_file_sub(
++ "/etc/ovirt-engine/engine-config/engine-config.properties",
++ r"Password.type=(.*)",
++ r"Password.type=********"
++ )
++ self.do_file_sub(
++ "/etc/rhevm/rhevm-config/rhevm-config.properties",
++ r"Password.type=(.*)",
++ r"Password.type=********"
++ )
++
++ engine_files = (
++ 'ovirt-engine.xml',
++ 'ovirt-engine_history/current/ovirt-engine.v1.xml',
++ 'ovirt-engine_history/ovirt-engine.boot.xml',
++ 'ovirt-engine_history/ovirt-engine.initial.xml',
++ 'ovirt-engine_history/ovirt-engine.last.xml',
++ )
++ for filename in engine_files:
++ self.do_file_sub(
++ "/var/tmp/ovirt-engine/config/%s" % filename,
++ r"<password>(.*)</password>",
++ r"<password>********</password>"
++ )
++
++ self.do_file_sub(
++ "/etc/ovirt-engine/redhatsupportplugin.conf",
++ r"proxyPassword=(.*)",
++ r"proxyPassword=********"
++ )
++
++ sensitive_keys = self.DEFAULT_SENSITIVE_KEYS
++ #Handle --alloptions case which set this to True.
++ keys_opt = self.get_option('sensitive_keys')
++ if keys_opt and keys_opt is not True:
++ sensitive_keys = keys_opt
++ key_list = [x for x in sensitive_keys.split(':') if x]
++ for key in key_list:
++ self.do_path_regex_sub(
++ self.DB_PASS_FILES,
++ r'{key}=(.*)'.format(key=key),
++ r'{key}=********'.format(key=key)
++ )
++
++# vim: expandtab tabstop=4 shiftwidth=4
+--
+1.9.3
+
diff --git a/0065-Fix-call_ext_prog-use-in-oVirt-plugin.patch b/0065-Fix-call_ext_prog-use-in-oVirt-plugin.patch
new file mode 100644
index 0000000..91ba265
--- /dev/null
+++ b/0065-Fix-call_ext_prog-use-in-oVirt-plugin.patch
@@ -0,0 +1,30 @@
+From ae259bb166011d0ee252a05523ee667bbfc8adcd Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Wed, 21 May 2014 15:42:37 +0100
+Subject: [PATCH 65/72] Fix call_ext_prog() use in oVirt plugin
+
+The oVirt plugin tried to use the old tuple based return values
+for self.call_ext_prog(). Convert it to use the dictionary values
+instead.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index 3e64538..e245e9b 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -56,7 +56,7 @@ class Ovirt(Plugin, RedHatPlugin):
+ if self.get_option('jbosstrace'):
+ engine_pattern = "^ovirt-engine\ -server.*jboss-modules.jar"
+ pgrep = "pgrep -f '%s'" % engine_pattern
+- lines = self.call_ext_prog(pgrep)[1].splitlines()
++ lines = self.call_ext_prog(pgrep)['output'].splitlines()
+ engine_pids = [int(x) for x in lines]
+ if not engine_pids:
+ self.soslog.error('Unable to get ovirt-engine pid')
+--
+1.9.3
+
diff --git a/0066-ovirt-elide-passwords-in-iso-image-uploader.conf.patch b/0066-ovirt-elide-passwords-in-iso-image-uploader.conf.patch
new file mode 100644
index 0000000..8debe2c
--- /dev/null
+++ b/0066-ovirt-elide-passwords-in-iso-image-uploader.conf.patch
@@ -0,0 +1,40 @@
+From 7c16f07f889dd6de071544301a17ec4c4ee76d5d Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 5 Jun 2014 12:31:14 -0400
+Subject: [PATCH 66/72] [ovirt] elide passwords in {iso,image}uploader.conf
+
+These two configuration files may contain passwords of the form:
+
+Add do_file_sub() calls to the plugin's postproc to remove these.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index e245e9b..969440b 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -120,6 +120,18 @@ class Ovirt(Plugin, RedHatPlugin):
+ r"proxyPassword=********"
+ )
+
++ passwd_files = [
++ "imageuploader.conf",
++ "isouploader.conf"
++ ]
++ for conf_file in passwd_files:
++ conf_path = os.path.join("/etc/ovirt-engine", conf_file)
++ self.do_file_sub(
++ conf_path,
++ r"passwd=(.*)",
++ r"passwd=********"
++ )
++
+ sensitive_keys = self.DEFAULT_SENSITIVE_KEYS
+ #Handle --alloptions case which set this to True.
+ keys_opt = self.get_option('sensitive_keys')
+--
+1.9.3
+
diff --git a/0067-ovirt-elide-passwords-in-logcollector.conf.patch b/0067-ovirt-elide-passwords-in-logcollector.conf.patch
new file mode 100644
index 0000000..f092760
--- /dev/null
+++ b/0067-ovirt-elide-passwords-in-logcollector.conf.patch
@@ -0,0 +1,44 @@
+From 0985e89a11c8696fc1537b54516216c362676ec9 Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 5 Jun 2014 12:33:31 -0400
+Subject: [PATCH 67/72] [ovirt] elide passwords in logcollector.conf
+
+This configuration file may contain passwords of the form:
+
+And:
+
+Add these to the existing 'passwd_files' processing added in
+commit 3da5697.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index 969440b..acd6ad3 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -121,6 +121,7 @@ class Ovirt(Plugin, RedHatPlugin):
+ )
+
+ passwd_files = [
++ "logcollector.conf",
+ "imageuploader.conf",
+ "isouploader.conf"
+ ]
+@@ -131,6 +132,11 @@ class Ovirt(Plugin, RedHatPlugin):
+ r"passwd=(.*)",
+ r"passwd=********"
+ )
++ self.do_file_sub(
++ conf_path,
++ r"pg-pass=(.*)",
++ r"pg-pass=********"
++ )
+
+ sensitive_keys = self.DEFAULT_SENSITIVE_KEYS
+ #Handle --alloptions case which set this to True.
+--
+1.9.3
+
diff --git a/0068-ovirt-add-package-list-to-ovirt-plugin.patch b/0068-ovirt-add-package-list-to-ovirt-plugin.patch
new file mode 100644
index 0000000..0c00641
--- /dev/null
+++ b/0068-ovirt-add-package-list-to-ovirt-plugin.patch
@@ -0,0 +1,32 @@
+From 0c4b3b2226c3d85a6c421e414d1ebe2d171e9ee7 Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 5 Jun 2014 12:37:49 -0400
+Subject: [PATCH 68/72] [ovirt] add package list to ovirt plugin
+
+Make sure that the oVirt plugin only runs if the ovirt-engine
+package is present.
+
+This will need to be expanded when the ovirt-engine-dwh and
+ovirt-engine-reports support is merged (Issue #236 and Issue #237).
+
+Signed-off-by: Brym M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index acd6ad3..c6f8957 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -28,6 +28,8 @@ from sos.plugins import Plugin, RedHatPlugin
+ class Ovirt(Plugin, RedHatPlugin):
+ """oVirt Engine related information"""
+
++ packages = ('ovirt-engine',)
++
+ DB_PASS_FILES = re.compile(
+ flags=re.VERBOSE,
+ pattern=r"""
+--
+1.9.3
+
diff --git a/0069-Add-oVirt-Data-Warehouse-support.patch b/0069-Add-oVirt-Data-Warehouse-support.patch
new file mode 100644
index 0000000..226e373
--- /dev/null
+++ b/0069-Add-oVirt-Data-Warehouse-support.patch
@@ -0,0 +1,50 @@
+From 1a33c2baf58bc0d1933254bc80b01f33fef15630 Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Mon, 19 May 2014 20:51:12 +0100
+Subject: [PATCH 69/72] Add oVirt Data Warehouse support
+
+Add support for DWH to the oVirt plugin. Based on a patch for
+sos-2.0 by Sandro Bonazzola. Fixes Issue #236.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index c6f8957..f4b7f1e 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -35,8 +35,8 @@ class Ovirt(Plugin, RedHatPlugin):
+ pattern=r"""
+ ^
+ /etc/
+- (rhevm|ovirt-engine)/
+- engine.conf
++ (rhevm|ovirt-engine|ovirt-engine-dwh)/
++ (engine.conf|ovirt-engine-dwhd.conf)
+ (\.d/.+.conf)?
+ $
+ """
+@@ -44,7 +44,7 @@ class Ovirt(Plugin, RedHatPlugin):
+
+ DEFAULT_SENSITIVE_KEYS = (
+ 'ENGINE_DB_PASSWORD:ENGINE_PKI_TRUST_STORE_PASSWORD:'
+- 'ENGINE_PKI_ENGINE_STORE_PASSWORD'
++ 'ENGINE_PKI_ENGINE_STORE_PASSWORD:DWH_DB_PASSWORD'
+ )
+
+ plugin_name = "ovirt"
+@@ -76,7 +76,9 @@ class Ovirt(Plugin, RedHatPlugin):
+ self.add_copy_specs([
+ "/etc/ovirt-engine",
+ "/etc/rhevm",
++ "/etc/ovirt-engine-dwh",
+ "/var/log/ovirt-engine",
++ "/var/log/ovirt-engine-dwh",
+ "/var/log/rhevm",
+ "/etc/sysconfig/ovirt-engine",
+ "/usr/share/ovirt-engine/conf",
+--
+1.9.3
+
diff --git a/0070-Add-reports-support-to-oVirt-plugin.patch b/0070-Add-reports-support-to-oVirt-plugin.patch
new file mode 100644
index 0000000..b2560a9
--- /dev/null
+++ b/0070-Add-reports-support-to-oVirt-plugin.patch
@@ -0,0 +1,29 @@
+From cf7f71cbbb3ac8fa1ed19fd8dada0855042babda Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Mon, 19 May 2014 20:58:12 +0100
+Subject: [PATCH 70/72] Add reports support to oVirt plugin
+
+Based on a patch for sos-2.0 by Sandro Bonazzola.
+
+Fixes Issue #237.
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index f4b7f1e..472664c 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -79,6 +79,7 @@ class Ovirt(Plugin, RedHatPlugin):
+ "/etc/ovirt-engine-dwh",
+ "/var/log/ovirt-engine",
+ "/var/log/ovirt-engine-dwh",
++ "/var/log/ovirt-engine-reports",
+ "/var/log/rhevm",
+ "/etc/sysconfig/ovirt-engine",
+ "/usr/share/ovirt-engine/conf",
+--
+1.9.3
+
diff --git a/0071-ovirt-Add-dwh-and-reports-packages-to-plugin-package.patch b/0071-ovirt-Add-dwh-and-reports-packages-to-plugin-package.patch
new file mode 100644
index 0000000..2123a50
--- /dev/null
+++ b/0071-ovirt-Add-dwh-and-reports-packages-to-plugin-package.patch
@@ -0,0 +1,36 @@
+From 03920dfdb250ceaed5f3162276fcf4f0d0c3020d Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Thu, 5 Jun 2014 16:04:01 -0400
+Subject: [PATCH 71/72] [ovirt] Add dwh and reports packages to plugin package
+ list
+
+Allows the plugin to collect data on standalone dwh and reports
+installations.
+
+Related: Issue #236, Issue #237
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index 472664c..cc8daaf 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -28,7 +28,11 @@ from sos.plugins import Plugin, RedHatPlugin
+ class Ovirt(Plugin, RedHatPlugin):
+ """oVirt Engine related information"""
+
+- packages = ('ovirt-engine',)
++ packages = (
++ 'ovirt-engine',
++ 'ovirt-engine-dwh',
++ 'ovirt-engine-reports'
++ )
+
+ DB_PASS_FILES = re.compile(
+ flags=re.VERBOSE,
+--
+1.9.3
+
diff --git a/0072-ovirt-add-ovirt-scheduler-proxy-logs.patch b/0072-ovirt-add-ovirt-scheduler-proxy-logs.patch
new file mode 100644
index 0000000..661b123
--- /dev/null
+++ b/0072-ovirt-add-ovirt-scheduler-proxy-logs.patch
@@ -0,0 +1,25 @@
+From 90c185e4c7f13a360576bf59768b03b41ad268e4 Mon Sep 17 00:00:00 2001
+From: "Bryn M. Reeves" <bmr at redhat.com>
+Date: Tue, 17 Jun 2014 17:18:41 +0100
+Subject: [PATCH 72/72] [ovirt] add ovirt-scheduler-proxy logs
+
+Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
+---
+ sos/plugins/ovirt.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
+index cc8daaf..6cfb49c 100644
+--- a/sos/plugins/ovirt.py
++++ b/sos/plugins/ovirt.py
+@@ -84,6 +84,7 @@ class Ovirt(Plugin, RedHatPlugin):
+ "/var/log/ovirt-engine",
+ "/var/log/ovirt-engine-dwh",
+ "/var/log/ovirt-engine-reports",
++ "/var/log/ovirt-scheduler-proxy",
+ "/var/log/rhevm",
+ "/etc/sysconfig/ovirt-engine",
+ "/usr/share/ovirt-engine/conf",
+--
+1.9.3
+
diff --git a/sos.spec b/sos.spec
index c7815bf..9dd7045 100644
--- a/sos.spec
+++ b/sos.spec
@@ -18,67 +18,79 @@ Requires: rpm-python
Requires: tar
Requires: bzip2
Requires: xz
-Patch0: 0001-Fix-cluster-module-crm_report-support.patch
-Patch1: 0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
-Patch2: 0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
-Patch3: 0004-Fix-cluster-postproc-regression.patch
-Patch4: 0005-Fix-get_option-use-in-cluster-plugin.patch
-Patch5: 0006-Fix-verbose-file-logging.patch
-Patch6: 0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
-Patch7: 0008-Add-rhsm-debug-collection-to-yum-plugin.patch
-Patch8: 0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
-Patch9: 0010-Include-geo-replication-status-in-gluster-plugin.patch
-Patch10: 0011-postgresql-minor-fixes.patch
-Patch11: 0012-postgresql-add-logs-about-errors-warnings.patch
-Patch12: 0013-postgresql-added-license-and-copyright.patch
-Patch13: 0014-postgresql-allow-use-TCP-socket.patch
-Patch14: 0015-Pass-no-archive-to-rhsm-debug-script.patch
-Patch15: 0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
-Patch16: 0017-Fix-gluster-volume-name-extraction.patch
-Patch17: 0018-Add-distupgrade-plugin.patch
-Patch18: 0019-Fix-command-output-substitution-exception.patch
-Patch19: 0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
-Patch20: 0021-Remove-useless-check_enabled-from-sar-plugin.patch
-Patch21: 0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
-Patch22: 0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
-Patch23: 0024-Replace-package-check-with-file-check-in-anacron.patch
-Patch24: 0025-Remove-the-rhevm-plugin.patch
-Patch25: 0026-powerpc-Move-VPD-related-tool-under-common-code.patch
-Patch26: 0027-Add-PowerNV-specific-debug-data.patch
-Patch27: 0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
-Patch28: 0029-Update-systemd-support.patch
-Patch29: 0030-Add-tuned-plugin.patch
-Patch30: 0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
-Patch31: 0032-Fix-broken-binary-detection-in-satellite-plugin.patch
-Patch32: 0033-Rename-validatePlugin-to-validate_plugin.patch
-Patch33: 0034-Update-policy_tests.py-for-validate_plugin-change.patch
-Patch34: 0035-Match-plugins-against-policies.patch
-Patch35: 0036-Do-not-collect-isos-in-cobbler-plugin.patch
-Patch36: 0037-Call-rhsm-debug-with-the-sos-switch.patch
-Patch37: 0038-Fix-plugin_test-exception-on-six.PY2.patch
-Patch38: 0039-Remove-profile-support.patch
-Patch39: 0040-Dead-code-removal-sos_relative_path.patch
-Patch40: 0041-Dead-code-removal-DirTree.patch
-Patch41: 0042-Dead-code-removal-utilities.checksum.patch
-Patch42: 0043-Add-vim-tags-to-all-python-source-files.patch
-Patch43: 0044-Dead-code-removal-sos.plugins.common_prefix.patch
-Patch44: 0045-Dead-code-removal-PluginException.patch
-Patch45: 0046-Convert-infiniband-to-package-list.patch
-Patch46: 0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
-Patch47: 0048-Clean-up-package-checks-in-processor-plugin.patch
-Patch48: 0049-Pythonify-Plugin._path_in_pathlist.patch
-Patch49: 0050-Fix-x86-arch-detection-in-processor-plugin.patch
-Patch50: 0051-Refactor-Plugin.collect-pathway.patch
-Patch51: 0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
-Patch52: 0053-Update-plugin_tests.py-to-match-new-method-names.patch
-Patch53: 0054-Drop-RedHatPlugin-from-procenv.patch
-Patch54: 0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
-Patch55: 0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
-Patch56: 0057-Use-a-set-for-Plugin.copy_paths.patch
-Patch57: 0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
-Patch58: 0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
-Patch59: 0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
-Patch60: 0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
+Patch1: 0001-Fix-cluster-module-crm_report-support.patch
+Patch2: 0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
+Patch3: 0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
+Patch4: 0004-Fix-cluster-postproc-regression.patch
+Patch5: 0005-Fix-get_option-use-in-cluster-plugin.patch
+Patch6: 0006-Fix-verbose-file-logging.patch
+Patch7: 0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
+Patch8: 0008-Add-rhsm-debug-collection-to-yum-plugin.patch
+Patch9: 0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
+Patch10: 0010-Include-geo-replication-status-in-gluster-plugin.patch
+Patch11: 0011-postgresql-minor-fixes.patch
+Patch12: 0012-postgresql-add-logs-about-errors-warnings.patch
+Patch13: 0013-postgresql-added-license-and-copyright.patch
+Patch14: 0014-postgresql-allow-use-TCP-socket.patch
+Patch15: 0015-Pass-no-archive-to-rhsm-debug-script.patch
+Patch16: 0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
+Patch17: 0017-Fix-gluster-volume-name-extraction.patch
+Patch18: 0018-Add-distupgrade-plugin.patch
+Patch19: 0019-Fix-command-output-substitution-exception.patch
+Patch20: 0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
+Patch21: 0021-Remove-useless-check_enabled-from-sar-plugin.patch
+Patch22: 0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
+Patch23: 0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
+Patch24: 0024-Replace-package-check-with-file-check-in-anacron.patch
+Patch25: 0025-Remove-the-rhevm-plugin.patch
+Patch26: 0026-powerpc-Move-VPD-related-tool-under-common-code.patch
+Patch27: 0027-Add-PowerNV-specific-debug-data.patch
+Patch28: 0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
+Patch29: 0029-Update-systemd-support.patch
+Patch30: 0030-Add-tuned-plugin.patch
+Patch31: 0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
+Patch32: 0032-Fix-broken-binary-detection-in-satellite-plugin.patch
+Patch33: 0033-Rename-validatePlugin-to-validate_plugin.patch
+Patch34: 0034-Update-policy_tests.py-for-validate_plugin-change.patch
+Patch35: 0035-Match-plugins-against-policies.patch
+Patch36: 0036-Do-not-collect-isos-in-cobbler-plugin.patch
+Patch37: 0037-Call-rhsm-debug-with-the-sos-switch.patch
+Patch38: 0038-Fix-plugin_test-exception-on-six.PY2.patch
+Patch39: 0039-Remove-profile-support.patch
+Patch40: 0040-Dead-code-removal-sos_relative_path.patch
+Patch41: 0041-Dead-code-removal-DirTree.patch
+Patch42: 0042-Dead-code-removal-utilities.checksum.patch
+Patch43: 0043-Add-vim-tags-to-all-python-source-files.patch
+Patch44: 0044-Dead-code-removal-sos.plugins.common_prefix.patch
+Patch45: 0045-Dead-code-removal-PluginException.patch
+Patch46: 0046-Convert-infiniband-to-package-list.patch
+Patch47: 0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
+Patch48: 0048-Clean-up-package-checks-in-processor-plugin.patch
+Patch49: 0049-Pythonify-Plugin._path_in_pathlist.patch
+Patch50: 0050-Fix-x86-arch-detection-in-processor-plugin.patch
+Patch51: 0051-Refactor-Plugin.collect-pathway.patch
+Patch52: 0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
+Patch53: 0053-Update-plugin_tests.py-to-match-new-method-names.patch
+Patch54: 0054-Drop-RedHatPlugin-from-procenv.patch
+Patch55: 0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
+Patch56: 0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
+Patch57: 0057-Use-a-set-for-Plugin.copy_paths.patch
+Patch58: 0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
+Patch59: 0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
+Patch60: 0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
+Patch61: 0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
+Patch62: 0062-Add-Plugin.do_path_regex_sub.patch
+Patch63: 0063-Make-do_path_regex_sub-honour-string-regex-arguments.patch
+Patch64: 0064-Add-oVirt-plugin.patch
+# sos-3.1 still uses the old call_ext_prog interface.
+#Patch65: 0065-Fix-call_ext_prog-use-in-oVirt-plugin.patch
+Patch66: 0066-ovirt-elide-passwords-in-iso-image-uploader.conf.patch
+Patch67: 0067-ovirt-elide-passwords-in-logcollector.conf.patch
+Patch68: 0068-ovirt-add-package-list-to-ovirt-plugin.patch
+Patch69: 0069-Add-oVirt-Data-Warehouse-support.patch
+Patch70: 0070-Add-reports-support-to-oVirt-plugin.patch
+Patch71: 0071-ovirt-Add-dwh-and-reports-packages-to-plugin-package.patch
+Patch72: 0072-ovirt-add-ovirt-scheduler-proxy-logs.patch
%description
Sos is a set of tools that gathers information about system
@@ -88,7 +100,6 @@ support technicians and developers.
%prep
%setup -qn %{name}-%{commit}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -148,7 +159,17 @@ support technicians and developers.
%patch57 -p1
%patch58 -p1
%patch59 -p1
-%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
+%patch69 -p1
+%patch70 -p1
+%patch71 -p1
+%patch72 -p1
%build
make
@@ -173,38 +194,23 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Tue Jun 17 2014 Bryn M. Reeves <bmr at redhat.com> = 3.1-1
-- Update to sos-3.1 upstream release
+- [ovirt] add ovirt-scheduler-proxy logs
+- [ovirt] Add dwh and reports packages to plugin package list
+- Add reports support to oVirt plugin
+- Add oVirt Data Warehouse support
+- [ovirt] add package list to ovirt plugin
+- [ovirt] elide passwords in logcollector.conf
+- [ovirt] elide passwords in {iso,image}uploader.conf
+- Add oVirt plugin
+- Make do_path_regex_sub() honour string regex arguments
- Add collection of grub configuration for UEFI systems
-- Raise a TypeError if add_copy_specs() is called with a string
-- Add tests for Plugin.add_copy_spec()/add_copy_specs()
-- Update Plugin tests to treat copy_paths as a set
-- Use a set for Plugin.copy_paths
-- Remove references to 'sub' parameter from plugin tests
-- Remove 'sub' parameter from Plugin.add_copy_spec*()
-- Drop RedHatPlugin from procenv
-- Update plugin_tests.py to match new method names
-- Remove obsolete checksum reference from utilities_tests.py
-- Refactor Plugin.collect() pathway
- Fix x86 arch detection in processor plugin
-- Pythonify Plugin._path_in_pathlist()
-- Clean up package checks in processor plugin
-- Replace self.policy().pkg_by_name() us in Logs plugin
-- Convert infiniband to package list
-- Dead code removal: PluginException
-- Dead code removal: sos.plugins.common_prefix()
-- Add vim tags to all python source files
-- Dead code removal: utilities.checksum()
-- Dead code removal: DirTree
-- Dead code removal: sos_relative_path()
- Remove --profile support
- Fix plugin_test exception on six.PY2
- Call rhsm-debug with the --sos switch
- Do not collect isos in cobbler plugin
- Match plugins against policies
-- Update policy_tests.py for validate_plugin change
-- Rename validatePlugin to validate_plugin
- Fix broken binary detection in satellite plugin
-- Clean up get_cmd_path/make_cmd_path/make_cmd_dirs mess
- Add tuned plugin
- Update systemd support
- Fix remaining use of obsolete 'get_cmd_dir()' in plugins
@@ -214,7 +220,6 @@ rm -rf ${RPM_BUILD_ROOT}
- Replace package check with file check in anacron
- Scrub ldap_default_authtok password in sssd plugin
- Eliminate hard-coded /var/log/sa paths in sar plugin
-- Remove useless check_enabled() from sar plugin
- Improve error message when cluster.crm_from is invalid
- Fix command output substitution exception
- Add distupgrade plugin
@@ -235,6 +240,8 @@ rm -rf ${RPM_BUILD_ROOT}
- Ensure superclass postproc method is called in ldap plugin
- Remove obsolete diagnostics code from ldap plugin
- Fix cluster module crm_report support
+- Update to sos-3.1 upstream release
+
* Thu Mar 20 2014 Bryn M. Reeves <bmr at redhat.com> = 3.0-23
- Call rhsm-debug with the --sos switch
More information about the scm-commits
mailing list