Merge branch 'master' of github.com:yandex/yandex-tank

yandex · Jan 25, 2016 · 63a0be6 · 63a0be6
2 parents 285bcc0 + 9a4f4e5
commit 63a0be6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -605,7 +605,7 @@ to stop eventually. Example:
 
     loop = 1000000
     startup_schedule = periodic(2, 10, 50)
-    user_schedule = unlimited
+    user_schedule = unlimited()
     shared_schedule = 0
 
 Start 2 users every 10 seconds. Every user will shoot without any limits (next request is sended

diff --git a/yandextank/plugins/Monitoring/collector.py b/yandextank/plugins/Monitoring/collector.py
@@ -409,7 +409,7 @@ def get_host_config(self, host, names, target_hint):
             'CPU': 'user,system,iowait',
             'Memory': 'free,cached,used',
             'Disk': 'read,write',
-            'Net': 'recv,send',
+            'Net': 'recv,send,rx,tx',
         }
 
         default_metric = ['CPU', 'Memory', 'Disk', 'Net']