From: Christian Schmidt Date: Sat, 5 Sep 2009 17:12:10 +0000 (+0200) Subject: Done a large rework of collectd atm we only need 5MB Space for rrds X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b468ff44f7dd6c0a9dca64171bd454ec2fc34f3;p=ipfire-3.x.git Done a large rework of collectd atm we only need 5MB Space for rrds and very very few system ressources --- diff --git a/config/collectd/base_cpu b/config/collectd/base_cpu new file mode 100644 index 000000000..30fcc38f9 --- /dev/null +++ b/config/collectd/base_cpu @@ -0,0 +1 @@ +LoadPlugin cpu diff --git a/config/collectd/base_interface b/config/collectd/base_interface new file mode 100644 index 000000000..e6185d787 --- /dev/null +++ b/config/collectd/base_interface @@ -0,0 +1,5 @@ +LoadPlugin interface + + Interface "/p.*[0-9]$/" + IgnoreSelected true + diff --git a/config/collectd/base_memory b/config/collectd/base_memory new file mode 100644 index 000000000..249ff7f2e --- /dev/null +++ b/config/collectd/base_memory @@ -0,0 +1 @@ +LoadPlugin memory diff --git a/config/collectd/ext_disk b/config/collectd/ext_disk new file mode 100644 index 000000000..75227c98c --- /dev/null +++ b/config/collectd/ext_disk @@ -0,0 +1,6 @@ +Interval 300 +LoadPlugin disk + + Disk "/[0-9]$/" + IgnoreSelected true + diff --git a/config/collectd/ext_load b/config/collectd/ext_load new file mode 100644 index 000000000..5a65eda87 --- /dev/null +++ b/config/collectd/ext_load @@ -0,0 +1 @@ +LoadPlugin load diff --git a/config/collectd/ext_thermal b/config/collectd/ext_thermal new file mode 100644 index 000000000..6446b4628 --- /dev/null +++ b/config/collectd/ext_thermal @@ -0,0 +1,6 @@ +LoadPlugin thermal + + + Device "/cooling_device[0-9]$/" + IgnoreSelected true + diff --git a/lfs/collectd b/lfs/collectd index af8a56d71..9cbdb82ff 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -129,6 +129,7 @@ $(OBJECT): $(objects) --disable-powerdns \ --enable-processes \ --enable-rrdtool \ + --enable-rrdcachd \ --enable-sensors \ --enable-serial \ --enable-swap \ @@ -150,6 +151,12 @@ $(OBJECT): $(objects) rm -vf /usr/lib/libcollectdclient.la /usr/lib/collectd/*.la - cp -vf $(DIR_SOURCE)/$(PKG_NAME)/collectd.conf /etc/ + cp -vf $(DIR_SOURCE)/$(PKG_NAME)/$(PKG_NAME)*.conf /etc/ + -mkdir /etc/$(PKG_NAME).d/ + cp -vf $(DIR_CONFIG)/$(PKG_NAME)/* /etc/$(PKG_NAME).d/ + + install -v -m 755 $(DIR_SOURCE)/initscripts/extras/$(PKG_NAME)* \ + /etc/init/ + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/collectd/collectd.conf b/src/collectd/collectd.conf index 4a356f381..d50310407 100644 --- a/src/collectd/collectd.conf +++ b/src/collectd/collectd.conf @@ -6,204 +6,37 @@ Hostname "localhost" BaseDir "/var/log/rrd/" -PIDFile "/var/run/collectd.pid" +PIDFile "/var/run/collectd_base.pid" PluginDir "/usr/lib/collectd" TypesDB "/usr/share/collectd/types.db" -Interval 30 +include "/etc/collectd.d/base*" +include "/etc/collectd.d/ext*" +Interval 60 ReadThreads 3 -#LoadPlugin apache -#LoadPlugin battery -LoadPlugin cpu -#LoadPlugin cpufreq -#LoadPlugin df -LoadPlugin disk -#LoadPlugin dns -#LoadPlugin email -#LoadPlugin entropy -#LoadPlugin exec -LoadPlugin hddtemp -LoadPlugin interface -#LoadPlugin iptables -#LoadPlugin ipvs -#LoadPlugin irq -LoadPlugin load +LoadPlugin syslog #LoadPlugin logfile -#LoadPlugin mbmon -#LoadPlugin memcached -LoadPlugin memory -#LoadPlugin multimeter -#LoadPlugin mysql -#LoadPlugin netlink -#LoadPlugin network -#LoadPlugin nfs -#LoadPlugin nginx -#LoadPlugin ntpd -#LoadPlugin nut -#LoadPlugin perl -#LoadPlugin ping -LoadPlugin processes +#LoadPlugin rrdcached LoadPlugin rrdtool -LoadPlugin sensors -#LoadPlugin serial -LoadPlugin swap -LoadPlugin syslog -#LoadPlugin tape -LoadPlugin tcpconns -#LoadPlugin unixsock -#LoadPlugin users - -# -# URL "http://localhost/status?auto" -# User "www-user" -# Password "secret" -# CACert "/etc/ssl/ca.crt" -# - - -# -# Device "/dev/hda" -# Device "192.168.0.2:/mnt/nfs" -# MountPoint "/home" -# FSType "ext3" -# IgnoreSelected false -# - -# -# Interface "eth0" -# IgnoreSource "192.168.0.1" -# - -# -# SocketFile "/usr/var/run/collectd-email" -# SocketGroup "collectd" -# SocketPerms "0770" -# MaxConns 5 -# - -# -# Exec "user:group" "/path/to/exec" -# -# -# Host "127.0.0.1" -# Port "7634" -# - - - Interface "ppp0" - Interface "lo" - IgnoreSelected true + + LogLevel info -# -# Chain filter INPUT 1 -# Chain filter FORWARD 1 -# Chain filter OUTPUT 1 -# - -# -# Irq 7 -# Irq 8 -# Irq 9 -# IgnoreSelected true -# - # -# LogLevel info +# LogLevel debug # File STDOUT # -# -# Host "127.0.0.1" -# Port "411" -# - -# -# Host "127.0.0.1" -# Port "11211" +# +# DaemonAddress "unix:/var/run/rrdcached.sock" +# DataDir "/var/log/rrd" +# CreateFiles true # -# -# Host "database.serv.er" -# User "db_user" -# Password "secret" -# Database "db_name" -# - -# -# Interface "All" -# VerboseInterface "All" -# QDisc "eth0" "pfifo_fast-1:0" -# Class "ppp0" "htb-1:10" -# Filter "ppp0" "u32-1:0" -# - -# -# 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 -# - -# -# URL "http://localhost/status?auto" -# User "www-user" -# Password "secret" -# CACert "/etc/ssl/ca.crt" -# - -# -# Host "localhost" -# Port 123 -# - -# -# UPS "upsname@hostname:port" -# - -# -# IncludeDir "/my/include/path" -# BaseName "Collectd::Plugin" -# LoadPlugin foo -# - - - Host "ping.ipfire.org" - - - - Process "collectd" - - - - DataDir "/var/log/rrd/collectd" + + DataDir "/var/log/rrd" CacheTimeout 300 - CacheFlush 900 - - -# -# Sensor "it8712-isa-0290/temperature-temp1" -# Sensor "it8712-isa-0290/fanspeed-fan3" -# Sensor "it8712-isa-0290/voltage-in8" -# IgnoreSelected false -# - - - LogLevel info + CacheFlush 900 + WritesPerSecond 50 - -# -# ListeningPorts false -# LocalPort "6882" -# RemotePort "80" -# - -# -# SocketFile "/usr/var/run/collectd-unixsock" -# SocketGroup "collectd" -# SocketPerms "0660" -# diff --git a/src/initscripts/extras/collectd.conf b/src/initscripts/extras/collectd.conf new file mode 100644 index 000000000..c8c64c05d --- /dev/null +++ b/src/initscripts/extras/collectd.conf @@ -0,0 +1,7 @@ +description "Start system statistics daemon" +author "IPFire Team" + +start on stopped mountfs +stop on starting shutdown + +exec /usr/sbin/collectd -C /etc/collectd.conf diff --git a/src/rootfiles/core/collectd b/src/rootfiles/core/collectd index e833d9956..76c48907a 100644 --- a/src/rootfiles/core/collectd +++ b/src/rootfiles/core/collectd @@ -1,4 +1,12 @@ etc/collectd.conf +etc/collectd.d +etc/collectd.d/base_cpu +etc/collectd.d/base_interface +etc/collectd.d/base_memory +etc/collectd.d/ext_disk +etc/collectd.d/ext_load +etc/collectd.d/ext_thermal +etc/init/collectd.conf #usr/bin/collectd-nagios #usr/include/collectd #usr/include/collectd/client.h