aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stokes <adam.stokes@ubuntu.com>2013-11-06 00:04:06 -0500
committerAdam Stokes <adam.stokes@ubuntu.com>2013-11-06 00:04:06 -0500
commitfb2823b9ebf67ad9689eaeb766aa301a0caa4ab2 (patch)
treed4e28586a2879df720f5407075df413520a3b203
parentce1935a242beea01f7bffecc4377e9e8ab27f96c (diff)
parent0ff6200d0b6f6d38d09eed49b1ec9fd55eb38a91 (diff)
downloadsos-fb2823b9ebf67ad9689eaeb766aa301a0caa4ab2.tar.gz
Merge branch 'master' into py33
-rw-r--r--AUTHORS7
-rw-r--r--sos/plugins/ceph.py3
-rw-r--r--sos/plugins/grub2.py1
-rw-r--r--sos/plugins/maas.py2
-rw-r--r--sos/plugins/neutron.py6
-rw-r--r--sos/plugins/nis.py1
-rw-r--r--sos/plugins/openssl.py11
-rw-r--r--sos/sosreport.py8
8 files changed, 34 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index 90b3198b..5c9a3332 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,15 +2,20 @@ Individuals
-----------
Adam Stokes <adam.stokes@ubuntu.com>
Ben Turner <bturner@redhat.com>
+Bharani C.V. <bharanve@linux.vnet.ibm.com>
+Brent Eagles <beagles@redhat.com>
Bryn M. Reeves <bmr@redhat.com>
Chris J Arges <chris.j.arges@ubuntu.com>
Eoghan Glynn <eglynn@redhat.com>
Eric Williams <eric.williams@canonical.com>
Eugene Teo <eteo@redhat.com>
+Flavio Percoco <fpercoco@redhat.com>
Gary Kotton <gkotton@redhat.com>
+Guy Streeter <streeter@redhat.com>
James Hunt <james.hunt@ubuntu.com>
Jeff Dutton <jeff.r.dutton@gmail.com>
Jeff Peeler <jpeeler@redhat.com>
+Jeremy Agee <jagee@redhat.com>
Jesse Jaggars <jjaggars@redhat.com>
Joey Boggs <jboggs@redhat.com>
John Berninger <jwb@redhat.com>
@@ -28,6 +33,7 @@ Sadique Puthen <sputhenp@redhat.com>
Shijoe George <spanjikk@redhat.com>
Steve Conklin <sconklin@redhat.com>
Tomas Smetana <tsmetana@redhat.com>
+Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Companies
---------
@@ -35,3 +41,4 @@ Red Hat, Inc.
Rackspace US, Inc.
EMC Corporation
Canonical Ltd.
+IBM Corporation
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")
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"
])
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")
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)
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")
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
"""
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()