diff --git a/setup.py b/setup.py index 4ed9bd8..1a7e6bd 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='yandextank', - version='1.8.34', + version='1.8.35', description='a performance measurement tool', longer_description=''' Yandex.Tank is a performance measurement and load testing automatization tool. diff --git a/yandextank/api/config/00-base.ini b/yandextank/api/config/00-base.ini index f7b6d88..375fa27 100644 --- a/yandextank/api/config/00-base.ini +++ b/yandextank/api/config/00-base.ini @@ -5,7 +5,6 @@ plugin_ShellExec=yandextank.plugins.ShellExec 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_console=yandextank.plugins.Console plugin_tips=yandextank.plugins.TipsAndTricks @@ -21,3 +20,9 @@ ammo_type=caseline [overload] api_address=https://overload.yandex.net/ + +[telegraf] +disguise_hostnames=1 + +[monitoring] +disguise_hostnames=1 diff --git a/yandextank/core/config/00-base.ini b/yandextank/core/config/00-base.ini index e02ea33..e47a4c6 100644 --- a/yandextank/core/config/00-base.ini +++ b/yandextank/core/config/00-base.ini @@ -5,7 +5,7 @@ plugin_ShellExec=yandextank.plugins.ShellExec plugin_phantom=yandextank.plugins.Phantom plugin_aggregate=yandextank.plugins.Aggregator plugin_autostop=yandextank.plugins.Autostop -plugin_monitoring=yandextank.plugins.Telegraf +plugin_telegraf=yandextank.plugins.Telegraf plugin_console=yandextank.plugins.Console plugin_tips=yandextank.plugins.TipsAndTricks plugin_rcassert=yandextank.plugins.RCAssert @@ -17,3 +17,9 @@ ammo_type=caseline [overload] api_address=https://overload.yandex.net/ + +[telegraf] +disguise_hostnames=1 + +[monitoring] +disguise_hostnames=1 diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py index 503f089..c76417d 100644 --- a/yandextank/plugins/DataUploader/plugin.py +++ b/yandextank/plugins/DataUploader/plugin.py @@ -585,10 +585,11 @@ class Plugin(AbstractPlugin, AggregateResultListener, tank=self.core.job.tank, notify_list=self.get_option("notify", '').split(' '), load_scheme=loadscheme, + version=self.get_option('ver', ''), log_data_requests=bool(int(self.get_option('log_data_requests', '0'))), log_monitoring_requests=bool(int(self.get_option('log_monitoring_requests', '0'))), log_status_requests=bool(int(self.get_option('log_status_requests', '0'))), - log_other_requests=bool(int(self.get_option('log_other_requests', '0'))), ) + log_other_requests=bool(int(self.get_option('log_other_requests', '0')))) @property def task(self):