diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-09-05 15:38:52 -0700 |
---|---|---|
committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-09-30 01:23:07 -0700 |
commit | 89b0554ab04d41ad0768aea15c2cdf2bd67f1862 (patch) | |
tree | d2a305c506c301a71d7d37017fcf764c2e73137e /yardstick/network_services/nfvi/collectd.conf | |
parent | 4bce5a017eecb80914ca4395cd380d9ff0e361ab (diff) |
collectd: write config file from Jinja2 template
We have the collectd.conf inside the python package
so instead of copying it from various places,
write the template directly to the remote system.
collectd: read collect.conf template with pkgresources
read the collectd.conf file as a string directly
and upload without creating temp file
use Jinja2 template, disable failing plugins
use proper Jinja2 template, disable the plugins that
were failing to load and blocking startup
add support for per-testcase collectd.conf config
using YAML
add support for custom interval, default is 25 seconds
Change-Id: Id904f7b7c9f41a9dd7adf5dfa06c064d65c25d2d
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick/network_services/nfvi/collectd.conf')
-rw-r--r-- | yardstick/network_services/nfvi/collectd.conf | 95 |
1 files changed, 50 insertions, 45 deletions
diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf index 3928dcbca..22bd5d49d 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,9 @@ Interval {interval} ############################################################################## #LoadPlugin syslog -{loadplugin} +{% for plugin in loadplugins %} +LoadPlugin {{ plugin }} +{% endfor %} ############################################################################## # Plugin configuration # @@ -38,42 +40,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 +74,25 @@ 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 "/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> +{% endif %} -<Plugin dpdkstat> +{% if "dpdkstat" in plugins %} +<Plugin "dpdkstat"> <EAL> Coremask "0x1" MemoryChannels "4" @@ -100,20 +101,24 @@ 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 </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" +# don't specify bridges, monitor all bridges </Plugin> +{% endif %} -<Include "/etc/collectd/collectd.conf.d"> - Filter "*.conf" -</Include> |