aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2009-07-20 15:05:40 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2009-07-20 15:05:40 +0000
commit41319b10c2efa4517838b48ed116a025aeee0464 (patch)
tree394e0cc1674d7a5b2749dceed098fb1d068cda4a /src
parent539cfc643c470ac583c88fb4a8876f09eea7135c (diff)
downloadsos-41319b10c2efa4517838b48ed116a025aeee0464.tar.gz
merge plugin info from rhel branch to trunk
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@610 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
-rw-r--r--src/lib/sos/plugins/general.py1
-rw-r--r--src/lib/sos/plugins/rhn.py3
-rwxr-xr-xsrc/sosreport6
3 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/sos/plugins/general.py b/src/lib/sos/plugins/general.py
index bd0a4710..43032a7f 100644
--- a/src/lib/sos/plugins/general.py
+++ b/src/lib/sos/plugins/general.py
@@ -39,6 +39,7 @@ class general(sos.plugintools.PluginBase):
self.addCopySpec("/var/log/secure")
self.addCopySpecLimit("/var/log/secure.*", sizelimit = self.getOption("syslogsize"))
self.addCopySpec("/var/log/sa")
+ self.addCopySpec("/var/log/pm/suspend.log")
self.addCopySpec("/var/log/up2date")
self.addCopySpec("/etc/exports")
self.collectExtOutput("/bin/hostname", root_symlink = "hostname")
diff --git a/src/lib/sos/plugins/rhn.py b/src/lib/sos/plugins/rhn.py
index aa5c9d22..effd4c94 100644
--- a/src/lib/sos/plugins/rhn.py
+++ b/src/lib/sos/plugins/rhn.py
@@ -45,7 +45,8 @@ class rhn(sos.plugintools.PluginBase):
self.addCopySpec("/etc/httpd/conf*")
self.addCopySpec("/etc/rhn")
self.addCopySpec("/etc/sysconfig/rhn")
- self.addCopySpec("/var/log/httpd") # httpd-logs
+ if self.getOption("log"):
+ self.addCopySpec("/var/log/httpd") # httpd-logs
self.addCopySpec("/var/log/rhn*") # rhn-logs
# all these used to go in $DIR/mon-logs/
diff --git a/src/sosreport b/src/sosreport
index f68cae75..4ff68604 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -184,6 +184,12 @@ __cmdParser__.add_option("--no-multithread", action="store_true", \
dest="nomultithread", \
help="disable multi-threaded gathering mode (slower)",
default=False)
+__cmdParser__.add_option("--ticket-number", action="store", \
+ dest="ticketNumber", \
+ help="set ticket number")
+__cmdParser__.add_option("--name", action="store", \
+ dest="customerName", \
+ help="define customer name")
if sys.argv[0].endswith("sysreport"):
print