From 8312bd4367395fdba877f084d1f72590f10c44c7 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Mon, 7 Sep 2015 00:44:50 +0100 Subject: Sysmetrics implementation update New sysmetrics implementation is based on pidstat command line tool from sysstat package. Old non-functional implementation was removed. Reporting was refactored to generate report after each TC from values already available in memory. Following files were affected: modified: conf/01_testcases.conf modified: conf/02_vswitch.conf modified: conf/05_collector.conf deleted: core/collector_controller.py modified: core/component_factory.py modified: docs/NEWS.rst modified: packages.txt modified: requirements.txt modified: testcases/testcase.py modified: tools/collectors/collector/collector.py modified: tools/collectors/sysmetrics/__init__.py deleted: tools/collectors/sysmetrics/linuxmetrics.py new file: tools/collectors/sysmetrics/pidstat.py modified: tools/report/report.jinja modified: tools/report/report.py modified: tools/systeminfo.py modified: vsperf JIRA: VSPERF-67 Change-Id: I25a79f2afef405b9ac46ae85c18044af167a62a4 Signed-off-by: Martin Klozik (martinx.klozik@intel.com) Reviewed-by: Billy O Mahony Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Gurpreet Singh Reviewed-by: Tv Rao --- conf/05_collector.conf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'conf/05_collector.conf') diff --git a/conf/05_collector.conf b/conf/05_collector.conf index 4dcd8162..bda0ac8d 100644 --- a/conf/05_collector.conf +++ b/conf/05_collector.conf @@ -16,16 +16,18 @@ # Collector configuration # ############################ -# ############################ -# Sysmetrics configuration -# ############################ - -COLLECTOR = 'LinuxMetrics' +COLLECTOR = 'Pidstat' COLLECTOR_DIR = os.path.join(ROOT_DIR, 'tools/collectors') -# the number of seconds between samples when calculating CPU percentage -SYSMETRICS_LINUX_METRICS_CPU_SAMPLES_INTERVAL = 5 +# processes to be monitored by pidstat +PIDSTAT_MONITOR = ['ovs-vswitchd', 'ovsdb-server', 'qemu-system-x86_64'] + +# options which will be passed to pidstat +PIDSTAT_OPTIONS = '-dur' -# log file for sysmetrics -LOG_FILE_SYS_METRICS = 'system-metrics.log' +# sampling interval used by pidstat to collect statistics +PIDSTAT_SAMPLE_INTERVAL = 1 +# prefix of pidstat's log file; separate log file is created +# for each testcase in the directory with results +LOG_FILE_PIDSTAT = 'pidstat' -- cgit 1.2.3-korg