X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fcollectd.conf;h=b166fe7fd76a6322c6d3014093d6bc5ad9ced322;hb=f438448f35fa25c8cbf5016359e714892377f0f5;hp=e6a1f0d8cc720869f224be1a6227d4d35dbf1884;hpb=5721849f3f08c2c1c89354341115c834e510b3d6;p=yardstick.git
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 %}
+
+ Interval 1
+
+{% endif %}
+
+
##############################################################################
# Plugin configuration #
#----------------------------------------------------------------------------#
@@ -82,12 +89,11 @@ LoadPlugin {{ plugin }}
{% endif %}
{% if "intel_pmu" in plugins %}
-
+
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'] }}"
{% endif %}
@@ -110,6 +116,8 @@ LoadPlugin {{ plugin }}
{% if "virt" in plugins %}
# monitor all domains
+ RefreshInterval 60
+ ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
{% endif %}
@@ -117,7 +125,7 @@ LoadPlugin {{ plugin }}
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
{% endif %}