diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-11 16:36:49 -0700 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-10-09 22:34:53 +0000 |
| commit | 85dd66c276c3c35932b74f3478c1a9bf9b74a454 (patch) | |
| tree | dd2aba04a9ff8da06507bb9e2857f6e23d3a2c35 /yardstick | |
| parent | 1eb582a70e3d8a40d91c5c244ae3c8e63e0923ec (diff) | |
install pmu tools collectd plugin
Added review dependency, removed collectd commit-id
replicating bash script, added pmu roles to playbook
Create local mirror for event list generation, copy script
to image, and run event list generation at runtime if
intel_pmu is enabled.
Change-Id: Ie46a2b197f4d2037cf3eed194764ce9eb5670415
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/network_services/nfvi/collectd.conf | 2 | ||||
| -rw-r--r-- | yardstick/network_services/nfvi/resource.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf index 22bd5d49d..e6a1f0d8c 100644 --- a/yardstick/network_services/nfvi/collectd.conf +++ b/yardstick/network_services/nfvi/collectd.conf @@ -86,7 +86,7 @@ LoadPlugin {{ plugin }} ReportHardwareCacheEvents true ReportKernelPMUEvents true ReportSoftwareEvents true - EventList "/root/.cache/pmu-events/GenuineIntel-6-2D-core.json" + EventList "/opt/nsb_bin/pmu_event.json" HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD" </Plugin> {% endif %} diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py index e3d0e3bca..a32948ae8 100644 --- a/yardstick/network_services/nfvi/resource.py +++ b/yardstick/network_services/nfvi/resource.py @@ -253,6 +253,10 @@ class ResourceProfile(object): # connection.execute("sudo %s '%s' '%s'" % ( # collectd_installer, http_proxy, https_proxy)) return + if "intel_pmu" in self.plugins: + LOG.debug("Downloading event list for pmu_stats plugin") + cmd = 'sudo bash -c \'cd /opt/tempT/pmu-tools/; python event_download_local.py\'' + connection.execute(cmd) LOG.debug("Starting collectd to collect NFVi stats") # ensure collectd.conf.d exists to avoid error/warning connection.execute("sudo mkdir -p /etc/collectd/collectd.conf.d") |