diff --git a/docs/conf.py b/docs/conf.py
index e9b237057..54d66105f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.2'
+release = '1.10.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/config_reference.rst b/docs/config_reference.rst
index 881e1e853..997110bda 100644
--- a/docs/config_reference.rst
+++ b/docs/config_reference.rst
@@ -988,44 +988,4 @@ Telegraf
  ``10s``
   10 seconds
  ``2m``
-  2 minutes
-
-YASM
-====
-
-``panels`` (dict)
------------------
-*\- (no description).* **Required.**
-
-:valueschema:
- :schema:
-  :default_signals:
-   :default:
-    True
-   :type:
-    boolean
-  :host:
-   :required:
-    True
-   :type:
-    string
-  :signals:
-   :required:
-    False
-   :type:
-    list
-  :tags:
-   :required:
-    True
-   :type:
-    string
- :type:
-  dict
-
-``timeout`` (integer)
----------------------
-*\- (no description). Default:* ``120``
-
-``verbose_logging`` (boolean)
------------------------------
-*\- (no description). Default:* ``False``
\ No newline at end of file
+  2 minutes
\ No newline at end of file
diff --git a/docs/core_and_modules.rst b/docs/core_and_modules.rst
index 667bda526..75e852d23 100644
--- a/docs/core_and_modules.rst
+++ b/docs/core_and_modules.rst
@@ -756,72 +756,53 @@ Disable phantom first (unless you really want to keep it active alongside at you
 
   # pandora_config.yml
 
-      pools: [{
-        "name": "dummy pool",
-        "gun": {"type": "log"},
-        "ammo": {
-          "type": "dummy/log",
-          "AmmoLimit": 10000000
-          },
-        "result": {
-          "type": "phout",
-          "destination": "./phout.log"
-          },
-        "shared-limits": false,
-        "user-limiter": {"type": "unlimited"},
-        "startup-limiter": {
-          "type": "periodic",
-          "batch": 1,
-          "max": 5,
-          "period": "0.5s"
-          }
-        }
-      ]
+  pools:
+    - id: HTTP pool                    # pool name (for your choice)
+      gun:
+        type: http                     # gun type
+        target: example.com:80         # gun target
+      ammo:
+        type: uri                      # ammo format
+        file: ./ammo.uri               # ammo file path
+      result:
+        type: phout                    # report format (phout is compatible for Yandex.Tank)
+        destination: ./phout.log       # report file name
+
+      rps:                             # RPS scheduler - controls throughput over test
+        type: line                     # linear growth load
+        from: 1                        # from 1 responses per second
+        to: 5                          # to 5 responses per second
+        duration: 2s                   # for 2 seconds
+
+      startup:                         # startup scheduler - control the level of parallelism
+        type: once                     # start 5 instances
+        times: 5                       #
+
+
+You may specify pandora config contents in tank's config file via ```config_content``` option.
+This option has more priority over config_file option.
+
+Create ```ammo.uri``` file, put your ammo inside and start the test.
 
-Schedules
----------
-
-The first schedule type is ``periodic`` schedule. It is defined as ``periodic(<batch_size>, <period>, <limit>)``.
-Pandora will issue one batch of size ``batch_size``, once in ``period`` seconds, maximum of ``limit`` ticks. Those ticks may be
-used in different places, for example as a limiter for user startups or as a limiter for each user request rate.
-
-Example:
-::
-
-    startup_schedule = periodic(2, 0.1, 100)
-    user_schedule = periodic(10, 15, 100)
-    shared_schedule = 0
-
-Start 2 users every 0.1 seconds, 100 batches, maximum of 2 * 100 = 200 users. Each user will issue requests in batches of 10 requests, every 15 seconds, maximum
-of 100 requests. All users will read from one ammo source.
-
-Second schedule type is ``linear``. It is defined like this: ``linear(<start_rps>, <end_rps>, <time>)``.
-
-Example:
-::
+.. code-block:: yaml
 
-    user_schedule = linear(.1, 10, 10m)
-    shared_schedule = 1
+  # ammo.uri
 
-The load will raise from .1 RPS (1 request in 10 seconds) until 10 RPS during 10 minutes. Since
-``shared_schedule`` is 1, this defines the overall load.
+  /my/first/url
+  /my/second/url
 
-The last schedule type is ``unlimited``. It has no parameters and users will shoot as soon
-as possible. It is convenient to use this type of load to find out maximum performance of a
-service and its level of parallelism. You should limit the loop number if you want the test
-to stop eventually. 
+Schedules
+---------
+```Pandora``` has two main RPS scheduler types:
+  1. ``line`` - makes linear load, where ```from``` and ```to``` are start and end,
+  `duration` is a time for linear load increase from ```from``` to ```to```.
 
-Example:
-::
+  2. ``const`` - makes constant load, where ```ops``` is a load value for ```duration``` time.
 
-    loop = 1000000
-    startup_schedule = periodic(2, 10, 50)
-    user_schedule = unlimited()
-    shared_schedule = 0
 
-Start 2 users every 10 seconds. Every user will shoot without any limits (next request is sended
-as soon as the previous response have been received). This is analogous to phantom's instances
-schedule mode.
+Custom_guns
+-----------
+You can create you own Golang-based gun with `pandora`. Feel free to find examples at [pandora documentation](https://yandexpandora.readthedocs.io/en/develop/)
 
 
 ******************
@@ -830,7 +811,7 @@ Artifact uploaders
 
 .. note::
 
-  Graphite uploader, InfluxDB uploader and BlazeMeter Sense are not currently supported in the last Yandex.Tank version.
+  Graphite uploader and BlazeMeter Sense are not currently supported in the last Yandex.Tank version.
   If you want one of them, use 1.7 branch.
 
 Yandex.Overload
@@ -861,6 +842,49 @@ Example:
     job_name: test
     job_dsc: test description
 
+
+InfluxDB
+========
+
+InfluxDB uploader.
+
+Options
+-------
+
+:address:
+  (Optional) InfluxDB address. (Default: 'localhost')
+:port:
+  (Optional) InfluxDB port. (Default: 8086)
+:database:
+  (Optional) InfluxDB database. (Default: 'mydb')
+:username:
+  (Optional) InfluxDB user name. (Default: 'root')
+:password:
+  (Optional) InfluxDB password. (Default: 'root')
+:labeled:
+  (Optional) Send labels (ammo tags) to influx. (Default: false)
+:prefix_measurement:
+  (Optional) Add prefix to measurement name. (Default: '')
+:tank_tag:
+  (Optional) Tank tag. (Default: 'unknown')
+:grafana_root:
+  (Optional) Grafana root path. Used to generate link to grafana dashboard.
+:grafana_dashboard:
+  (Optional) Grafana dashboard name. Used to generate link to grafana dashboard.
+
+Example:
+
+.. code-block:: yaml
+
+  influx:
+    enabled: true
+    address: yourhost.tld
+    database: yourbase
+    tank_tag: 'mytank'
+    prefix_measurement: 'your_test_prefix_'
+    labeled: true
+
+
 ***********
 Handy tools
 ***********
diff --git a/docs/generator_tuning.rst b/docs/generator_tuning.rst
index 38d793dc2..f08d51d9b 100644
--- a/docs/generator_tuning.rst
+++ b/docs/generator_tuning.rst
@@ -31,7 +31,7 @@ Otherwise if port is unreachable:
 Routing
 *******
 
-OK, service is reachable, next thing
+OK, the service is reachable, next thing
 you should know is how far Yandex.Tank is located from the service you'd
 like to test. Heavy load can make switch to be unresponsible or to
 reboot, or at least it may lead to network losses, so the test results
@@ -59,13 +59,13 @@ execution of ``tracepath`` command or it analogs
     6:  8.example.com (203.0.113.1)                 0.525ms asymm  5
     7:  no reply
 
-In second example you'd better find another closer located tank.
+In the second example you'd better find another closer located tank.
 
 ******
 Tuning
 ******
 
-To achieve the top most performance you should tune the source server
+To achieve top performance you should tune the source server
 system limits:
 
 .. code-block:: bash
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 33704abc4..c6a4e5b42 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -106,7 +106,7 @@ To specify external ammo file use ``ammofile`` option.
 
 .. note::
   You can specify URL to ammofile, http(s). Small ammofiles (~<100MB) will be downloaded as is,
-  to directory ``/tmp/<hash>``, large files will be readed from stream.
+  to directory ``/tmp/<hash>``, large files will be read from stream.
 
 .. note::
 
@@ -154,7 +154,7 @@ Parameter ``uris`` contains uri, which should be used for requests generation.
 
 .. note::
 
-  Pay attention to sample above, because whitespaces in multiline ``uris`` and ``headers`` options are important.
+  Pay attention to the sample above, because whitespaces in multiline ``uris`` and ``headers`` options are important.
 
 URI-style, URIs in file
 -----------------------
@@ -174,7 +174,7 @@ Create a file with declared requests: ``ammo.txt``
   [Cookie: test]
   /buy/?rt=0&station_to=7&station_from=9
 
-File consist of list of URIs and headers to be added to every request defined below.
+File consists of list of URIs and headers to be added to every request defined below.
 Every URI must begin from a new line, with leading ``/``.
 Each line that begins from ``[`` is considered as a header.
 Headers could be (re)defined in the middle of URIs, as in sample above. 
@@ -340,7 +340,7 @@ file ``phout.txt`` is being written, which could be analyzed later.
 If you need more human-readable report, you can try Report plugin,
 You can found it `here <https://github.com/yandex-load/yatank-online>`_
 
-If you need to upload results to external storage, such as Graphite or InfluxDB, you can use one of existing artifacts uploading modules :doc:`core_and_modules`
+If you need to upload results to an external storage, such as Graphite or InfluxDB, you can use one of existing artifacts uploading modules :doc:`core_and_modules`
 
 Tags
 ====
diff --git a/setup.py b/setup.py
index cdab21078..cac0d9f20 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='yandextank',
-    version='1.10.2',
+    version='1.10.3',
     description='a performance measurement tool',
     longer_description='''
 Yandex.Tank is a performance measurement and load testing automatization tool.
@@ -20,7 +20,7 @@
         'psutil>=1.2.1', 'requests>=2.5.1', 'paramiko>=1.16.0',
         'pandas>=0.18.0', 'numpy>=1.12.1', 'future>=0.16.0',
         'pip>=8.1.2',
-        'pyyaml>=3.12', 'cerberus==1.2', 'influxdb>=5.0.0', 'netort==0.2.4',
+        'pyyaml>=3.12', 'cerberus==1.2', 'influxdb>=5.0.0', 'netort==0.2.6',
     ],
     setup_requires=[
     ],
@@ -63,7 +63,6 @@
         'yandextank.plugins.Influx': ['config/*'],
         'yandextank.plugins.JMeter': ['config/*'],
         'yandextank.plugins.JsonReport': ['config/*'],
-        'yandextank.plugins.YASM': ['config/*'],
         'yandextank.plugins.Pandora': ['config/*'],
         'yandextank.plugins.Phantom': ['config/*'],
         'yandextank.plugins.RCAssert': ['config/*'],
diff --git a/yandextank/aggregator/tank_aggregator.py b/yandextank/aggregator/tank_aggregator.py
index f2ceb6ccf..99d997e0e 100644
--- a/yandextank/aggregator/tank_aggregator.py
+++ b/yandextank/aggregator/tank_aggregator.py
@@ -117,12 +117,17 @@ def is_test_finished(self):
     def end_test(self, retcode):
         retcode = self.generator.end_test(retcode)
         if self.reader:
+            logger.debug('Closing gun reader')
             self.reader.close()
         if self.stats_reader:
+            logger.debug('Closing stats reader')
             self.stats_reader.close()
         if self.drain:
+            logger.debug('Waiting for gun drain to finish')
             self.drain.wait()
+            logger.debug('Waiting for stats drain to finish')
             self.stats_drain.wait()
+        logger.debug('Collecting remaining data')
         self._collect_data(end=True)
         if self.drain:
             self.drain.join()
diff --git a/yandextank/common/util.py b/yandextank/common/util.py
index b465efea0..98196192b 100644
--- a/yandextank/common/util.py
+++ b/yandextank/common/util.py
@@ -18,7 +18,7 @@
 
 
 class SecuredShell(object):
-    def __init__(self, host, port, username, timeout):
+    def __init__(self, host, port, username, timeout=10):
         self.host = host
         self.port = port
         self.username = username
@@ -62,7 +62,7 @@ def fixed_AES_new(key, *ls):
                 self.host,
                 port=self.port,
                 username=self.username,
-                timeout=self.timeout, )
+                timeout=self.timeout)
         return client
 
     def execute(self, cmd):
@@ -89,15 +89,22 @@ def send_file(self, local_path, remote_path):
                 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)
+            result = sftp.put(local_path, remote_path, self.get_progress_logger(local_path))
         return result
 
+    @staticmethod
+    def get_progress_logger(name):
+
+        def print_progress(done, total):
+            logger.info("Transferring {}: {}%".format(name, done * 100 / total))
+        return print_progress
+
     def get_file(self, remote_path, local_path):
         logger.info(
             "Receiving from {host}:[{remote}] to [{local}]".format(
                 local=local_path, host=self.host, remote=remote_path))
         with self.connect() as client, client.open_sftp() as sftp:
-            result = sftp.get(remote_path, local_path)
+            result = sftp.get(remote_path, local_path, self.get_progress_logger(remote_path))
         return result
 
     def async_session(self, cmd):
diff --git a/yandextank/config_converter/converter.py b/yandextank/config_converter/converter.py
index 552152921..ba7e5dc2c 100644
--- a/yandextank/config_converter/converter.py
+++ b/yandextank/config_converter/converter.py
@@ -205,6 +205,9 @@ class Option(object):
         },
         'DataUploader': {
             'lock_targets': lambda k, v: {k: v.strip().split() if v != 'auto' else v}
+        },
+        'core': {
+            'ignore_locks': lambda k, v: {'ignore_lock': to_bool(v)}
         }
     }
     CONVERTERS_FOR_UNKNOWN = {
@@ -490,10 +493,10 @@ def core_options(cfg_ini):
 
 def convert_ini(ini_file):
     cfg_ini = ConfigParser()
-    if isinstance(ini_file, file):
-        cfg_ini.readfp(ini_file)
-    else:
+    if isinstance(ini_file, str):
         cfg_ini.read(ini_file)
+    else:
+        cfg_ini.readfp(ini_file)
 
     ready_sections = enable_sections(combine_sections(parse_sections(cfg_ini)), core_options(cfg_ini))
 
diff --git a/yandextank/config_converter/tests/test_config1.ini b/yandextank/config_converter/tests/test_config1.ini
index cccc75a23..681b0cbde 100644
--- a/yandextank/config_converter/tests/test_config1.ini
+++ b/yandextank/config_converter/tests/test_config1.ini
@@ -6,6 +6,7 @@ plugin_autostop = Tank/Plugins/Autostop.py
 plugin_monitoring = Tank/Plugins/Telegraf.py
 plugin_uploader = Tank/Plugins/DataUploader.py
 artifacts_base_dir = logs
+ignore_locks = 1
 
 [phantom]
 address = load.example.net
diff --git a/yandextank/config_converter/tests/test_config1.yaml b/yandextank/config_converter/tests/test_config1.yaml
index 64eea7397..97df4ea45 100644
--- a/yandextank/config_converter/tests/test_config1.yaml
+++ b/yandextank/config_converter/tests/test_config1.yaml
@@ -1,6 +1,7 @@
 core:
   lock_dir: /var/lock
   artifacts_base_dir: logs
+  ignore_lock: true
 phantom:
   package: yandextank.plugins.Phantom
   enabled: true
diff --git a/yandextank/core/tankcore.py b/yandextank/core/tankcore.py
index 37e6ee5fd..9de064c9e 100644
--- a/yandextank/core/tankcore.py
+++ b/yandextank/core/tankcore.py
@@ -20,6 +20,7 @@
 
 from yandextank.common.exceptions import PluginNotPrepared
 from yandextank.common.interfaces import GeneratorPlugin, MonitoringPlugin
+from yandextank.plugins.DataUploader.client import LPRequisites
 from yandextank.validator.validator import TankConfig, ValidationError
 from yandextank.aggregator import TankAggregator
 from ..common.util import update_status, pid_exists
@@ -104,6 +105,7 @@ def __init__(self, configs, artifacts_base_dir=None, artifacts_dir_name=None):
         self._plugins = None
         self._artifacts_dir = None
         self.artifact_files = {}
+        self.artifacts_to_send = []
         self._artifacts_base_dir = None
         self.manual_start = False
         self.scheduled_start = None
@@ -125,6 +127,7 @@ def __init__(self, configs, artifacts_base_dir=None, artifacts_dir_name=None):
                                  core_section=self.SECTION,
                                  error_output=error_output)
         self.add_artifact_file(error_output)
+        self.add_artifact_to_send(LPRequisites.CONFIGINFO, unicode(self.config))
     #
     # def get_uuid(self):
     #     return self.uuid
@@ -429,6 +432,9 @@ def add_artifact_file(self, filename, keep_original=False):
                 filename)
             self.artifact_files[filename] = keep_original
 
+    def add_artifact_to_send(self, lp_requisites, content):
+        self.artifacts_to_send.append((lp_requisites, content))
+
     def apply_shorthand_options(self, options, default_section='DEFAULT'):
         for option_str in options:
             key, value = option_str.split('=')
diff --git a/yandextank/plugins/DataUploader/cli.py b/yandextank/plugins/DataUploader/cli.py
index 765534cff..1398508f7 100644
--- a/yandextank/plugins/DataUploader/cli.py
+++ b/yandextank/plugins/DataUploader/cli.py
@@ -17,7 +17,7 @@
 
 from yandextank.core import TankCore
 from yandextank.validator.validator import ValidationError, load_yaml_schema
-from .client import APIClient, OverloadClient
+from .client import APIClient, OverloadClient, LPRequisites
 from .plugin import LPJob, BackendTypes
 from .plugin import Plugin as DataUploader
 
@@ -89,7 +89,7 @@ def upload_monitoring(shooting_dir, log_name, lp_job):
 
 
 def send_config_snapshot(config, lp_job):
-    lp_job.send_config_snapshot(yaml.dump(config))
+    lp_job.send_config(LPRequisites.CONFIGINFO, yaml.dump(config))
 
 
 def edit_metainfo(lp_config, lp_job):
diff --git a/yandextank/plugins/DataUploader/client.py b/yandextank/plugins/DataUploader/client.py
index 531a438a8..3d03176e8 100644
--- a/yandextank/plugins/DataUploader/client.py
+++ b/yandextank/plugins/DataUploader/client.py
@@ -635,10 +635,11 @@ def get_virtual_host_info(self, hostname):
     def get_manual_unlock_link(target):
         return "api/server/lock.json?action=unlock&address=%s" % target
 
-    def send_config_snapshot(self, jobno, config, trace=False):
-        logger.debug("Sending config snapshot")
-        addr = "api/job/%s/configinfo.txt" % jobno
-        self.__post_raw(addr, {"configinfo": unicode(config)}, trace=trace)
+    def send_config(self, jobno, lp_requisites, config_content, trace=False):
+        endpoint, field_name = lp_requisites
+        logger.debug("Sending {} config".format(field_name))
+        addr = "/api/job/%s/%s" % (jobno, endpoint)
+        self.__post_raw(addr, {field_name: unicode(config_content)}, trace=trace)
 
     def link_mobile_job(self, lp_key, mobile_key):
         addr = "/api/job/{jobno}/edit.json".format(jobno=lp_key)
@@ -649,6 +650,12 @@ def link_mobile_job(self, lp_key, mobile_key):
         return response
 
 
+class LPRequisites():
+    CONFIGINFO = ('configinfo.txt', 'configinfo')
+    MONITORING = ('jobmonitoringconfig.txt', 'monitoringconfig')
+    CONFIGINITIAL = ('configinitial.txt', 'configinitial')
+
+
 class OverloadClient(APIClient):
     """ mocks below for nonexistent backend methods """
     def send_status(self, jobno, upload_token, status, trace=False):
diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py
index 2329796e4..ff30fa7b5 100644
--- a/yandextank/plugins/DataUploader/plugin.py
+++ b/yandextank/plugins/DataUploader/plugin.py
@@ -9,6 +9,7 @@
 import sys
 import time
 import datetime
+import yaml
 from future.moves.urllib.parse import urljoin
 
 from queue import Empty, Queue
@@ -21,7 +22,7 @@
 from ...common.util import expand_to_seconds
 from ..Autostop import Plugin as AutostopPlugin
 from ..Console import Plugin as ConsolePlugin
-from .client import APIClient, OverloadClient
+from .client import APIClient, OverloadClient, LPRequisites
 from ...common.util import FileScanner
 
 from netort.data_processing import Drain
@@ -93,7 +94,6 @@ def __init__(self, core, cfg):
         self.monitoring = threading.Thread(target=self.__monitoring_uploader)
         self.monitoring.daemon = True
 
-        self._generator_info = None
         self._is_telegraf = None
         self.backend_type = BackendTypes.identify_backend(self.cfg['api_address'])
         self._task = None
@@ -115,7 +115,8 @@ def get_key():
     @property
     def lock_duration(self):
         if self._lock_duration is None:
-            self._lock_duration = self.generator_info.duration if self.generator_info.duration else \
+            info = self.get_generator_info()
+            self._lock_duration = info.duration if info.duration else \
                 expand_to_seconds(self.get_option("target_lock_duration"))
         return self._lock_duration
 
@@ -214,14 +215,18 @@ def search_task_from_cwd(cwd):
             os.getcwd())
 
     def prepare_test(self):
-        info = self.generator_info
+        info = self.get_generator_info()
         port = info.port
         instances = info.instances
-        if info.ammo_file.startswith(
-                "http://") or info.ammo_file.startswith("https://"):
-            ammo_path = info.ammo_file
+        if info.ammo_file is not None:
+            if info.ammo_file.startswith(
+                    "http://") or info.ammo_file.startswith("https://"):
+                ammo_path = info.ammo_file
+            else:
+                ammo_path = os.path.realpath(info.ammo_file)
         else:
-            ammo_path = os.path.realpath(info.ammo_file)
+            logger.warning('Failed to get info about ammo path')
+            ammo_path = 'Undefined'
         loop_count = int(info.loop_count)
 
         try:
@@ -448,19 +453,11 @@ def __events_uploader(self):
 
     # TODO: why we do it here? should be in core
     def __save_conf(self):
-        # config = copy.deepcopy(self.core.config)
-        try:
-            config_filename = self.core.job.monitoring_plugin.config
-            if config_filename and config_filename not in ['none', 'auto']:
-                with open(config_filename) as config_file:
-                    self.core.job.monitoring_plugin.set_option("config_contents", config_file.read())
-        except AttributeError:  # pylint: disable=W0703
-            logger.info("Can't get monitoring config", exc_info=True)
-
-        self.lp_job.send_config_snapshot(self.core.cfg_snapshot)
         self.core.config.save(
             os.path.join(
                 self.core.artifacts_dir, 'saved_conf.yaml'))
+        for requisites, content in self.core.artifacts_to_send:
+            self.lp_job.send_config(requisites, content)
 
     def parse_lock_targets(self):
         # prepare target lock list
@@ -568,28 +565,29 @@ def __get_lp_job(self):
         """
         api_client = self.__get_api_client()
 
-        info = self.generator_info
+        info = self.get_generator_info()
         port = info.port
-        loadscheme = [] if isinstance(info.rps_schedule,
-                                      str) else info.rps_schedule
-
-        return LPJob(client=api_client,
-                     target_host=self.target,
-                     target_port=port,
-                     number=self.cfg.get('jobno', None),
-                     token=self.get_option('upload_token'),
-                     person=self.__get_operator(),
-                     task=self.task,
-                     name=self.get_option('job_name', 'none'),
-                     description=self.get_option('job_dsc'),
-                     tank=self.core.job.tank,
-                     notify_list=self.get_option("notify"),
-                     load_scheme=loadscheme,
-                     version=self.get_option('ver'),
-                     log_data_requests=self.get_option('log_data_requests'),
-                     log_monitoring_requests=self.get_option('log_monitoring_requests'),
-                     log_status_requests=self.get_option('log_status_requests'),
-                     log_other_requests=self.get_option('log_other_requests'))
+        loadscheme = [] if isinstance(info.rps_schedule, (str, dict)) else info.rps_schedule
+
+        lp_job = LPJob(client=api_client,
+                       target_host=self.target,
+                       target_port=port,
+                       number=self.cfg.get('jobno', None),
+                       token=self.get_option('upload_token'),
+                       person=self.__get_operator(),
+                       task=self.task,
+                       name=self.get_option('job_name', 'none'),
+                       description=self.get_option('job_dsc'),
+                       tank=self.core.job.tank,
+                       notify_list=self.get_option("notify"),
+                       load_scheme=loadscheme,
+                       version=self.get_option('ver'),
+                       log_data_requests=self.get_option('log_data_requests'),
+                       log_monitoring_requests=self.get_option('log_monitoring_requests'),
+                       log_status_requests=self.get_option('log_status_requests'),
+                       log_other_requests=self.get_option('log_other_requests'))
+        lp_job.send_config(LPRequisites.CONFIGINITIAL, yaml.dump(self.core.config.get_configinitial()))
+        return lp_job
 
     @property
     def task(self):
@@ -636,16 +634,13 @@ def read_token(filename):
             )
             raise RuntimeError("API token error")
 
-    @property
-    def generator_info(self):
-        if self._generator_info is None:
-            self._generator_info = self.core.job.generator_plugin.get_info()
-        return self._generator_info
+    def get_generator_info(self):
+        return self.core.job.generator_plugin.get_info()
 
     @property
     def target(self):
         if self._target is None:
-            self._target = self.generator_info.address
+            self._target = self.get_generator_info().address
             logger.info("Detected target: %s", self.target)
         return self._target
 
@@ -803,10 +798,8 @@ def get_task_data(self, task):
         return self.api_client.get_task_data(
             task, trace=self.log_other_requests)
 
-    def send_config_snapshot(self, config):
-        if self._number:
-            self.api_client.send_config_snapshot(
-                self.number, config, trace=self.log_other_requests)
+    def send_config(self, lp_requisites, content):
+        self.api_client.send_config(self.number, lp_requisites, content, trace=self.log_other_requests)
 
     def push_monitoring_data(self, data):
         if not self.interrupted.is_set():
diff --git a/yandextank/plugins/Influx/decoder.py b/yandextank/plugins/Influx/decoder.py
index e0ee3e437..8b305c9c5 100644
--- a/yandextank/plugins/Influx/decoder.py
+++ b/yandextank/plugins/Influx/decoder.py
@@ -47,6 +47,23 @@ def decode_monitoring(self, data):
     def decode_aggregate_labeled(self, data, stat, prefix):
         timestamp = int(data["ts"])
         points = []
+        # overall quantiles w/ __OVERALL__ label
+        points += [
+            {
+                "measurement": prefix + "overall_quantiles",
+                "tags": {
+                    "tank": self.tank_tag,
+                    "uuid": self.uuid,
+                    "label": "__OVERALL__"
+                },
+                "time": timestamp,
+                "fields": {
+                    'q' + str(q): value / 1000.0
+                    for q, value in zip(data["overall"]["interval_real"]["q"]["q"],
+                                        data["overall"]["interval_real"]["q"]["value"])
+                },
+            }
+        ]
         for key, value in data["tagged"].items():
             points += [{
                 "measurement": prefix + "overall_quantiles",
@@ -91,6 +108,7 @@ def decode_aggregate_labeled(self, data, stat, prefix):
                 "tags": {
                     "tank": self.tank_tag,
                     "uuid": self.uuid,
+                    "label": key
                 },
                 "time": timestamp,
                 "fields": {
diff --git a/yandextank/plugins/JMeter/plugin.py b/yandextank/plugins/JMeter/plugin.py
index 5cafbf64b..709f729ce 100644
--- a/yandextank/plugins/JMeter/plugin.py
+++ b/yandextank/plugins/JMeter/plugin.py
@@ -7,6 +7,7 @@
 import time
 import socket
 import re
+import shlex
 
 from pkg_resources import resource_string
 
@@ -14,7 +15,6 @@
 from ..Console import Plugin as ConsolePlugin
 from ..Console import screen as ConsoleScreen
 from ...common.interfaces import AggregateResultListener, AbstractInfoWidget, GeneratorPlugin
-from ...common.util import splitstring
 
 logger = logging.getLogger(__name__)
 
@@ -98,7 +98,7 @@ def prepare_test(self):
             '-Jjmeter.save.saveservice.default_delimiter=\\t',
             '-Jjmeter.save.saveservice.connect_time=true'
         ]
-        self.args += splitstring(self.user_args)
+        self.args += shlex.split(self.user_args)
 
         if self.affinity:
             self.core.__setup_affinity(self.affinity, args=self.args)
diff --git a/yandextank/plugins/Pandora/plugin.py b/yandextank/plugins/Pandora/plugin.py
index 7c079edb9..aa05ec5d3 100644
--- a/yandextank/plugins/Pandora/plugin.py
+++ b/yandextank/plugins/Pandora/plugin.py
@@ -1,8 +1,8 @@
 import datetime
-import json
 import logging
 import subprocess
 import time
+import yaml
 
 from netort.resource import manager as resource_manager
 
@@ -20,6 +20,7 @@ class Plugin(GeneratorPlugin):
 
     OPTION_CONFIG = "config"
     SECTION = "pandora"
+    DEFAULT_REPORT_FILE = "phout.log"
 
     def __init__(self, core, cfg):
         super(Plugin, self).__init__(core, cfg)
@@ -27,9 +28,13 @@ def __init__(self, core, cfg):
         self.process_start_time = None
         self.pandora_cmd = None
         self.pandora_config_file = None
+        self.config_contents = None
         self.custom_config = False
-        self.sample_log = "./phout.log"
         self.expvar = True
+        self.sample_log = None
+        self.__address = None
+        self.__schedule = None
+        self.ammofile = None
 
     @staticmethod
     def get_key():
@@ -48,32 +53,99 @@ def configure(self):
         self.pandora_cmd = self.get_option("pandora_cmd")
         self.buffered_seconds = self.get_option("buffered_seconds")
         self.affinity = self.get_option("affinity", "")
+
+        # get config_contents and patch it: expand resources via resource manager
+        # config_content option has more priority over config_file
+        if self.get_option("config_content"):
+            logger.info('Found config_content option configuration')
+            self.config_contents = self.__patch_raw_config_and_dump(self.get_option("config_content"))
+        elif self.get_option("config_file"):
+            logger.info('Found config_file option configuration')
+            with open(self.get_option("config_file"), 'rb') as config:
+                external_file_config_contents = yaml.safe_load(config.read())
+            self.config_contents = self.__patch_raw_config_and_dump(external_file_config_contents)
+        else:
+            raise RuntimeError("Neither pandora.config_content, nor pandora.config_file specified")
+        logger.debug('Config after parsing for patching: %s', self.config_contents)
+
+        # find report filename and add to artifacts
+        self.sample_log = self.__find_report_filename()
         with open(self.sample_log, 'w'):
             pass
         self.core.add_artifact_file(self.sample_log)
 
-        config_content = self.patch_config(self.get_option("config_content"))
-        if len(config_content) > 0:
-            self.pandora_config_file = self.core.mkstemp(
-                ".json", "pandora_config_")
-            self.core.add_artifact_file(self.pandora_config_file)
-            with open(self.pandora_config_file, 'w') as config_file:
-                json.dump(config_content, config_file)
-        else:
-            config_file = self.get_option("config_file")
-            if not config_file:
-                raise RuntimeError(
-                    "neither pandora config content"
-                    "nor pandora config file is specified")
+    def __patch_raw_config_and_dump(self, cfg_dict):
+        if not cfg_dict:
+            raise RuntimeError('Empty pandora config')
+        # patch
+        config_content = self.patch_config(cfg_dict)
+        # dump
+        self.pandora_config_file = self.core.mkstemp(".yaml", "pandora_config_")
+        self.core.add_artifact_file(self.pandora_config_file)
+        with open(self.pandora_config_file, 'w') as config_file:
+            yaml.dump(config_content, config_file)
+        return config_content
+
+    def patch_config(self, config):
+        """
+        download remote resources, replace links with local filenames
+        add result file section
+        :param dict config: pandora config
+        """
+        for pool in config['pools']:
+            if 'file' in pool.get('ammo', {}).get('source', {}).get('type', ''):
+                self.ammofile = pool['ammo']['source']['path']
+                pool['ammo']['source']['path'] = resource_manager.resource_filename(
+                    self.ammofile
+                )
+            if not pool.get('result') or 'phout' not in pool.get('result', {}).get('type', ''):
+                logger.warning('Seems like pandora result file not specified... adding defaults')
+                pool['result'] = dict(
+                    destination=self.DEFAULT_REPORT_FILE,
+                    type='phout',
+                )
+        return config
+
+    @property
+    def address(self):
+        if not self.__address:
+            for pool in self.config_contents['pools']:
+                if pool.get('gun', {}).get('target'):
+                    self.__address = pool.get('gun', {}).get('target')
+                    break
+            else:
+                self.__address = 'unknown'
+        return self.__address
+
+    @property
+    def schedule(self):
+        if not self.__schedule:
+            for pool in self.config_contents['pools']:
+                if pool.get('rps'):
+                    self.__schedule = pool.get('rps')
+                    break
             else:
-                extension = config_file.rsplit(".", 1)[1]
-                self.pandora_config_file = self.core.mkstemp(
-                    "." + extension, "pandora_config_")
-                self.core.add_artifact_file(self.pandora_config_file)
-                with open(config_file, 'rb') as config:
-                    config_content = config.read()
-                with open(self.pandora_config_file, 'wb') as config_file:
-                    config_file.write(config_content)
+                self.__schedule = 'unknown'
+        return self.__schedule
+
+    def get_info(self):
+        return self.Info(
+            address=self.address,
+            ammo_file=self.ammofile,
+            duration=0,
+            instances=0,
+            loop_count=0,
+            port=self.address.split(':')[-1],
+            rps_schedule=self.schedule
+        )
+
+    def __find_report_filename(self):
+        for pool in self.config_contents['pools']:
+            if pool.get('result', {}).get('destination', None):
+                report_filename = pool.get('result').get('destination')
+                logger.info('Found report file in pandora config: %s', report_filename)
+                return report_filename
+        return self.DEFAULT_REPORT_FILE
 
     def get_reader(self):
         if self.reader is None:
@@ -131,17 +203,6 @@ def end_test(self, retcode):
             logger.debug("Seems subprocess finished OK")
         return retcode
 
-    @staticmethod
-    def patch_config(config):
-        """
-        download remote resources, replace links with local filenames
-        :param dict config: pandora config
-        """
-        for pool in config['pools']:
-            if 'file' in pool.get('ammo', {}):
-                pool['ammo']['file'] = resource_manager.resource_filename(pool['ammo']['file'])
-        return config
-
 
 class PandoraInfoWidget(AbstractInfoWidget):
     ''' Right panel widget '''
@@ -174,7 +235,16 @@ def render(self, screen):
         template += "Command Line: %s\n"
         template += "    Duration: %s\n"
         template += "  Requests/s: %s\n"
-        template += " Active reqs: %s"
-        data = (self.owner.pandora_cmd, duration, self.reqps, self.active)
+        template += " Active reqs: %s\n"
+        template += "      Target: %s\n"
+        template += "    Schedule: \n%s\n"
+        data = (
+            self.owner.pandora_cmd,
+            duration,
+            self.reqps,
+            self.active,
+            self.owner.address,
+            yaml.dump(self.owner.schedule)
+        )
 
         return template % data
diff --git a/yandextank/plugins/Pandora/reader.py b/yandextank/plugins/Pandora/reader.py
index d923e410a..e71240f59 100644
--- a/yandextank/plugins/Pandora/reader.py
+++ b/yandextank/plugins/Pandora/reader.py
@@ -30,7 +30,7 @@ def run(self):
                         }
                     }
                 except (requests.ConnectionError, requests.HTTPError, requests.exceptions.Timeout):
-                    logger.warning("Pandora expvar http interface is unavailable", exc_info=True)
+                    logger.debug("Pandora expvar http interface is unavailable", exc_info=True)
                     data = {
                         'ts': last_ts - 1,
                         'metrics': {
@@ -71,8 +71,6 @@ def next(self):
             }]
         else:
             if self.closed:
-                self.poller.stop()
-                self.poller.join()
                 raise StopIteration()
             elif not self.started:
                 self.poller.start()
@@ -81,6 +79,8 @@ def next(self):
 
     def close(self):
         self.closed = True
+        self.poller.stop()
+        self.poller.join()
 
     def __iter__(self):
         return self
diff --git a/yandextank/plugins/Telegraf/plugin.py b/yandextank/plugins/Telegraf/plugin.py
index 3557502c4..337a068db 100644
--- a/yandextank/plugins/Telegraf/plugin.py
+++ b/yandextank/plugins/Telegraf/plugin.py
@@ -15,6 +15,7 @@
 
 from netort.resource import manager as resource
 
+from yandextank.plugins.DataUploader.client import LPRequisites
 from ...common.interfaces import MonitoringDataListener, AbstractInfoWidget, MonitoringPlugin
 from ...common.util import expand_to_seconds
 from ..Autostop import Plugin as AutostopPlugin, AbstractCriterion
@@ -116,6 +117,10 @@ def __detect_configuration(self):
 
     @property
     def config(self):
+        """
+
+        :rtype: str
+        """
         if self._config is None:
             value = self.get_option('config')
 
@@ -156,6 +161,9 @@ def configure(self):
             self.die_on_fail = False
             return
 
+        with open(self.config) as f:
+            self.core.add_artifact_to_send(LPRequisites.MONITORING, unicode(f.read()))
+
         # FIXME [legacy] backward compatibility with Monitoring module
         # configuration below.
         self.monitoring.ssh_timeout = expand_to_seconds(
diff --git a/yandextank/plugins/YASM/__init__.py b/yandextank/plugins/YASM/__init__.py
deleted file mode 100644
index 21576d584..000000000
--- a/yandextank/plugins/YASM/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .plugin import Plugin # noqa:F401,F403
\ No newline at end of file
diff --git a/yandextank/plugins/YASM/config/schema.yaml b/yandextank/plugins/YASM/config/schema.yaml
deleted file mode 100644
index 0f0d65705..000000000
--- a/yandextank/plugins/YASM/config/schema.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-panels:
-  required: true
-  type: dict
-  valueschema:
-    type: dict
-    schema:
-      host:
-        type: string
-        required: true
-      tags:
-        type: string
-        required: true
-      signals:
-        required: false
-        type: list
-      default_signals:
-        type: boolean
-        default: true
-timeout:
-  type: integer
-  default: 120
-verbose_logging:
-  type: boolean
-  default: false
\ No newline at end of file
diff --git a/yandextank/plugins/YASM/plugin.py b/yandextank/plugins/YASM/plugin.py
deleted file mode 100644
index d7a91df4e..000000000
--- a/yandextank/plugins/YASM/plugin.py
+++ /dev/null
@@ -1,255 +0,0 @@
-import re
-
-import time
-from Queue import Empty
-
-from multiprocessing import Queue, Event, Process
-
-import logging
-
-import signal
-from yandextank.common.interfaces import MonitoringPlugin
-from yasmapi import RtGolovanRequest
-from threading import Thread
-
-logger = logging.getLogger(__name__)
-
-DEFAULT_SIGNALS = [
-    'portoinst-cpu_usage_cores_tmmv',
-    'portoinst-cpu_guarantee_cores_tmmv',
-    'portoinst-cpu_limit_cores_tmmv',
-    'portoinst-cpu_wait_cores_tmmv',
-    'portoinst-memory_usage_gb_tmmv',
-    'portoinst-memory_limit_gb_tmmv',
-    'portoinst-io_read_fs_bytes_tmmv',
-    'portoinst-io_write_fs_bytes_tmmv',
-    'portoinst-io_limit_bytes_tmmv',
-    'conv(unistat-auto_disk_rootfs_usage_bytes_axxx, Gi)',
-    'conv(unistat-auto_disk_rootfs_total_bytes_axxx, Gi)',
-    'portoinst-net_mb_summ',
-    'portoinst-net_guarantee_mb_summ',
-    'portoinst-net_limit_mb_summ'
-]
-
-
-def signals_stream(panel):
-    '''
-    :type yasmapi_cfg: Panel
-    :return: Panel, float, dict
-    '''
-    for point in RtGolovanRequest(panel.as_dict):
-        logger.debug('received YASM data for {} for following hosts an tags: {}'.
-                     format(point.ts,
-                            {host: tags.keys() for host, tags in point.values.items()}))
-        yield point.ts, point.values[panel.host][panel.tags]
-
-
-def map_metric_name(name):
-    NAME_MAP = {r'conv\(.+\)': r'(?<=conv\().+?(?=,)'}
-    for pattern, mask in NAME_MAP.items():
-        if re.match(pattern, name):
-            name = re.findall(mask, name)[0]
-            break
-    return 'custom:{}'.format(name)
-
-
-def convert_value(name, value):
-    return value
-
-
-def monitoring_data(ts, data, comment=''):
-    return ImmutableDict({
-        "timestamp": ts,
-        "data": {
-            host: {
-                "comment": comment,
-                "metrics": {map_metric_name(name): convert_value(name, value) for name, value in host_data.items()}
-            }
-            for host, host_data in data.items()}})
-
-
-class YasmCfg(object):
-    def __init__(self, panels):
-        self.panels = [Panel(alias, **attrs) for alias, attrs in panels.items()]
-        self._as_dict = None
-
-    @property
-    def as_dict(self):
-        if self._as_dict is None:
-            yasmapi_cfg = {}
-            for panel in self.panels:
-                yasmapi_cfg.setdefault(panel.host, {})[panel.tags] = panel.signals
-            logger.info('yasmapi cfg: {}'.format(yasmapi_cfg))
-            self._as_dict = yasmapi_cfg
-        return self._as_dict
-
-
-class Panel(object):
-    def __init__(self, alias, host, tags, signals=None, default_signals=True):
-        self.queue = Queue()
-        self.alias = alias
-        custom_signals = signals if signals else []
-        self.signals = DEFAULT_SIGNALS + custom_signals if default_signals else custom_signals
-        self.host = host
-        self.tags = tags.strip(';')
-        if len(self.signals) == 0:
-            logger.warning('No signals specified for {} panel'.format(self.alias))
-        self.as_dict = {self.host: {self.tags: self.signals}}
-        self.last_ts = 0
-        self.stop_trigger = Event()
-
-    def stop(self):
-        self.stop_trigger.set()
-
-
-class ImmutableDict(dict):
-    def __init__(self, _dict):
-        super(ImmutableDict, self).__init__(_dict)
-
-    def __setitem__(self, key, value):
-        raise ValueError('Immutable dict')
-
-    def set_copy(self, key=None, value=None):
-        copy = dict(self)
-        if key is None:
-            return copy
-        else:
-            copy[key] = value
-            return copy
-
-
-class YasmMPReceiver(object):
-    def __init__(self, yasm_cfg, yasmapi_timeout):
-        """
-
-        :type data_queue: Queue
-        :type yasm_cfg: YasmCfg
-        """
-        self.panels = yasm_cfg.panels
-        self.data_queue = Queue()
-        self.timeout = yasmapi_timeout
-        self._data_buffer = []
-        self._start_event = Event()
-        self._stop_event = Event()
-        self.ps_pool = {panel.alias: Process(target=self.single_receiver,
-                                             args=(panel,))
-                        for panel in self.panels}
-        self.consumers = {panel.alias: Thread(target=self.single_controller, args=(panel, self.ps_pool[panel.alias]))
-                          for panel in self.panels}
-
-    def get_buffered_data(self):
-        data, self._data_buffer = self._data_buffer, []
-        return data
-
-    def start_collecting(self):
-        [p.start() for p in self.ps_pool.values()]
-
-    def start_transmitting(self):
-        self._start_event.set()
-        [consumer.start() for consumer in self.consumers.values()]
-
-    def single_receiver(self, panel):
-        # ignore SIGINT (process is controlled by .stop_event)
-        """
-
-        :type panel: Panel
-        """
-        signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-        stream = signals_stream(panel)
-        try:
-            while not panel.stop_trigger.is_set():
-                ts, data = stream.next()
-                if self._start_event.is_set():
-                    panel.queue.put((ts, {panel.alias: data}))
-        finally:
-            logger.info('Closing panel {} receiver thread'.format(panel.alias))
-
-    def single_controller(self, panel, ps):
-        """
-
-        :type ps: Process
-        :type panel: Panel
-        """
-        while not panel.stop_trigger.is_set():
-            try:
-                ts, data = panel.queue.get(timeout=self.timeout)
-                panel.last_ts = ts
-                # logger.info('Received monitoring data for {}'.format(ts))
-                self._data_buffer.append(monitoring_data(ts, data))
-            except Empty:
-                logger.warning(
-                    'Not receiving any data from YASM. Probably your hosts/tags specification is not correct')
-                panel.stop_trigger.set()
-                if ps.is_alive():
-                    ps.terminate()
-                break
-            except KeyboardInterrupt:
-                logging.warning('Interrupting collecting metrics for panel {}'.format(panel.alias))
-                panel.stop_trigger.set()
-                if ps.is_alive():
-                    ps.terminate()
-                break
-
-    def stop_now(self):
-        end_time = time.time()
-        active_panels = self.panels
-        while len(active_panels) > 0:
-            try:
-                for panel in active_panels:
-                    if panel.last_ts < end_time and not self._stop_event.is_set():
-                        logger.info('Waiting for yasm metrics for panel {}'.format(panel.alias))
-                    else:
-                        panel.stop_trigger.set()
-                        self.ps_pool[panel.alias].join()
-                        self.consumers[panel.alias].join()
-                active_panels = [panel for panel in active_panels if not panel.stop_trigger.is_set()]
-                if len(active_panels) > 0:
-                    time.sleep(5)
-            except KeyboardInterrupt:
-                logger.info('Metrics receiving interrupted')
-                [panel.stop_trigger.set() for panel in active_panels]
-                [(self.ps_pool[panel.alias].join(), self.consumers[panel.alias].join()) for panel in active_panels]
-
-
-class Plugin(MonitoringPlugin):
-    def __init__(self, core, cfg, cfg_updater=None):
-        super(Plugin, self).__init__(core, cfg)
-        self.start_event = Event()
-        self.stop_event = Event()
-        self.last_ts = 0
-        if self.get_option('verbose_logging'):
-            logger.setLevel(logging.DEBUG)
-        self.yasm_receiver = YasmMPReceiver(YasmCfg(self.get_option('panels')),
-                                            self.get_option('timeout'))
-
-    def add_listener(self, plugin):
-        self.listeners.append(plugin)
-
-    def send_collected_data(self, data):
-        """sends pending data set to listeners"""
-        for listener in self.listeners:
-            listener.monitoring_data(data)
-
-    def is_test_finished(self):
-        data = self.yasm_receiver.get_buffered_data()
-        if len(data) > 0:
-            self.send_collected_data(data)
-        return -1
-
-    def prepare_test(self):
-        self.yasm_receiver.start_collecting()
-
-    def start_test(self):
-        self.yasm_receiver.start_transmitting()
-        logger.info('Listeners: {}'.format(self.listeners))
-
-    def end_test(self, retcode):
-        self.yasm_receiver.stop_now()
-        self.send_rest()
-        return retcode
-
-    def send_rest(self):
-        data = self.yasm_receiver.get_buffered_data()
-        if len(data) > 0:
-            self.send_collected_data(data)
diff --git a/yandextank/validator/validator.py b/yandextank/validator/validator.py
index f84c2e73b..370d96b2e 100644
--- a/yandextank/validator/validator.py
+++ b/yandextank/validator/validator.py
@@ -185,6 +185,9 @@ def get_option(self, section, option):
     def has_option(self, section, option):
         return self.validated
 
+    def get_configinitial(self):
+        return self.raw_config_dict
+
     @property
     def plugins(self):
         """