X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fcollectd.conf;h=b166fe7fd76a6322c6d3014093d6bc5ad9ced322;hb=f438448f35fa25c8cbf5016359e714892377f0f5;hp=3928dcbcabf0688fbc5438fc9011aff8fca67f9d;hpb=0a24ca320c46c10a50d38b8eab6336eb0e32f8c9;p=yardstick.git
diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf
index 3928dcbca..b166fe7fd 100644
--- a/yardstick/network_services/nfvi/collectd.conf
+++ b/yardstick/network_services/nfvi/collectd.conf
@@ -15,7 +15,7 @@
Hostname "nsb_stats"
FQDNLookup true
-Interval {interval}
+Interval {{ interval }}
##############################################################################
# LoadPlugin section #
@@ -24,7 +24,16 @@ Interval {interval}
##############################################################################
#LoadPlugin syslog
-{loadplugin}
+{% for plugin in loadplugins if plugin != "ovs_stats" %}
+LoadPlugin {{ plugin }}
+{% endfor %}
+
+{% if "ovs_stats" in plugins %}
+
+ Interval 1
+
+{% endif %}
+
##############################################################################
# Plugin configuration #
@@ -38,42 +47,31 @@ Interval {interval}
#
-
- Host "0.0.0.0"
- Port "5672"
- VHost "/"
- User "admin"
- Password "admin"
- Exchange "amq.fanout"
- RoutingKey "collectd"
- Persistent false
- StoreRates false
- ConnectionRetryDelay 0
-
+
+ Host "0.0.0.0"
+ Port "5672"
+ VHost "/"
+ User "admin"
+ Password "admin"
+ Exchange "amq.fanout"
+ RoutingKey "collectd"
+ Persistent false
+ StoreRates false
+ ConnectionRetryDelay 0
+
- ReportByCpu true
- ReportByState true
- ValuesPercentage true
+ ReportByCpu true
+ ReportByState true
+ ValuesPercentage true
- ValuesAbsolute true
- ValuesPercentage false
-
-
-
- Cores ""
+ ValuesAbsolute true
+ ValuesPercentage false
-
- ReportHardwareCacheEvents true
- ReportKernelPMUEvents true
- ReportSoftwareEvents true
- EventList "/root/.cache/pmu-events/GenuineIntel-6-2D-core.json"
- HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
-
ReportPerNodeHP true
@@ -83,15 +81,24 @@ Interval {interval}
ValuesPercentage false
-
- ReportPerNodeHP true
- ReportRootHP true
- ValuesPages true
- ValuesBytes false
- ValuesPercentage false
+
+{% if "intel_rdt" in plugins %}
+
+ Cores ""
+
+{% endif %}
+
+{% if "intel_pmu" in plugins %}
+
+ ReportHardwareCacheEvents true
+ ReportKernelPMUEvents true
+ ReportSoftwareEvents true
+ EventList "{{ plugins['intel_pmu']['pmu_event_path'] }}"
+{% endif %}
-
+{% if "dpdkstat" in plugins %}
+
Coremask "0x1"
MemoryChannels "4"
@@ -100,20 +107,26 @@ Interval {interval}
SharedMemObj "dpdk_collectd_stats_0"
EnabledPortMask 0xffff
- {dpdk_interface}
+{% for port_name in port_names %}
+ PortName {{ port_name }}
+{% endfor %}
+{% endif %}
-
- Domain "samplevnf"
+{% 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 %}
-
+{% if "ovs_stats" in plugins %}
+
Port "6640"
Address "127.0.0.1"
- Socket "/usr/local/var/run/openvswitch/db.sock"
- Bridges "br0" "br_ext"
+ Socket "{{ plugins['ovs_stats']['ovs_socket_path'] }}"
+# don't specify bridges, monitor all bridges
+{% endif %}
-
- Filter "*.conf"
-