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

Merge pull request #1733 from hnyman/collectd-entropy

Browse source 
collectd: backport the entropy plugin and changes to example config file
This commit is contained in:
Steven Barth 2015-09-15 08:31:35 +02:00
commit 9f63667c06
2 changed files with 26 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
utils/collectd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.4.2 PKG_VERSION:=5.4.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/ PKG_SOURCE_URL:=http://collectd.org/files/
@ -33,7 +33,6 @@ COLLECTD_PLUGINS_DISABLED:= \
curl_json \ curl_json \
curl_xml \ curl_xml \
dbi \ dbi \
entropy \
ethstat \ ethstat \
genericjmx \ genericjmx \
gmond \ gmond \
@ -95,6 +94,7 @@ COLLECTD_PLUGINS_SELECTED:= \
disk \ disk \
dns \ dns \
email \ email \
entropy \
exec \ exec \
filecount \ filecount \
fscache \ fscache \
@ -286,6 +286,7 @@ $(eval $(call BuildPlugin,df,disk space input,df,))
$(eval $(call BuildPlugin,disk,disk usage/timing input,disk,)) $(eval $(call BuildPlugin,disk,disk usage/timing input,disk,))
$(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap)) $(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap))
$(eval $(call BuildPlugin,email,email output,email,)) $(eval $(call BuildPlugin,email,email output,email,))
$(eval $(call BuildPlugin,entropy,Entropy amount input,entropy,))
$(eval $(call BuildPlugin,exec,process exec input,exec,)) $(eval $(call BuildPlugin,exec,process exec input,exec,))
$(eval $(call BuildPlugin,filecount,file count input,filecount,)) $(eval $(call BuildPlugin,filecount,file count input,filecount,))
$(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,)) $(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,))

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>