Merge pull request #503 from nettorta/develop

client patches, logging -> logger, sftp test for paramiko ssh connection tester

yandextank/common/util.py

@@ -114,6 +114,7 @@ def send_file(self, local_path, remote_path):
         logger.info(
             "Sending [{local}] to {host}:[{remote}]".format(
                 local=local_path, host=self.host, remote=remote_path))
+
         with self.connect() as client, client.open_sftp() as sftp:
             result = sftp.put(local_path, remote_path)
         return result
@@ -148,7 +149,20 @@ def check_ssh_connection():
     logging.info(
         "Checking SSH to %s@%s:%d", args.username, args.endpoint, args.port)
     ssh = SecuredShell(args.endpoint, args.port, args.username, 10)
-    print(ssh.execute("ls -l"))
+    data = ssh.execute("ls -l")
+    logging.info('Output data of ssh.execute("ls -l"): %s', data[0])
+    logging.info('Output errors of ssh.execute("ls -l"): %s', data[1])
+    logging.info('Output code of ssh.execute("ls -l"): %s', data[2])
+
+    logging.info('Trying to create paramiko ssh connection client')
+    client = ssh.connect()
+    logging.info('Created paramiko ssh connection client: %s', client)
+    logging.info('Trying to open sftp')
+    sftp = client.open_sftp()
+    logging.info('Opened sftp: %s', sftp)
+    logging.info('Trying to send test file to /tmp')
+    res = sftp.put('/usr/lib/yandex/yandex-tank/bin/tank.log', '/opt')
+    logging.info('Result of sending test file: %s', res)
 
 
 class AsyncSession(object):

yandextank/plugins/Telegraf/client.py

@@ -69,11 +69,9 @@ def install(self):
                     self.workdir,
                     self.AGENT_FILENAME))
             copyfile(agent_config, os.path.join(self.workdir, 'agent.cfg'))
-            copyfile(
-                startup_config,
-                os.path.join(
-                    self.workdir,
-                    'agent_startup.cfg'))
+            copyfile(startup_config, os.path.join(
+                self.workdir,
+                'agent_startup.cfg'))
             copyfile(
                 customs_script,
                 os.path.join(
@@ -87,10 +85,8 @@ def install(self):
                     self.path['TELEGRAF_LOCAL_PATH'])
                 return None, None, None
         except Exception:
-            logger.error(
-                "Failed to copy agent to %s on localhost",
-                self.workdir,
-                exc_info=True)
+            logger.error("Failed to copy agent to %s on localhost", self.workdir)
+            logger.debug("Failed to copy agent to %s on localhost", self.workdir, exc_info=True)
             return None, None, None
         return agent_config, startup_config, customs_script
 
@@ -219,6 +215,7 @@ def install(self):
             return None, None, None
         if errors:
             logger.error("[%s] error: '%s'", self.host, errors)
+            logger.error("Cancelling agent installation on %s", self.host)
             return None, None, None
 
         if err_code:

yandextank/plugins/Telegraf/config.py

@@ -145,7 +145,7 @@ def get_host_config(self, host, target_hint):
             elif (str(metric.tag)).lower() == 'telegrafraw':
                 telegrafraw.append(metric.text)
         if len(host_config) == 0:
-            logging.info('Empty host config, using defaults')
+            logger.info('Empty host config, using defaults')
             for section in defaults_enabled:
                 host_config[section] = defaults[section]
         result = {

yandextank/plugins/Telegraf/plugin.py

@@ -147,7 +147,7 @@ def _save_config_contents(self, contents):
     def configure(self):
         self.detected_conf = self.__detect_configuration()
         if self.detected_conf:
-            logging.info(
+            logger.info(
                 'Detected monitoring configuration: %s', self.detected_conf)
             self.SECTION = self.detected_conf
         self.default_target = self.get_option("default_target", "localhost")