From: Michael Tremer Date: Mon, 21 Sep 2009 17:50:19 +0000 (+0200) Subject: Removed collectd. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e951019ba4f652d3e6a3d578efd5a090c47b1d7b;p=ipfire-3.x.git Removed collectd. Will be replaced by something new, soon. --- diff --git a/config/collectd/base_cpu b/config/collectd/base_cpu deleted file mode 100644 index 30fcc38f9..000000000 --- a/config/collectd/base_cpu +++ /dev/null @@ -1 +0,0 @@ -LoadPlugin cpu diff --git a/config/collectd/base_interface b/config/collectd/base_interface deleted file mode 100644 index e6185d787..000000000 --- a/config/collectd/base_interface +++ /dev/null @@ -1,5 +0,0 @@ -LoadPlugin interface - - Interface "/p.*[0-9]$/" - IgnoreSelected true - diff --git a/config/collectd/base_memory b/config/collectd/base_memory deleted file mode 100644 index 249ff7f2e..000000000 --- a/config/collectd/base_memory +++ /dev/null @@ -1 +0,0 @@ -LoadPlugin memory diff --git a/config/collectd/ext_disk b/config/collectd/ext_disk deleted file mode 100644 index 75227c98c..000000000 --- a/config/collectd/ext_disk +++ /dev/null @@ -1,6 +0,0 @@ -Interval 300 -LoadPlugin disk - - Disk "/[0-9]$/" - IgnoreSelected true - diff --git a/config/collectd/ext_load b/config/collectd/ext_load deleted file mode 100644 index 5a65eda87..000000000 --- a/config/collectd/ext_load +++ /dev/null @@ -1 +0,0 @@ -LoadPlugin load diff --git a/config/collectd/ext_thermal b/config/collectd/ext_thermal deleted file mode 100644 index 6446b4628..000000000 --- a/config/collectd/ext_thermal +++ /dev/null @@ -1,6 +0,0 @@ -LoadPlugin thermal - - - Device "/cooling_device[0-9]$/" - IgnoreSelected true - diff --git a/lfs/collectd b/lfs/collectd deleted file mode 100644 index 9cbdb82ff..000000000 --- a/lfs/collectd +++ /dev/null @@ -1,162 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = collectd -PKG_VER = 4.7.2 -PKG_REL = 0 - -THISAPP = $(PKG_NAME)-$(PKG_VER) -DL_FILE = $(THISAPP).tar.bz2 -DIR_APP = $(DIR_SRC)/$(THISAPP) - -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -MAINTAINER = -GROUP = System/Statistics -CORE = yes -EXTRA = no -DEBUG = no -BUILD_DEPS = -DEPS = - -URL = http://www.collectd.org/ -LICENSE = GPLv2+ -SHORT_DESC = Statistics collection daemon for filling RRD files. - -define LONG_DESC - collectd is a small daemon written in C for performance. It reads various \ - system statistics and updates RRD files, creating them if necessary. \ - Since the daemon doesn't need to startup every time it wants to update the \ - files it's very fast and easy on the system. Also, the statistics are very \ - fine grained since the files are updated every 10 seconds. -endef - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -download: $(objects) - -info: - $(DO_PKG_INFO) - -install: $(OBJECT) - -packages: $(PACKAGES) - -$(PACKAGES): $(OBJECT) - @$(DO_PACKAGE) - -$(objects): - @$(LOAD) - -############################################################################### -# Installation Details -############################################################################### - -$(OBJECT): $(objects) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -e "s/-Werror//g" -i src/Makefile.in - cd $(DIR_APP) && KERNEL_DIR=/usr/include \ - ./configure \ - $(CONFIGURE_ARCH) \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --without-libiptc \ - --disable-apache \ - --enable-apcups \ - --disable-apple_sensors \ - --disable-ascent \ - --enable-battery \ - --enable-cpu \ - --enable-cpufreq \ - --disable-csv \ - --enable-df \ - --enable-disk \ - --enable-dns \ - --enable-email \ - --enable-entropy \ - --enable-exec \ - --enable-hddtemp \ - --enable-interface \ - --disable-iptables \ - --disable-ipmi \ - --disable-ipvs \ - --enable-irq \ - --disable-libvirt \ - --enable-load \ - --enable-logfile \ - --disable-mbmon \ - --disable-memcached \ - --enable-memory \ - --disable-multimeter \ - --disable-mysql \ - --disable-netlink \ - --enable-network \ - --enable-nfs \ - --disable-nginx \ - --enable-ntpd \ - --disable-nut \ - --disable-perl \ - --disable-ping \ - --disable-powerdns \ - --enable-processes \ - --enable-rrdtool \ - --enable-rrdcachd \ - --enable-sensors \ - --enable-serial \ - --enable-swap \ - --enable-syslog \ - --enable-tail \ - --disable-tape \ - --enable-tcpconns \ - --disable-teamspeak2 \ - --enable-unixsock \ - --enable-users \ - --enable-uuid \ - --disable-vmem \ - --disable-vserver \ - --enable-wireless \ - --disable-xmms - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) - cd $(DIR_APP) && make install - - rm -vf /usr/lib/libcollectdclient.la /usr/lib/collectd/*.la - - 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/make.sh b/make.sh index b977ace43..810db2d37 100755 --- a/make.sh +++ b/make.sh @@ -356,7 +356,6 @@ ipfire_build() { ipfire_make noip ipfire_make lighttpd ipfire_make webinterface - ipfire_make collectd ipfire_make logrotate #ipfire_make logwatch ipfire_make dvdrtools diff --git a/src/collectd/collectd.conf b/src/collectd/collectd.conf deleted file mode 100644 index d50310407..000000000 --- a/src/collectd/collectd.conf +++ /dev/null @@ -1,42 +0,0 @@ -# -# Config file for collectd(1). -# Please read collectd.conf(5) for a list of options. -# http://collectd.org/ -# - -Hostname "localhost" -BaseDir "/var/log/rrd/" -PIDFile "/var/run/collectd_base.pid" -PluginDir "/usr/lib/collectd" -TypesDB "/usr/share/collectd/types.db" -include "/etc/collectd.d/base*" -include "/etc/collectd.d/ext*" -Interval 60 -ReadThreads 3 - -LoadPlugin syslog -#LoadPlugin logfile -#LoadPlugin rrdcached -LoadPlugin rrdtool - - - LogLevel info - - -# -# LogLevel debug -# File STDOUT -# - -# -# DaemonAddress "unix:/var/run/rrdcached.sock" -# DataDir "/var/log/rrd" -# CreateFiles true -# - - - DataDir "/var/log/rrd" - CacheTimeout 300 - CacheFlush 900 - WritesPerSecond 50 - diff --git a/src/rootfiles/core/collectd b/src/rootfiles/core/collectd deleted file mode 100644 index 76c48907a..000000000 --- a/src/rootfiles/core/collectd +++ /dev/null @@ -1,89 +0,0 @@ -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 -#usr/include/collectd/lcc_features.h -usr/lib/collectd -usr/lib/collectd/apcups.so -usr/lib/collectd/battery.so -usr/lib/collectd/bind.so -usr/lib/collectd/conntrack.so -usr/lib/collectd/cpu.so -usr/lib/collectd/cpufreq.so -usr/lib/collectd/curl.so -usr/lib/collectd/df.so -usr/lib/collectd/disk.so -usr/lib/collectd/dns.so -usr/lib/collectd/email.so -usr/lib/collectd/entropy.so -usr/lib/collectd/exec.so -usr/lib/collectd/filecount.so -usr/lib/collectd/fscache.so -usr/lib/collectd/hddtemp.so -usr/lib/collectd/interface.so -usr/lib/collectd/irq.so -usr/lib/collectd/load.so -usr/lib/collectd/logfile.so -usr/lib/collectd/match_regex.so -usr/lib/collectd/match_timediff.so -usr/lib/collectd/match_value.so -usr/lib/collectd/memory.so -usr/lib/collectd/network.so -usr/lib/collectd/nfs.so -usr/lib/collectd/ntpd.so -usr/lib/collectd/openvpn.so -usr/lib/collectd/processes.so -usr/lib/collectd/protocols.so -usr/lib/collectd/rrdtool.so -usr/lib/collectd/sensors.so -usr/lib/collectd/serial.so -usr/lib/collectd/swap.so -usr/lib/collectd/syslog.so -usr/lib/collectd/table.so -usr/lib/collectd/tail.so -usr/lib/collectd/target_notification.so -usr/lib/collectd/target_replace.so -usr/lib/collectd/target_set.so -usr/lib/collectd/tcpconns.so -usr/lib/collectd/ted.so -usr/lib/collectd/thermal.so -usr/lib/collectd/unixsock.so -usr/lib/collectd/uptime.so -usr/lib/collectd/users.so -usr/lib/collectd/uuid.so -usr/lib/collectd/wireless.so -usr/lib/libcollectdclient.so -usr/lib/libcollectdclient.so.0 -usr/lib/libcollectdclient.so.0.0.0 -usr/lib/perl5/site_perl/5.10.0/Collectd -usr/lib/perl5/site_perl/5.10.0/Collectd.pm -usr/lib/perl5/site_perl/5.10.0/Collectd/Unixsock.pm -#usr/lib/perl5/site_perl/5.10.0/i686-linux/auto/Collectd -#usr/lib/perl5/site_perl/5.10.0/i686-linux/auto/Collectd/.packlist -#usr/lib/pkgconfig/libcollectdclient.pc -usr/sbin/collectd -usr/sbin/collectdmon -usr/share/collectd -#usr/share/collectd/postgresql_default.conf -usr/share/collectd/types.db -#usr/share/man/man1/collectd-nagios.1 -#usr/share/man/man1/collectd.1 -#usr/share/man/man1/collectdmon.1 -#usr/share/man/man3/Collectd::Unixsock.3 -#usr/share/man/man5/collectd-email.5 -#usr/share/man/man5/collectd-exec.5 -#usr/share/man/man5/collectd-java.5 -#usr/share/man/man5/collectd-perl.5 -#usr/share/man/man5/collectd-snmp.5 -#usr/share/man/man5/collectd-unixsock.5 -#usr/share/man/man5/collectd.conf.5 -#usr/share/man/man5/types.db.5 -var/lib/collectd