debian/0000775000000000000000000000000012321000160007151 5ustar debian/copyright0000664000000000000000000000363312254061770011134 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sosreport Upstream-Contact: Bryn M. Reeves Source: https://github.com/sosreport/sosreport Files: * Copyright: 2012-2013 Bryn M. Reeves 2007-2013 Red Hat, Inc. License: GPL-2+ Files: sos/plugins/kernelrt.py Copyright: 2012 Red Hat, Inc. License: GPL-2 Files: debian/* Copyright: 2013 Adam Stokes License: GPL-2+ License: GPL-2 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; version 2. . This application 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. License: GPL-2+ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. . On Debian systems, the complete text of the GNU General Public License, version 2, can be found in /usr/share/common-licenses/GPL-2. debian/control0000664000000000000000000000126112317614250010574 0ustar Source: sosreport Maintainer: Adam Stokes Section: admin Priority: optional Standards-Version: 3.9.5 Build-Depends: debhelper (>= 9), dh-python, python3-all, gettext, python3-nose, python3-six Homepage: https://github.com/sosreport/sosreport X-Python3-Version: >= 3.3 Package: sosreport Architecture: any Depends: ${python3:Depends}, ${misc:Depends}, python3-six Description: Set of tools to gather troubleshooting data from a system Sos is a set of tools that gathers information about system hardware and configuration. The information can then be used for diagnostic purposes and debugging. Sos is commonly used to help support technicians and developers. debian/compat0000664000000000000000000000000212254061770010372 0ustar 9 debian/docs0000664000000000000000000000002212254061770010041 0ustar README.md AUTHORS debian/patches/0000775000000000000000000000000012321000154010603 5ustar debian/patches/collect-cloud-init-log.patch0000664000000000000000000000126312321000154016077 0ustar Add collection of /var/log/cloud-init.log and /var/log/cloud-init-output.log if they exist. Author: Louis Bouchard Bug-Ubuntu: https://bugs.launchpad.net/bugs/1301819 Origin: upstream, https://github.com/sosreport/sos/commit/36efd32ab01df2c076c3271543d674a515094375 --- a/sos/plugins/logs.py +++ b/sos/plugins/logs.py @@ -36,6 +36,7 @@ self.limit = self.get_option("logsize") self.add_copy_spec_limit("/var/log/boot*", sizelimit = self.limit) + self.add_copy_spec_limit("/var/log/cloud-init*", sizelimit = self.limit) if self.get_option('all_logs'): logs = self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", debian/patches/series0000664000000000000000000000024312321000154012017 0ustar use_input_method_from_python_six.patch do_not_collect_isos_in_cobbler_plugin.patch collect-cloud-init-log.patch fix-command-not-found.patch get-interfaces.d.patch debian/patches/fix-command-not-found.patch0000664000000000000000000000246712321000154015746 0ustar 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 behaviour and ensure that command-not-found messages are reported at 'info' rather than 'warning' level. Author: Bryn M. Reeves Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303745 Origin: upstream, https://github.com/sosreport/sos/commit/commit 0338a955a930286beaa7b66c5167be9b15d34d78 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -488,7 +488,7 @@ self.soslog.warning("command '%s' timed out after %ds" % (prog, timeout)) if status == 127: - self.soslog.warning("could not run '%s': command not found" % prog) + self.soslog.info("could not run '%s': command not found" % prog) return (status, output, runtime) def call_ext_prog(self, prog, timeout=300): --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -659,6 +659,7 @@ flog.setLevel(logging.DEBUG) elif self.opts.verbosity and self.opts.verbosity > 0: console.setLevel(logging.INFO) + flog.setLevel(logging.DEBUG) else: console.setLevel(logging.WARNING) self.soslog.addHandler(console) debian/patches/do_not_collect_isos_in_cobbler_plugin.patch0000664000000000000000000000115512317617562021434 0ustar Do not collect isos in cobbler plugin In Ubuntu isos are being added to the tarball, do not do that. Author: Adam Stokes Bug-Ubuntu: https://bugs.launchpad.net/bugs/1302837 Origin: upstream, https://github.com/sosreport/sos/commit/3ff674035d8962bf3ca3320900fccc6619af7a3d.patch --- a/sos/plugins/cobbler.py +++ b/sos/plugins/cobbler.py @@ -39,3 +39,4 @@ class DebianCobbler(Cobbler, DebianPlugi self.add_copy_spec("/etc/cobbler") self.add_copy_spec("/var/log/cobbler") self.add_copy_spec("/var/lib/cobbler") + self.add_forbidden_path("/var/lib/cobbler/isos") debian/patches/use_input_method_from_python_six.patch0000664000000000000000000000667412317614250020540 0ustar Description: Use input method from python six Something our unittests didnt catch which is more functional than anything. Using raw_input fails on python3 because it was renamed to input. Six provides an alias that handles both cases. Author: Adam Stokes Bug-Ubuntu: https://bugs.launchpad.net/bugs/1302808 Origin: upstream, https://github.com/sosreport/sos/commit/65d8fb5d30682dffffab1daf06662dafb9e303f2.patch Index: sosreport-3.1/sos/plugins/emc.py =================================================================== --- sosreport-3.1.orig/sos/plugins/emc.py 2014-04-04 15:21:36.970319428 -0500 +++ sosreport-3.1/sos/plugins/emc.py 2014-04-04 15:21:36.962319427 -0500 @@ -18,6 +18,9 @@ from sos.plugins import Plugin, RedHatPlugin, os +# Just for completeness sake. +from six.moves import input + class Emc(Plugin, RedHatPlugin): """EMC related information (PowerPath, Solutions Enabler CLI and Navisphere CLI) """ @@ -194,7 +197,7 @@ CLARiiON_IP_address_list = [] CLARiiON_IP_loop = "stay_in" while CLARiiON_IP_loop == "stay_in": - ans = raw_input("CLARiiON SP IP Address or [Enter] to exit: ") + ans = input("CLARiiON SP IP Address or [Enter] to exit: ") ## Check to make sure the CLARiiON SP IP address provided is valid p = Popen("navicli -h %s getsptime" % (ans,), shell=True, stdout=PIPE, stderr=PIPE) out, err = p.communicate() Index: sosreport-3.1/sos/policies/__init__.py =================================================================== --- sosreport-3.1.orig/sos/policies/__init__.py 2014-04-04 15:21:36.970319428 -0500 +++ sosreport-3.1/sos/policies/__init__.py 2014-04-04 15:21:36.966319427 -0500 @@ -18,6 +18,7 @@ import hashlib from textwrap import fill from six import print_ +from six.moves import input def import_policy(name): policy_fqname = "sos.policies.%s" % name @@ -383,9 +384,9 @@ if not self.commons['cmdlineopts'].batch and not self.commons['cmdlineopts'].quiet: try: - self.report_name = raw_input(_("Please enter your first initial and last name [%s]: ") % localname) + self.report_name = input(_("Please enter your first initial and last name [%s]: ") % localname) - self.ticket_number = raw_input(_("Please enter the case number that you are generating this report for: ")) + self.ticket_number = input(_("Please enter the case number that you are generating this report for: ")) self._print() except: self._print() @@ -406,6 +407,6 @@ if (self.report_name == ""): self.report_name = "default" - + return Index: sosreport-3.1/sos/sosreport.py =================================================================== --- sosreport-3.1.orig/sos/sosreport.py 2014-04-04 15:21:36.970319428 -0500 +++ sosreport-3.1/sos/sosreport.py 2014-04-04 15:21:36.966319427 -0500 @@ -53,7 +53,7 @@ # PYCOMPAT import six -from six.moves import zip +from six.moves import zip, input if six.PY3: from configparser import ConfigParser else: @@ -923,7 +923,7 @@ msg = self.policy.get_msg() msg += _("Press ENTER to continue, or CTRL-C to quit.\n") try: - raw_input(msg) + input(msg) except: self.ui_log.info("") self._exit() debian/patches/get-interfaces.d.patch0000664000000000000000000000130612321000154014746 0ustar Add collection of /etc/network/interfaces.d for Ubuntu Since 14.04 Trusty, ubuntu uses config scripts in /etc/network/interfaces.d. Collect those. Closes: #264 Author: Louis Bouchard Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303723 Origin: upstream, https://github.com/sosreport/sos/commit/f4dc6422e3008ae7ba060a0d469284dff5c5daad --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -145,6 +145,7 @@ self.add_copy_specs([ "/etc/resolvconf", "/etc/network/interfaces", + "/etc/network/interfaces.d", "/etc/ufw", "/var/log/ufw.Log", "/etc/resolv.conf"]) debian/watch0000664000000000000000000000015512254061770010226 0ustar version=3 https://github.com/sosreport/sosreport/releases/tag/r3.0 /sosreport/sosreport/archive/r(.+).tar.gz debian/changelog0000664000000000000000000000402112321000160011020 0ustar sosreport (3.1-1ubuntu2) trusty; urgency=medium * Fix spurious "command not found" messages when running (LP: #1303745) * Add collection of /var/log/cloud-init*.log files (LP: #1301819) * Add collection of configuration files in /etc/network/interfaces.d (LP: #1303723) -- Louis Bouchard Tue, 08 Apr 2014 08:58:08 -0500 sosreport (3.1-1ubuntu1) trusty; urgency=low * Fix issues with using sosreport -a. (LP: #1302808) * Don't collect cobbler isos. (LP: #1302837) * Update standards version. -- Chris J Arges Fri, 04 Apr 2014 15:40:13 -0500 sosreport (3.1-1) sid; urgency=low * New upstream release v3.1 Features include: - Full Python 3 support - Further modularized openstack plugins * debian/rules: - Use pybuild * debian/control: - Use X-Python-Version: >= 3.3 -- Adam Stokes Wed, 15 Jan 2014 16:58:54 -0500 sosreport (3.0-1) unstable; urgency=low * New upstream release v3.0 Features include: - Openstack, MAAS, Juju, and other cloud technologies - Extended policies to allow for easier cross distribution support. - Cross distribution support for Debian, Ubuntu, Fedora, and Red Hat Enterprise Linux - Increase execution speed of plugins * Fixes traceback error in the utilities log (Closes: #717401) * debian/copyright: - Add Company contributions notices in AUTHORS file. * setup.py: - Added to support packaging python modules via distutils. * debian/rules: - Fix build instructions to package sosreport as a private module. * debian/control: - Use XS-Python-Version and remove debian/pyversions. * tests/archive_tests.py: - Update unittests to work with latest api changes in the new release. -- Adam Stokes Sun, 21 Jul 2013 20:35:04 -0400 sosreport (2.3~git20130509-1) unstable; urgency=low * Package updated from git rev 395ad13da8 Closes: #698329 -- Adam Stokes Fri, 31 May 2013 12:12:46 -0400 debian/sosreport.links0000664000000000000000000000006212254061770012274 0ustar /usr/share/sosreport/sosreport /usr/bin/sosreport debian/rules0000775000000000000000000000053412271430455010255 0ustar #!/usr/bin/make -f DH_ALWAYS_EXCLUDE=.git export PYBUILD_NAME=sosreport export PYBUILD_DISABLE_python2=1 export PYBUILD_INSTALL_ARGS_python3=--install-lib=usr/share/sosreport/ \ --install-data=usr/ \ --install-scripts=usr/share/sosreport/ \ --root=$(CURDIR)/debian/sosreport/ \ --no-compile -O0 %: dh $@ --with python3 --buildsystem=pybuild debian/install0000664000000000000000000000001612254061770010562 0ustar sos.conf etc/ debian/source/0000775000000000000000000000000012254061770010474 5ustar debian/source/format0000664000000000000000000000001412254061770011702 0ustar 3.0 (quilt)