From 62cfa3cf72c1a006294bf59efb252fde6081ffc8 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Wed, 30 Oct 2013 19:48:03 -0400 Subject: Add IBM contributors to AUTHORS Signed-off-by: Adam Stokes --- AUTHORS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index 90b3198b..57a7a1b3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Individuals ----------- Adam Stokes Ben Turner +Bharani C.V. Bryn M. Reeves Chris J Arges Eoghan Glynn @@ -28,6 +29,7 @@ Sadique Puthen Shijoe George Steve Conklin Tomas Smetana +Vasant Hegde Companies --------- @@ -35,3 +37,4 @@ Red Hat, Inc. Rackspace US, Inc. EMC Corporation Canonical Ltd. +IBM Corporation -- cgit From 8b613636ac01572101ec9bb806d5c09cb65d894a Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Wed, 30 Oct 2013 23:39:30 -0400 Subject: Scrub credentials from openssl plugin Signed-off-by: Adam Stokes --- sos/plugins/openssl.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py index 2ad44a2d..c73181be 100644 --- a/sos/plugins/openssl.py +++ b/sos/plugins/openssl.py @@ -23,6 +23,17 @@ class OpenSSL(Plugin): plugin_name = "openssl" packages = ('openssl',) + def postproc(self): + protect_keys = ["input_password", + "output_password", + "challengePassword"] + + regexp = r"(?m)^(\s*#?\s*(%s).*=)(.*)" % "|".join(protect_keys) + + self.do_file_sub('/etc/ssl/openssl.cnf', + regexp, + r"\1 ******") + class RedHatOpenSSL(OpenSSL, RedHatPlugin): """openssl related information for Red Hat distributions """ -- cgit From f08eac0d9ee051edb15b46c6746997936793b9d7 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Thu, 31 Oct 2013 09:57:01 -0400 Subject: Include Brent Eagles into authors file Signed-off-by: Adam Stokes --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 57a7a1b3..d99dc3ad 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,6 +3,7 @@ Individuals Adam Stokes Ben Turner Bharani C.V. +Brent Eagles Bryn M. Reeves Chris J Arges Eoghan Glynn -- cgit From 14feacc037f9de91cd5f3f631a3ca3b6ef54fa0e Mon Sep 17 00:00:00 2001 From: Jeff Dutton Date: Thu, 31 Oct 2013 10:30:21 -0400 Subject: Add check_enabled for neutron plugin Signed-off-by: Jeff Dutton --- sos/plugins/neutron.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sos/plugins/neutron.py b/sos/plugins/neutron.py index 03403227..23174330 100644 --- a/sos/plugins/neutron.py +++ b/sos/plugins/neutron.py @@ -139,6 +139,9 @@ class DebianNeutron(Neutron, DebianPlugin, UbuntuPlugin): 'python-%(comp)s', 'python-%(comp)sclient'] + def check_enabled(self): + return self.is_installed("%s-common" % self.component_name) + def setup(self): super(DebianNeutron, self).setup() self.packages = self.gen_pkg_tuple(self.package_list_template) @@ -166,6 +169,9 @@ class RedHatNeutron(Neutron, RedHatPlugin): 'python-%(comp)s', 'python-%(comp)sclient'] + def check_enabled(self): + return self.is_installed("openstack-%s" % self.component_name) + def setup(self): super(RedHatNeutron, self).setup() self.packages = self.gen_pkg_tuple(self.package_list_template) -- cgit From 4d8ddfbbb9dcce27e16212fafbd0e9d9a3ad995a Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Fri, 1 Nov 2013 15:27:13 -0400 Subject: Do not copy ceph keyring files Fixes #200 Signed-off-by: Adam Stokes --- sos/plugins/ceph.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 3c145e42..decd161e 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -39,3 +39,6 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): self.add_cmd_output("ceph mon stat") self.add_cmd_output("ceph mon dump") + self.add_forbidden_path("/etc/ceph/*keyring") + self.add_forbidden_path("/var/lib/ceph/*/*keyring") + self.add_forbidden_path("/var/lib/ceph/*keyring") -- cgit From cbd75cbfa3edc185988cee927d56ab7076a833d9 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Fri, 1 Nov 2013 15:42:40 -0400 Subject: Generate report by default Fixes #2 Signed-off-by: Adam Stokes --- sos/sosreport.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sos/sosreport.py b/sos/sosreport.py index afe61f2f..2451439b 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -211,7 +211,7 @@ class SoSOptions(object): _customer_name = "" _config_file = "" _tmp_dir = "" - _report = False + _report = True _profiler = False _compression_type = 'auto' @@ -497,9 +497,9 @@ class SoSOptions(object): parser.add_option("--tmp-dir", action="store", dest="tmp_dir", help="specify alternate temporary directory", default=None) - parser.add_option("--report", action="store_true", + parser.add_option("--no-report", action="store_true", dest="report", - help="Enable HTML/XML reporting", default=False) + help="Disable HTML/XML reporting", default=False) parser.add_option("--profile", action="store_true", dest="profiler", help="turn on profiling", default=False) @@ -1154,7 +1154,7 @@ class SoSReport(object): self.prework() self.setup() self.collect() - if self.opts.report: + if not self.opts.report: self.report() self.html_report() self.plain_report() -- cgit From ce04f74e6c717aab6934db37c634aa676c01462d Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Fri, 1 Nov 2013 16:56:05 -0400 Subject: Add a few more contributors to AUTHORS Guy, Flavio, and Jeremy Signed-off-by: Adam Stokes --- AUTHORS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index d99dc3ad..5c9a3332 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,10 +9,13 @@ Chris J Arges Eoghan Glynn Eric Williams Eugene Teo +Flavio Percoco Gary Kotton +Guy Streeter James Hunt Jeff Dutton Jeff Peeler +Jeremy Agee Jesse Jaggars Joey Boggs John Berninger -- cgit From 44e626c47c60278b207c64aba333d0aaa71db3a8 Mon Sep 17 00:00:00 2001 From: Louis Bouchard Date: Mon, 4 Nov 2013 11:54:21 +0100 Subject: Added ubuntu/debian specific grub.cfg path Fixes: #214 Signed-off-by: Louis Bouchard Signed-off-by: Adam Stokes --- sos/plugins/grub2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sos/plugins/grub2.py b/sos/plugins/grub2.py index f990681a..fd86211a 100644 --- a/sos/plugins/grub2.py +++ b/sos/plugins/grub2.py @@ -26,6 +26,7 @@ class Grub2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/grub.d", "/etc/grub2.cfg", "/etc/default/grub", + "/boot/grub/grub.cfg", "/boot/grub2/grub.cfg", "/boot/grub2/grubenv" ]) -- cgit From 3eecbc5b6a4fda178fabe28b2e62752f54bbeea5 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Tue, 5 Nov 2013 01:05:43 -0500 Subject: maas: Dont capture everything /var/lib/maas ephermeral images and other pickled objects are stored here which can increase the sosreport archive to well over 2G. so only capture the readable files which is only the dhcp leases and dhcp interface file. Signed-off-by: Adam Stokes --- sos/plugins/maas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py index 018ef75d..2fd6be35 100644 --- a/sos/plugins/maas.py +++ b/sos/plugins/maas.py @@ -25,7 +25,7 @@ class Maas(Plugin, UbuntuPlugin): def setup(self): self.add_copy_specs(["/etc/squid-deb-proxy", "/etc/maas", - "/var/lib/maas", + "/var/lib/maas/dhcp*", "/var/log/maas*"]) self.add_cmd_output("maas dumpdata") -- cgit From 0ff6200d0b6f6d38d09eed49b1ec9fd55eb38a91 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Tue, 5 Nov 2013 16:16:33 +0000 Subject: Add domainname output to the NIS plug-in Signed-off-by: Bryn M. Reeves --- sos/plugins/nis.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py index 5439b8fc..baa71e8d 100644 --- a/sos/plugins/nis.py +++ b/sos/plugins/nis.py @@ -29,3 +29,4 @@ class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): def setup(self): self.add_copy_spec("/etc/yp*.conf") self.add_copy_spec("/var/yp/*") + self.add_cmd_output("domainname") -- cgit