mirror of
https://github.com/novatiq/packages.git
synced 2026-07-05 11:39:31 +01:00
Hannu Nyman
d91cd622c0
Change the interface plugin to operate with collectd's default way for Linux instead of trying to use BSD functionality with patches. Openwrt's collectd Makefile has set "enable-getifaddrs" option since r7980 (in 2007, no explanations given for the reasons to add that config option), causing the addition of 110-net-device-stats.patch in 2010 to fix things, and then later (with 5.4.1 upgrade in 2014) 150-fix-interface-af-link to undo BSD-specific changes in collectd code meant for only BSD systems (as AF_LINK does not exist in Linux). Revert to collectd's intended way in Linux by removing the config option and deleting the two corresponding patches. The same data fieds should be provided, so there is no visbile change to users. References: =========== Collectd changes introducing/explaining the option and later breaking things: http://git.verplant.org/?p=collectd.git;a=commit;h=a05e34a0d4fdb2c15db8226689268a27f6f7163d http://git.verplant.org/?p=collectd.git;a=commit;h=14740db4b415655abc58307352e406442f9933a0 http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc Openwrt: intro at r7980: https://dev.openwrt.org/changeset/7980 fix1 due to kernel 2.6.36 at r23467: https://dev.openwrt.org/changeset/23467 fix2 due to collectd 5.4.1: https://github.com/openwrt/packages/pull/298 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
346 lines
9.9 KiB
Makefile
346 lines
9.9 KiB
Makefile
#
|
|
# Copyright (C) 2006-2015 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=collectd
|
|
PKG_VERSION:=5.5.0
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
|
PKG_SOURCE_URL:=http://collectd.org/files/
|
|
PKG_MD5SUM:=c39305ef5514b44238b0d31f77e29e6a
|
|
|
|
PKG_FIXUP:=autoreconf
|
|
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
|
|
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
|
|
|
|
PKG_INSTALL:=1
|
|
PKG_BUILD_PARALLEL:=1
|
|
PKG_USE_MIPS16:=0
|
|
|
|
COLLECTD_PLUGINS_DISABLED:= \
|
|
amqp \
|
|
apple_sensors \
|
|
aquaero \
|
|
barometer \
|
|
battery \
|
|
ceph \
|
|
cgroups \
|
|
cpufreq \
|
|
curl_json \
|
|
curl_xml \
|
|
dbi \
|
|
drbd \
|
|
entropy \
|
|
ethstat \
|
|
fhcount \
|
|
genericjmx \
|
|
gmond \
|
|
hddtemp \
|
|
ipc \
|
|
ipmi \
|
|
ipvs \
|
|
java \
|
|
log_logstash \
|
|
lvm \
|
|
lpar \
|
|
mbmon \
|
|
md \
|
|
memcachec \
|
|
memcached \
|
|
mic \
|
|
monitorus \
|
|
multimeter \
|
|
netapp \
|
|
nfs \
|
|
notify_desktop \
|
|
notify_email \
|
|
numa \
|
|
nut \
|
|
openldap \
|
|
openvz \
|
|
oracle \
|
|
perl \
|
|
pf \
|
|
pinba \
|
|
python \
|
|
redis \
|
|
routeros \
|
|
rrdcached \
|
|
serial \
|
|
sigrok \
|
|
smart \
|
|
statsd \
|
|
swap \
|
|
tape \
|
|
tokyotyrant \
|
|
turbostat \
|
|
uuid \
|
|
varnish \
|
|
virt \
|
|
vserver \
|
|
write_kafka \
|
|
write_log \
|
|
write_mongodb \
|
|
write_redis \
|
|
write_riemann \
|
|
write_sensu \
|
|
write_tsdb \
|
|
xmms \
|
|
zfs_arc \
|
|
zookeeper
|
|
|
|
COLLECTD_PLUGINS_SELECTED:= \
|
|
apache \
|
|
apcups \
|
|
ascent \
|
|
bind \
|
|
conntrack \
|
|
contextswitch \
|
|
cpu \
|
|
csv \
|
|
curl \
|
|
df \
|
|
disk \
|
|
dns \
|
|
email \
|
|
exec \
|
|
filecount \
|
|
fscache \
|
|
interface \
|
|
iptables \
|
|
irq \
|
|
iwinfo \
|
|
load \
|
|
logfile \
|
|
madwifi \
|
|
memory \
|
|
modbus \
|
|
mysql \
|
|
netlink \
|
|
network \
|
|
nginx \
|
|
ntpd \
|
|
olsrd \
|
|
onewire \
|
|
openvpn \
|
|
ping \
|
|
postgresql \
|
|
powerdns \
|
|
processes \
|
|
protocols \
|
|
rrdtool \
|
|
sensors \
|
|
snmp \
|
|
syslog \
|
|
table \
|
|
tail \
|
|
tcpconns \
|
|
teamspeak2 \
|
|
ted \
|
|
thermal \
|
|
unixsock \
|
|
uptime \
|
|
users \
|
|
vmem \
|
|
wireless \
|
|
write_graphite \
|
|
write_http \
|
|
|
|
PKG_CONFIG_DEPENDS:= \
|
|
$(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/kernel.mk
|
|
|
|
define Package/collectd/Default
|
|
SECTION:=utils
|
|
CATEGORY:=Utilities
|
|
TITLE:=Lightweight system statistics collection daemon
|
|
URL:=http://verplant.org/collectd/
|
|
endef
|
|
|
|
define Package/collectd
|
|
$(call Package/collectd/Default)
|
|
DEPENDS:= +libpthread +zlib +libltdl +libip4tc
|
|
MENU:=1
|
|
endef
|
|
|
|
define Package/collectd/description
|
|
collectd is a small daemon which collects system information periodically
|
|
and provides mechanismns to store the values in a variety of ways.
|
|
endef
|
|
|
|
ifneq ($(CONFIG_avr32),)
|
|
TARGET_CFLAGS += -fsigned-char
|
|
endif
|
|
|
|
# common configure args
|
|
CONFIGURE_ARGS+= \
|
|
--disable-debug \
|
|
--enable-daemon \
|
|
--with-nan-emulation \
|
|
--without-libgcrypt
|
|
|
|
CONFIGURE_VARS+= \
|
|
CFLAGS="$$$$CFLAGS $(FPIC)" \
|
|
LDFLAGS="$$$$LDFLAGS -lm -lz" \
|
|
KERNEL_DIR="$(LINUX_DIR)" \
|
|
|
|
CONFIGURE_PLUGIN= \
|
|
$(foreach m, $(1), \
|
|
$(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \
|
|
)
|
|
|
|
CONFIGURE_ARGS+= \
|
|
$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_SELECTED)) \
|
|
$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_DISABLED)) \
|
|
|
|
# exception: mod-ascent needs libxml2
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-ascent),)
|
|
CONFIGURE_VARS+= \
|
|
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2"
|
|
endif
|
|
|
|
ifneq ($(CONFIG_BIG_ENDIAN),)
|
|
CONFIGURE_ARGS+= --with-fp-layout=endianflip
|
|
else
|
|
CONFIGURE_ARGS+= --with-fp-layout=nothing
|
|
endif
|
|
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-postgresql),)
|
|
CONFIGURE_ARGS+= --with-libpq="$(STAGING_DIR)/usr/"
|
|
endif
|
|
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),)
|
|
CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/"
|
|
endif
|
|
|
|
# exception: mod-netlink needs libnetlink from iproute
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),)
|
|
CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr"
|
|
endif
|
|
|
|
# exception: mod-modbus needs libmodbus
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-modbus),)
|
|
CONFIGURE_ARGS+= --with-libmodbus="$(STAGING_DIR)/usr"
|
|
endif
|
|
|
|
# exception: mod-onewire needs libow-capi
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-onewire),)
|
|
CONFIGURE_ARGS+= --with-libowcapi="$(STAGING_DIR)/usr"
|
|
endif
|
|
|
|
# exception: mod-rrdtool needs rrdtool-1.0.x
|
|
ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool),)
|
|
CONFIGURE_ARGS+= --with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0"
|
|
endif
|
|
|
|
define Package/collectd/conffiles
|
|
/etc/collectd.conf
|
|
endef
|
|
|
|
define Package/collectd/install
|
|
$(INSTALL_DIR) $(1)/usr/sbin
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
|
|
$(INSTALL_DIR) $(1)/usr/share/collectd
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/collectd/types.db $(1)/usr/share/collectd/
|
|
$(INSTALL_DIR) $(1)/etc
|
|
$(INSTALL_CONF) ./files/collectd.conf $(1)/etc/
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./files/collectd.init $(1)/etc/init.d/collectd
|
|
endef
|
|
|
|
# 1: plugin name
|
|
# 2: plugin title/description
|
|
# 3: files
|
|
# 4: extra dependency
|
|
define BuildPlugin
|
|
|
|
PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_collectd-mod-$(1)
|
|
|
|
define Package/collectd-mod-$(1)
|
|
$$(call Package/collectd/Default)
|
|
TITLE:=$(2) plugin
|
|
DEPENDS:= collectd $(4)
|
|
endef
|
|
|
|
define Package/collectd-mod-$(1)/install
|
|
$(INSTALL_DIR) $$(1)/usr/lib/collectd
|
|
for m in $(3); do \
|
|
$(CP) \
|
|
$(PKG_INSTALL_DIR)/usr/lib/collectd/$$$$$$$${m}.so \
|
|
$$(1)/usr/lib/collectd/ ; \
|
|
done
|
|
endef
|
|
|
|
$$(eval $$(call BuildPackage,collectd-mod-$(1)))
|
|
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,collectd))
|
|
|
|
#$(eval $(call BuildPlugin,NAME,DESCRIPTION,FILES,DEPENDENCIES))
|
|
$(eval $(call BuildPlugin,apache,apache status input,apache,+PACKAGE_collectd-mod-apache:libcurl))
|
|
$(eval $(call BuildPlugin,apcups,apcups status input,apcups,))
|
|
$(eval $(call BuildPlugin,ascent,ascent status input,ascent,+PACKAGE_collectd-mod-ascent:libcurl +PACKAGE_collectd-mod-ascent:libxml2))
|
|
$(eval $(call BuildPlugin,bind,BIND server/zone input,bind,+PACKAGE_collectd-mod-bind:libcurl +PACKAGE_collectd-mod-bind:libxml2))
|
|
$(eval $(call BuildPlugin,conntrack,connection tracking table size input,conntrack,))
|
|
$(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,))
|
|
$(eval $(call BuildPlugin,cpu,CPU input,cpu,))
|
|
$(eval $(call BuildPlugin,csv,CSV output,csv,))
|
|
$(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl))
|
|
#$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
|
|
$(eval $(call BuildPlugin,df,disk space input,df,))
|
|
$(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,email,email output,email,))
|
|
$(eval $(call BuildPlugin,exec,process exec input,exec,))
|
|
$(eval $(call BuildPlugin,filecount,file count input,filecount,))
|
|
$(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,))
|
|
$(eval $(call BuildPlugin,interface,network interfaces input,interface,))
|
|
$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables +libiptc))
|
|
$(eval $(call BuildPlugin,irq,interrupt usage input,irq,))
|
|
$(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_collectd-mod-iwinfo:libiwinfo))
|
|
$(eval $(call BuildPlugin,load,system load input,load,))
|
|
$(eval $(call BuildPlugin,logfile,log files output,logfile,))
|
|
$(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
|
|
#$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
|
|
$(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
|
|
$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus))
|
|
$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN))
|
|
$(eval $(call BuildPlugin,network,network input/output,network))
|
|
$(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
|
|
$(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
|
|
#$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
|
|
$(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
|
|
$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN))
|
|
$(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))
|
|
$(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping))
|
|
$(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq))
|
|
$(eval $(call BuildPlugin,powerdns,PowerDNS server status input,powerdns,))
|
|
$(eval $(call BuildPlugin,processes,process status input,processes,))
|
|
$(eval $(call BuildPlugin,protocols,network protocols input,protocols,))
|
|
$(eval $(call BuildPlugin,rrdtool,RRDtool output,rrdtool,+PACKAGE_collectd-mod-rrdtool:librrd1))
|
|
$(eval $(call BuildPlugin,sensors,lm_sensors input,sensors,+PACKAGE_collectd-mod-sensors:libsensors))
|
|
$(eval $(call BuildPlugin,snmp,SNMP input,snmp,+PACKAGE_collectd-mod-snmp:libnetsnmp))
|
|
$(eval $(call BuildPlugin,syslog,syslog output,syslog,))
|
|
$(eval $(call BuildPlugin,tail,tail input,tail,))
|
|
$(eval $(call BuildPlugin,table,table-like structured file input,table,))
|
|
$(eval $(call BuildPlugin,teamspeak2,TeamSpeak2 input,teamspeak2,))
|
|
$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,@((!TARGET_avr32)||BROKEN))) # fails on avr32 because of warnings treated as errors
|
|
$(eval $(call BuildPlugin,tcpconns,TCP connection tracking input,tcpconns,))
|
|
$(eval $(call BuildPlugin,thermal,system temperatures input,thermal,))
|
|
$(eval $(call BuildPlugin,unixsock,unix socket output,unixsock,))
|
|
$(eval $(call BuildPlugin,uptime,uptime status input,uptime,))
|
|
$(eval $(call BuildPlugin,users,user logged in status input,users,))
|
|
$(eval $(call BuildPlugin,vmem,virtual memory usage input,vmem,))
|
|
$(eval $(call BuildPlugin,wireless,wireless status input,wireless,))
|
|
$(eval $(call BuildPlugin,write-graphite,Carbon/Graphite output,write_graphite,+PACKAGE_collectd-mod-write-graphite:libpthread))
|
|
$(eval $(call BuildPlugin,write-http,HTTP POST output,write_http,+PACKAGE_collectd-mod-write-http:libcurl))
|