X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fcollectd.conf;h=b166fe7fd76a6322c6d3014093d6bc5ad9ced322;hb=f438448f35fa25c8cbf5016359e714892377f0f5;hp=abcf24ded3379671b72f838a524f8aad2097b61a;hpb=03d764791eeb708ade47b5e2196b18ce04552dd1;p=yardstick.git

diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf
index abcf24ded..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 5
+Interval {{ interval }}
 
 ##############################################################################
 # LoadPlugin section                                                         #
@@ -23,10 +23,17 @@ Interval 5
 # Specify what features to activate.                                         #
 ##############################################################################
 
-LoadPlugin amqp
-LoadPlugin cpu
-LoadPlugin intel_rdt
-LoadPlugin memory
+#LoadPlugin syslog
+{% 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                                                       #
@@ -35,46 +42,91 @@ 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"
-		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 false
+    ReportByCpu true
+    ReportByState true
+    ValuesPercentage true
 </Plugin>
 
 <Plugin memory>
-	ValuesAbsolute true
-	ValuesPercentage false
+    ValuesAbsolute true
+    ValuesPercentage false
 </Plugin>
 
-<LoadPlugin intel_rdt>
-  Interval 5
-</LoadPlugin>
+
+<Plugin hugepages>
+    ReportPerNodeHP  true
+    ReportRootHP     true
+    ValuesPages      true
+    ValuesBytes      false
+    ValuesPercentage false
+</Plugin>
+
+
+{% 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 %}
+
+{% if "dpdkstat" in plugins %}
+<Plugin "dpdkstat">
+  <EAL>
+    Coremask "0x1"
+    MemoryChannels "4"
+    ProcessType "secondary"
+    FilePrefix "rte"
+  </EAL>
+  SharedMemObj "dpdk_collectd_stats_0"
+  EnabledPortMask 0xffff
+{% for port_name in port_names %}
+  PortName {{ port_name }}
+{% endfor %}
+</Plugin>
+{% endif %}
+
+{% 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 memcached>
-	<Instance "local">
-		Host "127.0.0.1"
-		Port "11211"
-	</Instance>
+{% if "ovs_stats" in plugins %}
+<Plugin "ovs_stats">
+  Port "6640"
+  Address "127.0.0.1"
+  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>