collectd: Clarify config file example/placeholder

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>

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 74d305b464c082a347d1aa78067c2d4e444ed032..03f30014846c5e92dd74b05ed9dbacf93fe1d5d4 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
 PKG_VERSION:=5.5.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://collectd.org/files/

diff --git a/utils/collectd/files/collectd.conf b/utils/collectd/files/collectd.conf
index 2ef78fe7ff40a6994c7addc9b7f4e9031e54b75c..3afbfad47b59893d8a217c6afbce3fe8a37eab93 100644 (file)
--- a/utils/collectd/files/collectd.conf
+++ b/utils/collectd/files/collectd.conf
@@ -1,90 +1,39 @@
-#
-# OpenWrt Config file for collectd(1).
-# Please read collectd.conf(5) for a list of options.
-# http://collectd.org/
-#
+# Config file for collectd. More info: https://collectd.org/
+# Note: Luci statistics will generate a new config and overwrite this file.
 
 #Hostname   "localhost"
 #FQDNLookup  true
-BaseDir     "/var/lib/collectd"
-PIDFile     "/var/run/collectd.pid"
-#PluginDir  "/usr/lib/collectd"
-#TypesDB    "/usr/share/collectd/types.db"
+BaseDir "/var/run/collectd"
+Include "/etc/collectd/conf.d"
+PIDFile "/var/run/collectd.pid"
+PluginDir "/usr/lib/collectd"
+TypesDB "/usr/share/collectd/types.db"
 Interval    30
 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 load
-LoadPlugin memory
-LoadPlugin network
 #LoadPlugin ping
-#LoadPlugin processes
-#LoadPlugin rrdtool
-#LoadPlugin serial
-LoadPlugin wireless
-
-#<Plugin df>
-#      FSType tmpfs
-#      IgnoreSelected true
-#      ReportByDevice false
-#      ReportReserved false
-#      ReportInodes false
-#</Plugin>
-
-#<Plugin disk>
-#      Disk "/^[hs]d[a-f][0-9]?$/"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin interface>
-#      Interface "eth0"
-#      Interface "br-lan"
-#      IgnoreSelected false
-#</Plugin>
+LoadPlugin rrdtool
+
+<Plugin rrdtool>
+       DataDir "/tmp/rrd"
+       RRARows 100
+       RRASingle true
+       RRATimespan 3600
+       RRATimespan 86400
+       RRATimespan 604800
+       RRATimespan 2678400
+       RRATimespan 31622400
+</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 interface>
+       IgnoreSelected false
+       Interface "br-lan"
 </Plugin>
 
 #<Plugin ping>
 #      Host "host.foo.bar"
-#      Interval 1.0
-#      Timeout 0.9
-#      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
+#      Interval 30
+#      TTL 127
 #</Plugin>