collectd: set intel_pmu events path and OVS socket path

switch from hardcoded path to dynamic path
based on bin_path

also enable proxy for install_collectd

add barometer settings for virt and ovs_stats

Change-Id: Id138aef548332a3e3fcb3963b746e7c9f10c0948
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf
index e6a1f0d8c..b166fe7fd 100644
--- a/yardstick/network_services/nfvi/collectd.conf
+++ b/yardstick/network_services/nfvi/collectd.conf
@@ -24,10 +24,17 @@ Interval {{ interval }}
 ##############################################################################
 
 #LoadPlugin syslog
-{% for plugin in loadplugins %}
+{% for plugin in loadplugins if plugin != "ovs_stats" %}
 LoadPlugin {{ plugin }}
 {% endfor %}
 
+{% if "ovs_stats" in plugins %}
+<LoadPlugin ovs_stats>
+  Interval 1
+</LoadPlugin>
+{% endif %}
+
+
 ##############################################################################
 # Plugin configuration                                                       #
 #----------------------------------------------------------------------------#
@@ -82,12 +89,11 @@ LoadPlugin {{ plugin }}
 {% endif %}
 
 {% if "intel_pmu" in plugins %}
-<Plugin intel_pmu>
+<Plugin "intel_pmu">
    ReportHardwareCacheEvents true
    ReportKernelPMUEvents true
    ReportSoftwareEvents true
-   EventList "/opt/nsb_bin/pmu_event.json"
-   HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+   EventList "{{ plugins['intel_pmu']['pmu_event_path'] }}"
 </Plugin>
 {% endif %}
 
@@ -110,6 +116,8 @@ LoadPlugin {{ plugin }}
 {% if "virt" in plugins %}
 <Plugin "virt">
 # monitor all domains
+  RefreshInterval 60
+  ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 </Plugin>
 {% endif %}
 
@@ -117,7 +125,7 @@ LoadPlugin {{ plugin }}
 <Plugin "ovs_stats">
   Port "6640"
   Address "127.0.0.1"
-  Socket "/usr/local/var/run/openvswitch/db.sock"
+  Socket "{{ plugins['ovs_stats']['ovs_socket_path'] }}"
 # don't specify bridges, monitor all bridges
 </Plugin>
 {% endif %}