Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

collectd: backport "Clarify config file example/placeholder" from #1736

Browse source 
The config file shipped with collectd dates from 2010 and
leads to error messages if luci-statistics & collectd are installed,
as it references several plugins not usually installed, or such ones
that have been renamed since then.

For most users, this file is just a placeholder during collectd installation,
as /usr/bin/stat-genconfig from /etc/init.d/luci_statistics will overwrite it.

Sanitize and shorten the placeholder config file:
* Reference actively only the default plugins installed by luci statistics.
* Match the placeholder config with the genuine config from luci statistics.

If somebody uses collectd separately from luci statistics, he will need to
edit these settings anyway.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2015-09-04 15:03:58 +03:00
parent 42f2974f3c
commit 9af392d629
1 changed files with 23 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
utils/collectd/files/collectd.conf
View file

@ -1,90 +1,39 @@
# # Config file for collectd. More info: https://collectd.org/
# OpenWrt Config file for collectd(1). # Note: Luci statistics will generate a new config and overwrite this file.
# Please read collectd.conf(5) for a list of options.
# http://collectd.org/
#
#Hostname "localhost" #Hostname "localhost"
#FQDNLookup true #FQDNLookup true
BaseDir "/var/lib/collectd" BaseDir "/var/run/collectd"
PIDFile "/var/run/collectd.pid" Include "/etc/collectd/conf.d"
#PluginDir "/usr/lib/collectd" PIDFile "/var/run/collectd.pid"
#TypesDB "/usr/share/collectd/types.db" PluginDir "/usr/lib/collectd"
TypesDB "/usr/share/collectd/types.db"
Interval 30 Interval 30
ReadThreads 2 ReadThreads 2
#LoadPlugin syslog
#LoadPlugin logfile
#<Plugin syslog>
# LogLevel info
#</Plugin>
#<Plugin logfile>
# LogLevel info
# File STDOUT
# Timestamp true
#</Plugin>
LoadPlugin cpu
LoadPlugin df
LoadPlugin disk
LoadPlugin interface LoadPlugin interface
LoadPlugin load LoadPlugin load
LoadPlugin memory
LoadPlugin network
#LoadPlugin ping #LoadPlugin ping
#LoadPlugin processes LoadPlugin rrdtool
#LoadPlugin rrdtool
#LoadPlugin serial
LoadPlugin wireless
#<Plugin df> <Plugin rrdtool>
# FSType tmpfs DataDir "/tmp/rrd"
# IgnoreSelected true RRARows 100
# ReportByDevice false RRASingle true
# ReportReserved false RRATimespan 3600
# ReportInodes false RRATimespan 86400
#</Plugin> RRATimespan 604800
RRATimespan 2678400
RRATimespan 31622400
</Plugin>
#<Plugin disk> <Plugin interface>
# Disk "/^[hs]d[a-f][0-9]?$/" IgnoreSelected false
# IgnoreSelected false Interface "br-lan"
#</Plugin>
#<Plugin interface>
# Interface "eth0"
# Interface "br-lan"
# IgnoreSelected false
#</Plugin>
<Plugin network>
# Server "ff18::efc0:4a42" "25826"
Server "239.192.74.66" "25826"
# Listen "ff18::efc0:4a42" "25826"
# Listen "239.192.74.66" "25826"
# TimeToLive "128"
# Forward false
# CacheFlush 1800
# ReportStats false
</Plugin> </Plugin>
#<Plugin ping> #<Plugin ping>
# Host "host.foo.bar" # Host "host.foo.bar"
# Interval 1.0 # Interval 30
# Timeout 0.9 # TTL 127
# TTL 255
# SourceAddress "1.2.3.4"
# Device "eth0"
# MaxMissed -1
#</Plugin>
#<Plugin processes>
# Process "name"
#</Plugin>
#<Plugin rrdtool>
# DataDir "/var/lib/collectd/rrd"
# CacheTimeout 120
# CacheFlush 900
#</Plugin> #</Plugin>