diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-09-01 10:41:20 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-09-01 10:41:20 +0200 |
| commit | 12aa19a9bca6aece21acf7b665e0c80ab4aff8b4 (patch) | |
| tree | 82f2b466b8e34797faa6a85d2b4bd70a80dab4f4 /utils | |
| parent | fe3779e8d4abefde99dd413b9e23379e6a973c52 (diff) | |
| parent | 8e944a0826b445bd3aa4681d668ac29fa7f4dc43 (diff) | |
Merge pull request #1736 from hnyman/conf-collectd
collectd: Clarify config file example/placeholder
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/collectd/Makefile | 2 | ||||
| -rw-r--r-- | utils/collectd/files/collectd.conf | 99 |
2 files changed, 25 insertions, 76 deletions
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 74d305b46..03f300148 100644 --- 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 2ef78fe7f..3afbfad47 100644 --- 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> |