This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via d7cd8ad9ff5d3f2e38e4a8721a77879a4db4c7a1 (commit) from 07275e889598d7a4be4f1ca4ae849ab289982f35 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d7cd8ad9ff5d3f2e38e4a8721a77879a4db4c7a1 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sun Apr 25 12:41:35 2010 +0200
Done a whole rework on the collectd config. Added changes to Core38.
Collectd now is able to drop not needed statistics and since we don t use them all, we can drop them and save a whole lot of space on disk and in system memory. Added an custom file to give the users changes a place to be stored.
-----------------------------------------------------------------------
Summary of changes: config/collectd/collectd.conf | 6 +++++- config/rootfiles/common/collectd | 2 ++ config/rootfiles/core/38/update.sh | 31 +++++++++++++++++++++++++++---- make.sh | 5 +++-- 4 files changed, 37 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index b0166e5..0c9aa12 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -10,7 +10,7 @@ PIDFile "/var/run/collectd.pid" PluginDir "/usr/lib/collectd" TypesDB "/usr/share/collectd/types.db" Interval 30 -ReadThreads 3 +ReadThreads 1
LoadPlugin cpu #LoadPlugin cpufreq @@ -27,6 +27,9 @@ LoadPlugin sensors LoadPlugin swap LoadPlugin syslog #LoadPlugin wireless +LoadPlugin match_regex + +include "/etc/collectd.precache"
<Plugin interface> Interface "lo" @@ -87,3 +90,4 @@ LoadPlugin syslog </Plugin>
#include "/etc/collectd.thermal" +include "/etc/collectd.custom" \ No newline at end of file diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 0fe7afc..fd20d06 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -1,4 +1,6 @@ etc/collectd.conf +etc/collectd.custom +etc/collectd.precache etc/collectd.thermal etc/rc.d/rc0.d/K50collectd etc/rc.d/rc3.d/S21collectd diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 769ba15..095d7ba 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -68,6 +68,7 @@ rm -rf /lib/modules/*-ipfire # # Stop Sevices # +/etc/init.d/collectd stop /etc/init.d/squid stop
# @@ -132,6 +133,31 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck # perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # +# Delete old lm-sensor modullist... +# +rm -rf /etc/sysconfig/lm_sensors +# +# Cleanup Collectd statistics... +# +PRECLEAN=`du -sh /var/log/rrd/collectd` +# +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm* +# +rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors* +rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets* +# +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time* +POSTCLEAN=`du -sh /var/log/rrd/collectd` +# +echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. +# +# # Todo: rebuild qosscript if enabled... # # @@ -141,10 +167,7 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Start Sevices # /etc/init.d/squid start -# -# Delete old lm-sensor modullist... -# -rm -rf /etc/sysconfig/lm_sensors +/etc/init.d/collectd start # # This core-update need a reboot /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" diff --git a/make.sh b/make.sh index f84a5bd..a36a4a8 100755 --- a/make.sh +++ b/make.sh @@ -32,6 +32,7 @@ SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop +BUILD_IMAGES=1 # Build USB, Flash and Xen Images KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag @@ -725,7 +726,7 @@ buildpackages() { ipfiremake cdrom ED=$IPFVER
# Check if there is a loop device for building in virtual environments - if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then + if [ $BUILD_IMAGES && -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then ipfiremake usb-stick ED=$IPFVER ipfiremake flash-images ED=$IPFVER fi @@ -735,7 +736,7 @@ buildpackages() { ipfirepackages
# Check if there is a loop device for building in virtual environments - if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then + if [ $BUILD_IMAGES && -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ ipfiremake xen-image ED=$IPFVER
hooks/post-receive -- IPFire 2.x development tree