Merge pull request #230 from netortik/telegraf

disabled telegraf plugin by default. bugfix of localhost client. cosm…

yandextank/core/config/00-base.ini

@@ -6,7 +6,7 @@ plugin_phantom=yandextank.plugins.Phantom
 plugin_aggregate=yandextank.plugins.Aggregator
 plugin_autostop=yandextank.plugins.Autostop
 plugin_monitoring=yandextank.plugins.Monitoring
-plugin_telegraf=yandextank.plugins.Telegraf
+;plugin_telegraf=yandextank.plugins.Telegraf
 plugin_console=yandextank.plugins.Console
 plugin_tips=yandextank.plugins.TipsAndTricks
 plugin_rcassert=yandextank.plugins.RCAssert

yandextank/plugins/Telegraf/client.py

@@ -53,7 +53,6 @@ class LocalhostClient(object):
 
     def install(self):
         self.workdir = tempfile.mkdtemp()
-        # ('Linux', 'yandex-dev', '3.13.0-35-generic', '#62-Ubuntu SMP Fri Aug 15 01:58:42 UTC 2014', 'x86_64')
         logger.info("Created temp dir %s", self.workdir)
         agent_config = self.config.create_collector_config(self.workdir)
         startup_config = self.config.create_startup_config()
@@ -69,9 +68,11 @@ class LocalhostClient(object):
                     copyfile(self.path['TELEGRAF_LOCAL_PATH'], self.path['TELEGRAF_REMOTE_PATH'])
                 else:
                     logger.error(
-                        'Not found telegraf at %s and unable to copy from specified path: %s', self.host, self.telegraf
+                        'Telegraf binary not found at specified path: %s\n'
+                        'You can download telegraf binaries here: https://github.com/influxdata/telegraf\n'
+                        'or install debian package: `telegraf`', self.path['TELEGRAF_LOCAL_PATH']
                     )
-                    raise
+                    return None, None
         except Exception:
             logger.error("Failed to copy agent to %s on localhost", self.workdir, exc_info=True)
         return agent_config, startup_config
@@ -241,9 +242,11 @@ class SSHClient(object):
                     )
                 else:
                     logger.error(
-                        'Not found telegraf at %s and unable to copy from specified path: %s', self.host, self.telegraf
+                        'Telegraf binary not found neither on %s nor on localhost at specified path: %s\n'
+                        'You can download telegraf binaries here: https://github.com/influxdata/telegraf\n'
+                        'or install debian package: `telegraf`', self.host, self.path['TELEGRAF_LOCAL_PATH']
                     )
-                    raise
+                    return None, None
 
             self.ssh.send_file(
                 self.path['AGENT_LOCAL_FOLDER'] + '/agent.py',
@@ -253,7 +256,7 @@ class SSHClient(object):
             self.ssh.send_file(startup_config, self.path['AGENT_REMOTE_FOLDER'] + '/agent_startup.cfg')
         except Exception:
             logger.error("Failed to install agent on %s", self.host, exc_info=True)
-            return None
+            return None, None
 
         return agent_config, startup_config
 

yandextank/plugins/Telegraf/plugin.py

@@ -113,8 +113,8 @@ class Plugin(AbstractPlugin):
                 self.default_target = info.address
                 logger.debug("Changed monitoring target to %s",
                              self.default_target)
-        except KeyError, ex:
-            logger.debug("Phantom plugin not found: %s", ex)
+        except KeyError:
+            logger.debug("Phantom plugin not found: %s", exc_info=True)
 
         if self.address_resolver:
             try: