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=ddb76faa5841997bd3eec4ed2f3d33f56e66d0c3;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 %}
+
+ Interval 1
+
+{% endif %}
+
##############################################################################
# Plugin configuration #
@@ -35,46 +42,91 @@ LoadPlugin memory
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
+#
+# LogLevel debug
+#
+
-
- 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 false
+ ReportByCpu true
+ ReportByState true
+ ValuesPercentage true
- ValuesAbsolute true
- ValuesPercentage false
+ ValuesAbsolute true
+ ValuesPercentage false
-
- Interval 5
-
+
+
+ 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"
+ ProcessType "secondary"
+ FilePrefix "rte"
+
+ SharedMemObj "dpdk_collectd_stats_0"
+ EnabledPortMask 0xffff
+{% for port_name in port_names %}
+ PortName {{ port_name }}
+{% endfor %}
+
+{% endif %}
+
+{% 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 %}
-
-
- Host "127.0.0.1"
- Port "11211"
-
+{% if "ovs_stats" in plugins %}
+
+ Port "6640"
+ Address "127.0.0.1"
+ Socket "{{ plugins['ovs_stats']['ovs_socket_path'] }}"
+# don't specify bridges, monitor all bridges
+{% endif %}
-
- Filter "*.conf"
-