aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not collect isos in cobbler pluginAdam Stokes2014-03-141-0/+1
| | | | | | In Ubuntu isos are being added to the tarball, do not do that. Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Match plugins against policiesBryn M. Reeves2014-03-133-26/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #238. When tagging classes are used to enable plugins on multiple platforms it is possible for there to be more than one valid class instance for a given policy. For e.g.: class DebianFooPlugin(Plugin, DebianPlugin): /// class UbuntuFooPlugin(Plugin, UbuntuPlugin): /// Since UbuntuPolicy includes both DebianPlugin and UbuntuPlugin in its valid_subclasses list both classes pass the validity test and both are added to the loaded_plugins list. This causes plugins to run twice: 2014-03-12 19:57:50,974 DEBUG: copying file /var/log/mail.log to /var/log/mail.log 2014-03-12 19:57:50,975 DEBUG: added /var/log/mail.log to FileCacheArchive /tmp/sosreport-u1210-vm1-20140312195750 2014-03-12 19:57:51,293 DEBUG: copying file /var/log/mail.log to /var/log/mail.log 2014-03-12 19:57:51,294 DEBUG: added /var/log/mail.log to FileCacheArchive /tmp/sosreport-u1210-vm1-20140312195750 Fix this by adding a match_plugin() method to the policy base class and prefer plugins that are subclasses of the first entry in the list. This patch also reverses the order of the valid_subclasses list for the UbuntuPolicy to ensure preference is given to native plugins: self.valid_subclasses = [UbuntuPlugin, DebianPlugin] Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update policy_tests.py for validate_plugin changeBryn M. Reeves2014-03-131-4/+4
| | | | | | | The policy_tests unit tests call validatePlugin(). Update them to use the new name. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Rename validatePlugin to validate_pluginBryn M. Reeves2014-03-122-2/+2
| | | | | | | | 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 not be so ugly. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix broken binary detection in satellite pluginBryn M. Reeves2014-03-121-3/+2
| | | | | | | | | | The satellite plugin attempts to check for the existence of the 'satellite-debug' binary before running it. This was broken by the mass conversion to PATH for running external commands. Remove the check and just attempt to run the command regardless. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Clean up get_cmd_path/make_cmd_path/make_cmd_dirs messBryn M. Reeves2014-03-128-36/+18
| | | | | | | | | | | | | | | | | | Clean up the Plugin helper methods for handling command output paths. This better matches the proposal in Issue #181 and simplifies code for plugins that need to generate their own paths under sos_commands/<plugin>/. - Rename get_cmd_path() to get_cmd_output_path() - Add an optional 'name' parameter to specify a subdirectory name in the plugin's sos_commands/<plugin>/ directory. - Default to creating directories if they do not exist Finally fix up all existing users of get_cmd_path() to use the new interface and remove handrolled uses of os.path.join(...) for generating these paths. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add tuned pluginPeter Portante2014-03-121-0/+30
| | | | | | | Resolves Issue #232. Signed-off-by: Peter Portante <peter.portante@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update systemd supportBryn M. Reeves2014-03-121-2/+3
| | | | | | | | - Drop support for 'systemctl dump' as this no longer exists. - Add 'systemctl list-units' for convenience - add systemctl show-environment Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Merge pull request #235 from leeyarwood/masterBryn M. Reeves2014-03-111-25/+0
|\ | | | | | | | | Remove the rhevm plugin. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| * Remove the rhevm plugin.Lee Yarwood2014-03-041-25/+0
| | | | | | | | | | | | | | | | | | | | This functionality is now provided by the ovirt-log-collector project [1] and independently shipped VDSM sos plugin [2]. [1] http://gerrit.ovirt.org/gitweb?p=ovirt-log-collector.git [2] http://gerrit.ovirt.org/gitweb?p=vdsm.git;a=tree;f=vdsm/sos;hb=HEAD Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
* | Fix remaining use of obsolete 'get_cmd_dir()' in pluginsBryn M. Reeves2014-03-112-2/+2
| | | | | | | | | | | | | | The get_cmd_dir() method was renamed to get_cmd_path(). Fix the two remaining uses in yum and cluster plugins. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Add PowerNV specific debug dataVasant Hegde2014-03-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | This patch adds support to collect more debug files on PowerNV platform. Signed-off-by: Vasant Hegde <hegdevasant linux vnet ibm com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com> --- sos/plugins/powerpc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
* | powerpc: Move VPD related tool under common codeVasant Hegde2014-03-111-3/+4
|/ | | | | | | | | | | | | VPD related tools (lsvpd, lscfg, lsmcode) is supported on both pSeries and PowerNV platform. Hence moving these commands under common code. Also added support to grab vpd database (/var/lib/lsvpd). Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- sos/plugins/powerpc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
* Replace package check with file check in anacronBryn M. Reeves2014-03-031-2/+4
| | | | | | | | The anacron facility may be provided by packages named 'anacron', 'chronie-anacron' etc. They all use a common /etc/anacrontab file so check for this instead. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Scrub ldap_default_authtok password in sssd pluginBryn M. Reeves2014-02-141-1/+9
| | | | | | | | The file sssd.conf collected by the sssd plugin may contain an ldap password. Add a postproc() method to replace the string with blanks. Signed-off-by: Bryn M. Reeeves <bmr@redhat.com>
* Eliminate hard-coded /var/log/sa paths in sar pluginBryn M. Reeves2014-02-141-3/+3
| | | | | | | | | The Sar plugin classes define a self.sa_path - use it consistently throughout the plugin when generating strings containing the path. Suggested by David Kutalek. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove useless check_enabled() from sar pluginBryn M. Reeves2014-02-141-8/+0
| | | | | | | | | | The sar plugin implemented a check_enabled() to catch cases where the plugin is force-enabled on a system with no sar installation. This is better handled by runtime checking in setup() which the plugin also does. Kill the check and its annoying error message. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Improve error message when cluster.crm_from is invalidBryn M. Reeves2014-02-111-1/+2
| | | | | | | | | | | | | | | If a user passes a non-date string value as the crm_from parameter of the cluster plugin an error message is logged: crm_from parameter 'True' is not a valid date The plugin continues to run and uses the default value (T-72hrs) as the value of crm_from. Make this clear in the message displayed to users: crm_from parameter 'True' is not a valid date: using default Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix command output substitution exceptionBryn M. Reeves2014-02-111-3/+4
| | | | | | | | | | | | If a comand has a substitution registered via do_cmd_output_sub() but no data was collected (e.g. command not found) the postproc code will throw an exception as the return value ('replacements') is never assigned. Initialise replacements to None before scanning the list of run commands and return this if no substitutions were made. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add distupgrade pluginBryn M. Reeves2014-02-101-0/+39
| | | | | | | | | | Add a new plugin to collect data relating to completed or attempted distribution upgrades. Currently supports the Red Hat set of tools and files but other distributions can supply their own filelists or override setup() to perform other distribution specific actions. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix gluster volume name extractionBryn M. Reeves2014-02-101-1/+1
| | | | | | | | | The get_volume_names() function in the gluster plugin tries to extract volume names from the output of the "gluster volume info" command using a slice range. The range start should be 12 to account for the "Volume Name:" label at the start of the line. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Ensure unused fds are closed when calling subprocesses via PopenBryn M. Reeves2014-02-044-4/+10
| | | | | | | | | | When sos communicates with a child process using Popen all IO takes place on stdin/stdout/stderr (or a subset). No other open file descriptors should be inherited by the child. Make all calls to Popen set close_fds=True. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Pass --no-archive to rhsm-debug scriptBryn M. Reeves2014-02-041-1/+1
| | | | | | | | | Versions of subscription-manager since 1.10.11-2.el7 support the --no-archive option to disable creation of a zip archive. Pass this to the script to have the output stored in a directory in the archive. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* postgresql: allow use TCP socketSandro Bonazzola2014-02-041-5/+15
| | | | | | | | allow to use TCP socket and not only UNIX socket for connecting to postgresql database Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* postgresql: added license and copyrightSandro Bonazzola2014-02-041-0/+19
| | | | | Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* postgresql: add logs about errors / warningsSandro Bonazzola2014-02-041-2/+21
| | | | | | | | give more info to support about what happened while collecting the report. Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* postgresql: minor fixesSandro Bonazzola2014-02-041-21/+39
| | | | | | | | - pep8 / style fixes - Avoid redefining built-in 'file' Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Include geo-replication status in gluster pluginBryn M. Reeves2014-02-031-0/+7
| | | | | | | Add the output of 'gluster volume geo-replication status' for each discovered gluster volume to the report. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Make get_cmd_output_now() behaviour match 2.2Bryn M. Reeves2014-02-031-1/+1
| | | | | | | | | | | | | The equivalent method in sos-2.2, collectOutputNow() returned an absolute path to the collected file. Since the archive changes in 3.0 this now returns a path relative to the root of the archive. This breaks existing users of the interface that try to open and process the content of the collected file (e.g. gluster). Return a join of the archive path and file path to the caller. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Add rhsm-debug collection to yum pluginBryn M. Reeves2014-02-031-0/+2
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Always treat rhevm vdsmlogs option as stringBryn M. Reeves2014-02-031-1/+1
| | | | | | | | | | | The rhevm plugin has a 'vdsmlogs' option to pass in a set of log files to be collected. When run with '-a' (or with '-krhevm.vdsmlogs) this evaluates to 'True' (a bool) and causes an exception when this is passed to add_copy_specs(). Always treat the value as a string. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix verbose file loggingBryn M. Reeves2014-02-032-1/+2
| | | | | | | | | 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. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix get_option() use in cluster pluginBryn M. Reeves2014-02-031-3/+3
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix cluster postproc regressionBryn M. Reeves2014-01-311-0/+2
| | | | | | | Commit 4ab4b08 inadvertently removed the postprocessing rules for luci configuration. Revert that part of the commit. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Ensure superclass postproc method is called in ldap pluginBryn M. Reeves2014-01-311-0/+2
| | | | | | | | | Since the ldap plugins add files and post-processing methods at multiple class levels (Ldap, RedHatLdap etc.) derived classes must explicitly call their parent class's postproc() method to apply all substitutions to collected data. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Remove obsolete diagnostics code from ldap pluginBryn M. Reeves2014-01-311-12/+0
| | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Fix cluster module crm_report supportBryn M. Reeves2014-01-311-8/+19
| | | | | | | | | | | | | The cluster plugin used an obsolete sos-2.2 method to determine the command output directory. This causes an excaption at runtime since the referenced properties no longer exist. The crm_report script also expects a --from date and will not collect data unless this is passed. Default to passing a value 72 hours before the current time and add a 'crm_from' option to the cluster module to allow the user to override this. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update debian changelog3.1Adam Stokes2014-01-271-1/+0
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Add /etc/network/interfaces to networking pluginAdam Stokes2014-01-271-0/+1
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Force foreman to be quietAdam Stokes2014-01-271-1/+1
|\ | | | | | | | | | | Fixes #230 Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| * Force foreman plugin to be quietLukas Zapletal2014-01-201-1/+1
| |
* | Fix unittests to report on strings and not binaryAdam Stokes2014-01-271-2/+2
| | | | | | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Fix plugin load error due to Popen returning binary data. Other fixes listedAdam Stokes2014-01-274-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | below sos/plugins/anacron.py: - add one line description during verbose output for anacron sos/archive.py, sos/utilities.py: - make sure to return a string after a Popen call which initially returns binary sos/plugins/named.py: - Remove unused import of commands Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* | Tidy up formatting of UI preamble textBryn M. Reeves2014-01-242-29/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The formatting of the template preamble used a narrow terminal width since there is no native python method for obtaining the actual terminal geometry and the common methods for doing this are non-portable (e.g. Windows specific ioctls or shelling out to stty). This causes the top of the message to scroll off the screen on a standard 80x25 terminal (e.g. putty or a non-resized gnome-terminal or xterm window). Remove the paragraph indentation and increase the assumed width from 58 to 72 chars. This causes the message to fill a standard 80x25 terminal without scrolling. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Remove obsolete rhel_version() usage from yum pluginBryn M. Reeves2014-01-241-2/+0
| | | | | | | | Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* | Remove --upload optionBryn M. Reeves2014-01-244-118/+25
|/ | | | | | | | | | | | The --upload option has a lot of limitations and has not been widely used. Recent trends are to handle uploading data in higher-level tools (e.g. redhat-support-tool or web based management UIs) and the python ftp library does not support modern requirements like HTTP proxy traversal or encryption. Fixes Issue #217 Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
* Update debian packaging to use pybuild and prep for 3.1 release.Adam Stokes2014-01-155-17/+23
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Fix XS-Python-Version to XS-Python3-VersionAdam Stokes2014-01-151-1/+1
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Fix missing depends on python3:DependsAdam Stokes2014-01-151-1/+1
| | | | Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
* Capture MAAS services' upstart logs.Raphael Badin2014-01-151-0/+1
| | | | | | | Fixes #229 Signed-off-by: Raphael Badin <raphael.badin@canonical.com> Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>