From 145ea1eeab7fd629ddf7b6407556eef094ea11bd Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 29 Dec 2005 15:09:37 +0000 Subject: [PATCH] Added collectd, thanks to Florian Forster SVN-Revision: 2796 --- openwrt/package/Config.in | 1 + openwrt/package/Makefile | 1 + openwrt/package/collectd/Config.in | 43 ++++++++ openwrt/package/collectd/Makefile | 101 ++++++++++++++++++ openwrt/package/collectd/files/S80collectd | 17 +++ .../package/collectd/ipkg/collectd.control | 6 ++ 6 files changed, 169 insertions(+) create mode 100644 openwrt/package/collectd/Config.in create mode 100644 openwrt/package/collectd/Makefile create mode 100755 openwrt/package/collectd/files/S80collectd create mode 100644 openwrt/package/collectd/ipkg/collectd.control diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index f8f0f5a16f..53b10b6304 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -12,6 +12,7 @@ source "package/mtd/Config.in" source "package/nvram/Config.in" comment "Applications" +source "package/collectd/Config.in" source "package/deco/Config.in" source "package/gpsd/Config.in" source "package/haserl/Config.in" diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 4d01ef71dc..4f88b129d8 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -21,6 +21,7 @@ package-$(BR2_PACKAGE_BWM) += bwm package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount +package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_COMPILE_CURL) += curl package-$(BR2_PACKAGE_CUTTER) += cutter diff --git a/openwrt/package/collectd/Config.in b/openwrt/package/collectd/Config.in new file mode 100644 index 0000000000..5f9f85ea30 --- /dev/null +++ b/openwrt/package/collectd/Config.in @@ -0,0 +1,43 @@ +menu "collectd........................... Lightweight system statistics collection daemon" + +config BR2_PACKAGE_COLLECTD + prompt "collectd........................... Lightweight system statistics collection daemon" + tristate + default m if CONFIG_DEVEL + help + collectd is a small daemon which collects system information + every 10 seconds. The values are then sent to a multicast group + to be stored in RRD files by a server process. + + http://verplant.org/collectd/ + +config BR2_PACKAGE_COLLECTD_CPU + prompt "Enable cpu support" + bool + default y + depends BR2_PACKAGE_COLLECTD + +config BR2_PACKAGE_COLLECTD_LOAD + prompt "Enable load support" + bool + default y + depends BR2_PACKAGE_COLLECTD + +config BR2_PACKAGE_COLLECTD_MEMORY + prompt "Enable memory support" + bool + default y + depends BR2_PACKAGE_COLLECTD + +config BR2_PACKAGE_COLLECTD_PING + prompt "Enable ping support" + bool + default y + depends BR2_PACKAGE_COLLECTD + +config BR2_PACKAGE_COLLECTD_TRAFFIC + prompt "Enable traffic support" + bool + default y + depends BR2_PACKAGE_COLLECTD +endmenu diff --git a/openwrt/package/collectd/Makefile b/openwrt/package/collectd/Makefile new file mode 100644 index 0000000000..fd38dde8f8 --- /dev/null +++ b/openwrt/package/collectd/Makefile @@ -0,0 +1,101 @@ +# $Id: Makefile 2467 2005-11-13 00:31:21Z nbd $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=collectd +PKG_VERSION:=3.5.1 +PKG_RELEASE:=1 +PKG_MD5SUM:=46a4b81e46d3bb58faab1d603649d737 + +PKG_SOURCE_URL:=http://verplant.org/collectd/files +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,COLLECTD,collectd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +ifneq ($(BR2_PACKAGE_COLLECTD_CPU),y) +DISABLE_CPU:=--disable-cpu +endif +ifneq ($(BR2_PACKAGE_COLLECTD_LOAD),y) +DISABLE_LOAD:=--disable-load +endif +ifneq ($(BR2_PACKAGE_COLLECTD_MEMORY),y) +DISABLE_MEMORY:=--disable-memory +endif +ifneq ($(BR2_PACKAGE_COLLECTD_PING),y) +DISABLE_PING:=--disable-ping +endif +ifneq ($(BR2_PACKAGE_COLLECTD_TRAFFIC),y) +DISABLE_TRAFFIC:=--disable-traffic +endif + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(strip $(TARGET_CFLAGS))" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-static \ + --disable-debug \ + $(DISABLE_CPU) \ + $(DISABLE_LOAD) \ + $(DISABLE_MEMORY) \ + $(DISABLE_PING) \ + $(DISABLE_TRAFFIC) \ + --disable-cpufreq \ + --disable-disk \ + --disable-hddtemp \ + --disable-nfs \ + --disable-processes \ + --disable-sensors \ + --disable-serial \ + --disable-swap \ + --disable-tape \ + --disable-users \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_COLLECTD): + install -d -m0755 $(IDIR_COLLECTD)/etc/init.d + install -d -m0755 $(IDIR_COLLECTD)/usr/sbin + install -d -m0755 $(IDIR_COLLECTD)/usr/lib/collectd + install -d -m0755 $(IDIR_COLLECTD)/var/lib/collectd + install -d -m0755 $(IDIR_COLLECTD)/var/run + cp -fpR ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/ + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/ + $(RSTRIP) $(IDIR_COLLECTD) + $(IPKG_BUILD) $(IDIR_COLLECTD) $(PACKAGE_DIR) + diff --git a/openwrt/package/collectd/files/S80collectd b/openwrt/package/collectd/files/S80collectd new file mode 100755 index 0000000000..aa767fbc48 --- /dev/null +++ b/openwrt/package/collectd/files/S80collectd @@ -0,0 +1,17 @@ +#!/bin/sh + +BINARY="/usr/sbin/collectd" +PIDFILE="/var/run/collectd.pid" +DATADIR="/var/lib/collectd" + +[ -x "$BINARY" ] || exit 1; + +if [ -e "$PIDFILE" ] +then + kill $(cat "$PIDFILE") 2>/dev/null + sleep 1 +fi + +[ -d "$DATADIR" ] || mkdir -p "$DATADIR"; + +$BINARY diff --git a/openwrt/package/collectd/ipkg/collectd.control b/openwrt/package/collectd/ipkg/collectd.control new file mode 100644 index 0000000000..f8febfbb3d --- /dev/null +++ b/openwrt/package/collectd/ipkg/collectd.control @@ -0,0 +1,6 @@ +Package: collectd +Priority: optional +Section: console +Maintainer: Florian Forster +Source: http://verplant.org/collectd/ +Description: System statistics collection daemon