X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fcollectd.conf;h=3928dcbcabf0688fbc5438fc9011aff8fca67f9d;hb=740cd01e5fb0eb764eeea5b0e55466734a41b596;hp=abcf24ded3379671b72f838a524f8aad2097b61a;hpb=ddb76faa5841997bd3eec4ed2f3d33f56e66d0c3;p=yardstick.git

diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf
index abcf24ded..3928dcbca 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 5
+Interval {interval}
 
 ##############################################################################
 # LoadPlugin section                                                         #
@@ -23,10 +23,8 @@ Interval 5
 # Specify what features to activate.                                         #
 ##############################################################################
 
-LoadPlugin amqp
-LoadPlugin cpu
-LoadPlugin intel_rdt
-LoadPlugin memory
+#LoadPlugin syslog
+{loadplugin}
 
 ##############################################################################
 # Plugin configuration                                                       #
@@ -35,6 +33,10 @@ LoadPlugin memory
 # ription of those options is available in the collectd.conf(5) manual page. #
 ##############################################################################
 
+#<Plugin syslog>
+#        LogLevel debug
+#</Plugin>
+
 <Plugin amqp>
 	<Publish "name">
 		Host "0.0.0.0"
@@ -53,7 +55,7 @@ LoadPlugin memory
 <Plugin cpu>
 	ReportByCpu true
 	ReportByState true
-	ValuesPercentage false
+	ValuesPercentage true
 </Plugin>
 
 <Plugin memory>
@@ -61,18 +63,55 @@ LoadPlugin memory
 	ValuesPercentage false
 </Plugin>
 
-<LoadPlugin intel_rdt>
-  Interval 5
-</LoadPlugin>
 <Plugin "intel_rdt">
   Cores ""
 </Plugin>
 
-<Plugin memcached>
-	<Instance "local">
-		Host "127.0.0.1"
-		Port "11211"
-	</Instance>
+<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
+    ReportRootHP     true
+    ValuesPages      true
+    ValuesBytes      false
+    ValuesPercentage false
+</Plugin>
+
+<Plugin hugepages>
+    ReportPerNodeHP  true
+    ReportRootHP     true
+    ValuesPages      true
+    ValuesBytes      false
+    ValuesPercentage false
+</Plugin>
+
+<Plugin dpdkstat>
+  <EAL>
+    Coremask "0x1"
+    MemoryChannels "4"
+    ProcessType "secondary"
+    FilePrefix "rte"
+  </EAL>
+  SharedMemObj "dpdk_collectd_stats_0"
+  EnabledPortMask 0xffff
+  {dpdk_interface}
+</Plugin>
+
+<Plugin virt>
+    Domain "samplevnf"
+</Plugin>
+
+<Plugin ovs_stats>
+  Port "6640"
+  Address "127.0.0.1"
+  Socket "/usr/local/var/run/openvswitch/db.sock"
+  Bridges "br0" "br_ext"
 </Plugin>
 
 <Include "/etc/collectd/collectd.conf.d">