diff options
| -rw-r--r-- | sos/collector/__init__.py | 34 | ||||
| -rw-r--r-- | sos/collector/clusters/__init__.py | 2 | ||||
| -rw-r--r-- | sos/collector/sosnode.py | 2 | ||||
| -rw-r--r-- | sos/policies/__init__.py | 2 |
4 files changed, 34 insertions, 6 deletions
diff --git a/sos/collector/__init__.py b/sos/collector/__init__.py index b1618cd5..c09a59c1 100644 --- a/sos/collector/__init__.py +++ b/sos/collector/__init__.py @@ -90,7 +90,12 @@ class SoSCollector(SoSComponent): 'ssh_port': 22, 'ssh_user': 'root', 'timeout': 600, - 'verify': False + 'verify': False, + 'upload': False, + 'upload_url': None, + 'upload_directory': None, + 'upload_user': None, + 'upload_pass': None, } def __init__(self, parser, parsed_args, cmdline_args): @@ -334,6 +339,18 @@ class SoSCollector(SoSComponent): help='Specify an SSH user. Default root') collect_grp.add_argument('--timeout', type=int, required=False, help='Timeout for sosreport on each node.') + collect_grp.add_argument("--upload", action="store_true", + default=False, + help="Upload archive to a policy-default " + "location") + collect_grp.add_argument("--upload-url", default=None, + help="Upload the archive to specified server") + collect_grp.add_argument("--upload-directory", default=None, + help="Specify upload directory for archive") + collect_grp.add_argument("--upload-user", default=None, + help="Username to authenticate with") + collect_grp.add_argument("--upload-pass", default=None, + help="Password to authenticate with") # Group the cleaner options together cleaner_grp = parser.add_argument_group( @@ -399,8 +416,8 @@ class SoSCollector(SoSComponent): to hand to other collector mechanisms """ self.commons = { + 'cmdlineopts': self.opts, 'need_sudo': True if self.opts.ssh_user != 'root' else False, - 'opts': self.opts, 'tmpdir': self.tmpdir, 'hostlen': len(self.opts.master) or len(self.hostname), 'policy': self.policy @@ -630,6 +647,7 @@ class SoSCollector(SoSComponent): return fname def prep(self): + self.policy.set_commons(self.commons) if (not self.opts.password and not self.opts.password_per_node): self.log_debug('password not specified, assuming SSH keys') @@ -683,6 +701,8 @@ class SoSCollector(SoSComponent): % (self.opts.group, err)) self._exit(1) + self.policy.pre_work() + if self.opts.master: self.connect_to_master() self.opts.no_local = True @@ -1101,11 +1121,18 @@ this utility or remote systems that it connects to. self.log_info(msg % (self.retrieved, self.report_num)) self.close_all_connections() if self.retrieved > 0: - self.create_cluster_archive() + arc_name = self.create_cluster_archive() else: msg = 'No sosreports were collected, nothing to archive...' self.exit(msg, 1) + if self.opts.upload and self.get_upload_url(): + try: + self.policy.upload_archive(arc_name) + self.ui_log.info("Uploaded archive successfully") + except Exception as err: + self.ui_log.error("Upload attempt failed: %s" % err) + def _collect(self, client): """Runs sosreport on each node""" try: @@ -1218,6 +1245,7 @@ this utility or remote systems that it connects to. self.ui_log.info('\nThe following archive has been created. ' 'Please provide it to your support team.') self.ui_log.info('\t%s\n' % final_name) + return final_name except Exception as err: msg = ("Could not finalize archive: %s\n\nData may still be " "available uncompressed at %s" % (err, self.archive_path)) diff --git a/sos/collector/clusters/__init__.py b/sos/collector/clusters/__init__.py index 700687aa..5c002bae 100644 --- a/sos/collector/clusters/__init__.py +++ b/sos/collector/clusters/__init__.py @@ -60,7 +60,7 @@ class Cluster(): self.master = None self.cluster_ssh_key = None self.tmpdir = commons['tmpdir'] - self.opts = commons['opts'] + self.opts = commons['cmdlineopts'] self.cluster_type = [self.__class__.__name__] for cls in self.__class__.__bases__: if cls.__name__ != 'Cluster': diff --git a/sos/collector/sosnode.py b/sos/collector/sosnode.py index a3338f4b..d0e836a8 100644 --- a/sos/collector/sosnode.py +++ b/sos/collector/sosnode.py @@ -36,7 +36,7 @@ class SosNode(): load_facts=True): self.address = address.strip() self.commons = commons - self.opts = commons['opts'] + self.opts = commons['cmdlineopts'] self.tmpdir = commons['tmpdir'] self.hostlen = commons['hostlen'] self.need_sudo = commons['need_sudo'] diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py index 8b7473e3..39452c59 100644 --- a/sos/policies/__init__.py +++ b/sos/policies/__init__.py @@ -1387,7 +1387,7 @@ class LinuxPolicy(Policy): "that you are generating this " "report for [%s]: ") % caseid) # Policies will need to handle the prompts for user information - if cmdline_opts.upload or self.upload_url: + if cmdline_opts.upload and self.get_upload_url(): self.prompt_for_upload_user() self.prompt_for_upload_password() self._print() |