X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fcollectd.conf;h=b166fe7fd76a6322c6d3014093d6bc5ad9ced322;hb=c47c33e6071a14485929bb58ee6e1d2aaeff7243;hp=3928dcbcabf0688fbc5438fc9011aff8fca67f9d;hpb=8d378924fb95ccb7375170dead8e356968b6dae5;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 %}
+<LoadPlugin ovs_stats>
+  Interval 1
+</LoadPlugin>
+{% endif %}
+
 
 ##############################################################################
 # Plugin configuration                                                       #
@@ -38,42 +47,31 @@ Interval {interval}
 #</Plugin>
 
 <Plugin amqp>
-	<Publish "name">
-		Host "0.0.0.0"
-		Port "5672"
-		VHost "/"
-		User "admin"
-		Password "admin"
-		Exchange "amq.fanout"
-		RoutingKey "collectd"
-		Persistent false
-		StoreRates false
-		ConnectionRetryDelay 0
-	</Publish>
+    <Publish "name">
+        Host "0.0.0.0"
+        Port "5672"
+        VHost "/"
+        User "admin"
+        Password "admin"
+        Exchange "amq.fanout"
+        RoutingKey "collectd"
+        Persistent false
+        StoreRates false
+        ConnectionRetryDelay 0
+    </Publish>
 </Plugin>
 
 <Plugin cpu>
-	ReportByCpu true
-	ReportByState true
-	ValuesPercentage true
+    ReportByCpu true
+    ReportByState true
+    ValuesPercentage true
 </Plugin>
 
 <Plugin memory>
-	ValuesAbsolute true
-	ValuesPercentage false
-</Plugin>
-
-<Plugin "intel_rdt">
-  Cores ""
+    ValuesAbsolute true
+    ValuesPercentage false
 </Plugin>
 
-<Plugin intel_pmu>
-     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"
-</Plugin>
 
 <Plugin hugepages>
     ReportPerNodeHP  true
@@ -83,15 +81,24 @@ Interval {interval}
     ValuesPercentage false
 </Plugin>
 
-<Plugin hugepages>
-    ReportPerNodeHP  true
-    ReportRootHP     true
-    ValuesPages      true
-    ValuesBytes      false
-    ValuesPercentage false
+
+{% if "intel_rdt" in plugins %}
+<Plugin "intel_rdt">
+  Cores ""
+</Plugin>
+{% endif %}
+
+{% if "intel_pmu" in plugins %}
+<Plugin "intel_pmu">
+   ReportHardwareCacheEvents true
+   ReportKernelPMUEvents true
+   ReportSoftwareEvents true
+   EventList "{{ plugins['intel_pmu']['pmu_event_path'] }}"
 </Plugin>
+{% endif %}
 
-<Plugin dpdkstat>
+{% if "dpdkstat" in plugins %}
+<Plugin "dpdkstat">
   <EAL>
     Coremask "0x1"
     MemoryChannels "4"
@@ -100,20 +107,26 @@ Interval {interval}
   </EAL>
   SharedMemObj "dpdk_collectd_stats_0"
   EnabledPortMask 0xffff
-  {dpdk_interface}
+{% for port_name in port_names %}
+  PortName {{ port_name }}
+{% endfor %}
 </Plugin>
+{% endif %}
 
-<Plugin virt>
-    Domain "samplevnf"
+{% 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 %}
 
-<Plugin ovs_stats>
+{% if "ovs_stats" in plugins %}
+<Plugin "ovs_stats">
   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
 </Plugin>
+{% endif %}
 
-<Include "/etc/collectd/collectd.conf.d">
-	Filter "*.conf"
-</Include>