From cf1113f83d2502056f28f2daa9e8bae796f11576 Mon Sep 17 00:00:00 2001 From: Thomas D Date: Mon, 21 Mar 2016 01:10:49 +0100 Subject: app-admin/collectd: Dropped old Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1101 --- app-admin/collectd/Manifest | 2 - app-admin/collectd/collectd-5.4.1-r2.ebuild | 386 -------------------- app-admin/collectd/collectd-5.5.0.ebuild | 398 --------------------- app-admin/collectd/collectd-5.5.1.ebuild | 2 +- .../collectd/files/collectd-5.4.1-libocci.patch | 21 -- .../collectd/files/collectd-5.4.1-libperl.patch | 29 -- app-admin/collectd/files/collectd-5.4.1-lt.patch | 32 -- .../collectd/files/collectd-5.4.1-nohal.patch | 24 -- app-admin/collectd/files/collectd-5.5.0-lt.patch | 35 -- app-admin/collectd/files/collectd.confd | 22 -- app-admin/collectd/files/collectd.initd | 62 ---- app-admin/collectd/files/collectd.logrotate | 9 + app-admin/collectd/files/logrotate | 9 - app-admin/collectd/metadata.xml | 1 - 14 files changed, 10 insertions(+), 1022 deletions(-) delete mode 100644 app-admin/collectd/collectd-5.4.1-r2.ebuild delete mode 100644 app-admin/collectd/collectd-5.5.0.ebuild delete mode 100644 app-admin/collectd/files/collectd-5.4.1-libocci.patch delete mode 100644 app-admin/collectd/files/collectd-5.4.1-libperl.patch delete mode 100644 app-admin/collectd/files/collectd-5.4.1-lt.patch delete mode 100644 app-admin/collectd/files/collectd-5.4.1-nohal.patch delete mode 100644 app-admin/collectd/files/collectd-5.5.0-lt.patch delete mode 100644 app-admin/collectd/files/collectd.confd delete mode 100644 app-admin/collectd/files/collectd.initd create mode 100644 app-admin/collectd/files/collectd.logrotate delete mode 100644 app-admin/collectd/files/logrotate (limited to 'app-admin/collectd') diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index c44ebafc7c6f..fd5ba080d98e 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -1,3 +1 @@ -DIST collectd-5.4.1.tar.bz2 1521907 SHA256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492 WHIRLPOOL 2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16 -DIST collectd-5.5.0.tar.bz2 1824495 SHA256 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 SHA512 d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017 WHIRLPOOL 6223ca363984ab3777ca89e2cd5011f059b6ca7f5c66c5e7325d3155ce38ef2829caced3ad27e4d5016c5fdba59bb21b9b47d840ea0c4d164c3674b6ee5062ac DIST collectd-5.5.1.tar.bz2 1797852 SHA256 f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512 1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae WHIRLPOOL 3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41 diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild deleted file mode 100644 index feea5d7479aa..000000000000 --- a/app-admin/collectd/collectd-5.4.1-r2.ebuild +++ /dev/null @@ -1,386 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -GENTOO_DEPEND_ON_PERL="no" -JAVA_PKG_OPT_USE="collectd_plugins_java" -# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user - -DESCRIPTION="Collects system statistics and provides mechanisms to store the values" - -HOMEPAGE="http://collectd.org" -SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs" - -# The plugin lists have to follow here since they extend IUSE - -# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo) -COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms" - -# Plugins that still need some work -COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis - tape write_redis zfs_arc" - -# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS -COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups - conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns - email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi - iptables irq java libvirt load logfile lvm madwifi match_empty_counter - match_hashed match_regex match_timediff match_value mbmon md memcachec memcached - memory multimeter mysql netlink network network nfs nginx notify_desktop - notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql - powerdns processes protocols python python routeros rrdcached rrdcached rrdtool - sensors serial snmp statsd swap syslog table tail target_notification - target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold - tokyotyrant unixsock uptime users uuid varnish vmem wireless - write_graphite write_http write_mongodb" - -COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}" - -COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS} - -for plugin in ${COLLECTD_ALL_PLUGINS}; do - IUSE="${IUSE} collectd_plugins_${plugin}" -done -unset plugin - -# Now come the dependencies. - -COMMON_DEPEND=" - dev-libs/libgcrypt:0 - sys-devel/libtool - perl? ( dev-lang/perl:=[ithreads] ) - collectd_plugins_apache? ( net-misc/curl ) - collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) - collectd_plugins_bind? ( dev-libs/libxml2 ) - collectd_plugins_curl? ( net-misc/curl ) - collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) - collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) - collectd_plugins_dbi? ( dev-db/libdbi ) - collectd_plugins_dns? ( net-libs/libpcap ) - collectd_plugins_gmond? ( sys-cluster/ganglia ) - collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) - collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13 ) - collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) - collectd_plugins_lvm? ( sys-fs/lvm2 ) - collectd_plugins_memcachec? ( dev-libs/libmemcached ) - collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) - collectd_plugins_netlink? ( net-libs/libmnl ) - collectd_plugins_nginx? ( net-misc/curl ) - collectd_plugins_notify_desktop? ( x11-libs/libnotify ) - collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl:= ) - collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) - collectd_plugins_onewire? ( sys-fs/owfs ) - collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) - collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) - collectd_plugins_ping? ( net-libs/liboping ) - collectd_plugins_postgresql? ( dev-db/postgresql:= ) - collectd_plugins_python? ( ${PYTHON_DEPS} ) - collectd_plugins_routeros? ( net-libs/librouteros ) - collectd_plugins_rrdcached? ( net-analyzer/rrdtool ) - collectd_plugins_rrdtool? ( net-analyzer/rrdtool ) - collectd_plugins_sensors? ( sys-apps/lm_sensors ) - collectd_plugins_snmp? ( net-analyzer/net-snmp ) - collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) - collectd_plugins_varnish? ( www-servers/varnish ) - collectd_plugins_write_http? ( net-misc/curl ) - collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver ) - - kernel_FreeBSD? ( - collectd_plugins_disk? ( sys-libs/libstatgrab ) - collectd_plugins_interface? ( sys-libs/libstatgrab ) - collectd_plugins_load? ( sys-libs/libstatgrab ) - collectd_plugins_memory? ( sys-libs/libstatgrab ) - collectd_plugins_swap? ( sys-libs/libstatgrab ) - collectd_plugins_users? ( sys-libs/libstatgrab ) - )" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - collectd_plugins_java? ( >=virtual/jdk-1.6 ) -" - -RDEPEND="${COMMON_DEPEND} - collectd_plugins_java? ( >=virtual/jre-1.6 ) - collectd_plugins_syslog? ( virtual/logger ) - selinux? ( sec-policy/selinux-collectd )" - -REQUIRED_USE=" - collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.1"-{nohal,libocci,libperl,lt}.patch - "${FILESDIR}/${PN}-4.10.3"-werror.patch -) - -# @FUNCTION: collectd_plugin_kernel_linux -# @DESCRIPTION: -# USAGE: -# kernel_options is a list of kernel configurations options; the check tests whether at least -# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message -# is emitted. -collectd_plugin_kernel_linux() { - local multi_opt opt - if has ${1} ${COLLECTD_ALL_PLUGINS}; then - if use collectd_plugins_${1}; then - for opt in ${2}; do - if linux_chkconfig_present ${opt}; then return 0; fi - done - multi_opt=${2//\ /\ or\ } - case ${3} in - (info) - elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (warn) - ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (error) - eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (*) - die "function collectd_plugin_kernel_linux called with invalid third argument" - ;; - esac - fi - fi -} - -collectd_linux_kernel_checks() { - linux-info_pkg_setup - - # battery.c:/proc/pmu/battery_%i - # battery.c:/proc/acpi/battery - collectd_plugin_kernel_linux battery ACPI_BATTERY warn - - # cgroups.c:/sys/fs/cgroup/ - collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS warn - - # cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/ - collectd_plugin_kernel_linux cpufreq SYSFS warn - collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn - - # nfs.c:/proc/net/rpc/nfs - # nfs.c:/proc/net/rpc/nfsd - collectd_plugin_kernel_linux nfs NFS_COMMON warn - - # serial.c:/proc/tty/driver/serial - # serial.c:/proc/tty/driver/ttyS - collectd_plugin_kernel_linux serial SERIAL_CORE warn - - # swap.c:/proc/meminfo - collectd_plugin_kernel_linux swap SWAP warn - - # thermal.c:/proc/acpi/thermal_zone - # thermal.c:/sys/class/thermal - collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn - collectd_plugin_kernel_linux thermal ACPI_THERMAL warn - - # vmem.c:/proc/vmstat - collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn - - # uuid.c:/sys/hypervisor/uuid - collectd_plugin_kernel_linux uuid SYSFS info - - # wireless.c:/proc/net/wireless - collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn -} - -pkg_setup() { - if use kernel_linux; then - if linux_config_exists; then - einfo "Checking your linux kernel configuration:" - collectd_linux_kernel_checks - else - elog "Cannot find a linux kernel configuration. Continuing anyway." - fi - fi - - java-pkg-opt-2_pkg_setup - use collectd_plugins_python && python-single-r1_pkg_setup - - enewgroup collectd - enewuser collectd -1 -1 /var/lib/collectd collectd -} - -src_prepare() { - base_src_prepare - - # There's some strange prefix handling in the default config file, resulting in - # paths like "/usr/var/..." - sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die - - sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die - - # fix installdirs for perl, bug 444360 - sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die - - if use collectd_plugins_java; then - # Set javac -source and -target flags according to (R)DEPEND. - sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die - fi - - rm -r libltdl || die - - eautoreconf -} - -src_configure() { - # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here - # should work independent of the operating system. - - local linux_plugins="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load - memory md netlink nfs numa processes serial swap tcpconns thermal users vmem - wireless" - - local libstatgrab_plugins="cpu disk interface load memory swap users" - local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}" - - local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns" - - local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}" - local myos_plugins="" - if use kernel_linux; then - einfo "Enabling Linux plugins." - myos_plugins=${linux_plugins} - elif use kernel_FreeBSD; then - einfo "Enabling FreeBSD plugins." - myos_plugins=${bsd_plugins} - elif use kernel_Darwin; then - einfo "Enabling Darwin plugins." - myos_plugins=${darwin_plugins} - fi - - # Do we debug? - local myconf="$(use_enable debug)" - - local plugin - - # Disable what needs to be disabled. - for plugin in ${COLLECTD_DISABLED_PLUGINS}; do - myconf+=" --disable-${plugin}" - done - - # Set enable/disable for each single plugin. - for plugin in ${COLLECTD_ALL_PLUGINS}; do - if has ${plugin} ${osdependent_plugins}; then - # plugin is os-dependent ... - if has ${plugin} ${myos_plugins}; then - # ... and available in this os - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - else - # ... and NOT available in this os - if use collectd_plugins_${plugin}; then - ewarn "You try to enable the ${plugin} plugin, but it is not available for this" - ewarn "kernel. Disabling it automatically." - fi - myconf+=" --disable-${plugin}" - fi - elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then - if use collectd_plugins_perl && ! use perl; then - ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag" - myconf+= --disable-perl - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - done - - # JAVA_HOME is set by eclasses. - if use collectd_plugins_java; then - myconf+=" --with-java" - fi - - # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens. - if ! use collectd_plugins_iptables; then - myconf+=" --with-libiptc=no" - fi - - if use perl; then - myconf+=" --with-perl-bindings=INSTALLDIRS=vendor" - else - myconf+=" --without-perl-bindings" - fi - - # No need for v5upgrade - myconf+=" --disable-target_v5upgrade" - - # Finally, run econf. - KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - perl_delete_localpod - - find "${D}/usr/" -name "*.la" -exec rm -f {} + - - use collectd_plugins_java && java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar - # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd - # we cannot do this yet - - fowners root:collectd /etc/collectd.conf - fperms u=rw,g=r,o= /etc/collectd.conf - - dodoc AUTHORS ChangeLog NEWS README TODO - - if use contrib ; then - insinto /usr/share/doc/${PF} - doins -r contrib - fi - - keepdir /var/lib/${PN} - fowners collectd:collectd /var/lib/${PN} - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - systemd_dounit "contrib/${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" collectd - - sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die -} - -collectd_rdeps() { - if (use collectd_plugins_${1} && ! has_version "${2}"); then - elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work." - fi -} - -pkg_postinst() { - collectd_rdeps apcups sys-power/apcupsd - collectd_rdeps hddtemp app-admin/hddtemp - collectd_rdeps mbmon sys-apps/xmbmon - collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2" - collectd_rdeps ntpd net-misc/ntp - collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9" - collectd_rdeps write_mongodb "dev-db/mongodb" - - echo - elog "collectd is now started as unprivileged user by default." - elog "You may want to revisit the configuration." - elog - - if use collectd_plugins_email; then - ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin." - fi - if use contrib; then - elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," - elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." - fi -} diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild deleted file mode 100644 index a06c442ca531..000000000000 --- a/app-admin/collectd/collectd-5.5.0.ebuild +++ /dev/null @@ -1,398 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -GENTOO_DEPEND_ON_PERL="no" -JAVA_PKG_OPT_USE="collectd_plugins_java" -# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils fcaps java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user - -DESCRIPTION="Collects system statistics and provides mechanisms to store the values" - -HOMEPAGE="http://collectd.org" -SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs" - -# The plugin lists have to follow here since they extend IUSE - -# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo) -COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok write_kafka xmms" - -# Plugins that still need some work -COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus tape" - -# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS -COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind ceph - cgroups conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df - disk dns drbd email entropy ethstat exec fhcount filecount fscache gmond - hddtemp interface ipc ipmi iptables irq java load log_logstash logfile lvm - madwifi match_empty_counter match_hashed match_regex match_timediff match_value - mbmon md memcachec memcached memory multimeter mysql netlink network nfs nginx - notify_desktop notify_email ntpd numa nut olsrd onewire openldap openvpn oracle - perl ping postgresql powerdns processes protocols python redis routeros - rrdcached rrdtool sensors serial smart snmp statsd swap syslog table tail - target_notification target_replace target_scale target_set tcpconns teamspeak2 - ted thermal threshold tokyotyrant turbostat unixsock uptime users uuid varnish - virt vmem wireless write_graphite write_http write_log write_mongodb - write_redis write_sensu write_tsdb zfs_arc zookeeper" - -COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}" - -COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS} - -for plugin in ${COLLECTD_ALL_PLUGINS}; do - IUSE="${IUSE} collectd_plugins_${plugin}" -done -unset plugin - -# Now come the dependencies. - -COMMON_DEPEND=" - dev-libs/libgcrypt:0 - sys-devel/libtool - perl? ( dev-lang/perl:=[ithreads] ) - collectd_plugins_apache? ( net-misc/curl ) - collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) - collectd_plugins_bind? ( dev-libs/libxml2:= ) - collectd_plugins_ceph? ( dev-libs/yajl:= ) - collectd_plugins_curl? ( net-misc/curl ) - collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl:= ) - collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2:= ) - collectd_plugins_dbi? ( dev-db/libdbi:= ) - collectd_plugins_dns? ( net-libs/libpcap:= ) - collectd_plugins_gmond? ( sys-cluster/ganglia ) - collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) - collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13 ) - collectd_plugins_log_logstash? ( dev-libs/yajl:= ) - collectd_plugins_lvm? ( sys-fs/lvm2 ) - collectd_plugins_memcachec? ( dev-libs/libmemcached:= ) - collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) - collectd_plugins_netlink? ( net-libs/libmnl:= ) - collectd_plugins_nginx? ( net-misc/curl ) - collectd_plugins_notify_desktop? ( x11-libs/libnotify:= ) - collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl:0= ) - collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) - collectd_plugins_onewire? ( sys-fs/owfs ) - collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) - collectd_plugins_openldap? ( net-nds/openldap ) - collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) - collectd_plugins_ping? ( net-libs/liboping:= ) - collectd_plugins_postgresql? ( dev-db/postgresql:= ) - collectd_plugins_python? ( ${PYTHON_DEPS} ) - collectd_plugins_redis? ( dev-libs/hiredis:= ) - collectd_plugins_routeros? ( net-libs/librouteros:= ) - collectd_plugins_rrdcached? ( net-analyzer/rrdtool ) - collectd_plugins_rrdtool? ( net-analyzer/rrdtool ) - collectd_plugins_sensors? ( sys-apps/lm_sensors ) - collectd_plugins_smart? ( dev-libs/libatasmart:= ) - collectd_plugins_snmp? ( net-analyzer/net-snmp ) - collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) - collectd_plugins_varnish? ( www-servers/varnish ) - collectd_plugins_virt? ( app-emulation/libvirt dev-libs/libxml2 ) - collectd_plugins_write_http? ( net-misc/curl ) - collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver:= ) - collectd_plugins_write_redis? ( dev-libs/hiredis:= ) - - kernel_FreeBSD? ( - collectd_plugins_disk? ( sys-libs/libstatgrab:= ) - collectd_plugins_interface? ( sys-libs/libstatgrab:= ) - collectd_plugins_load? ( sys-libs/libstatgrab:= ) - collectd_plugins_memory? ( sys-libs/libstatgrab:= ) - collectd_plugins_swap? ( sys-libs/libstatgrab:= ) - collectd_plugins_users? ( sys-libs/libstatgrab:= ) - )" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - collectd_plugins_java? ( >=virtual/jdk-1.6 ) -" - -RDEPEND="${COMMON_DEPEND} - collectd_plugins_java? ( >=virtual/jre-1.6 ) - collectd_plugins_syslog? ( virtual/logger ) - selinux? ( sec-policy/selinux-collectd )" - -REQUIRED_USE=" - collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.1-libocci.patch" - "${FILESDIR}/${PN}-5.5.0-lt.patch" - "${FILESDIR}/${PN}-4.10.3-werror.patch" -) - -# @FUNCTION: collectd_plugin_kernel_linux -# @DESCRIPTION: -# USAGE: -# kernel_options is a list of kernel configurations options; the check tests whether at least -# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message -# is emitted. -collectd_plugin_kernel_linux() { - local multi_opt opt - if has ${1} ${COLLECTD_ALL_PLUGINS}; then - if use collectd_plugins_${1}; then - for opt in ${2}; do - if linux_chkconfig_present ${opt}; then return 0; fi - done - multi_opt=${2//\ /\ or\ } - case ${3} in - (info) - elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (warn) - ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (error) - eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (*) - die "function collectd_plugin_kernel_linux called with invalid third argument" - ;; - esac - fi - fi -} - -collectd_linux_kernel_checks() { - linux-info_pkg_setup - - # battery.c:/proc/pmu/battery_%i - # battery.c:/proc/acpi/battery - collectd_plugin_kernel_linux battery ACPI_BATTERY warn - - # cgroups.c:/sys/fs/cgroup/ - collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS warn - - # cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/ - collectd_plugin_kernel_linux cpufreq SYSFS warn - collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn - - # nfs.c:/proc/net/rpc/nfs - # nfs.c:/proc/net/rpc/nfsd - collectd_plugin_kernel_linux nfs NFS_COMMON warn - - # serial.c:/proc/tty/driver/serial - # serial.c:/proc/tty/driver/ttyS - collectd_plugin_kernel_linux serial SERIAL_CORE warn - - # swap.c:/proc/meminfo - collectd_plugin_kernel_linux swap SWAP warn - - # thermal.c:/proc/acpi/thermal_zone - # thermal.c:/sys/class/thermal - collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn - collectd_plugin_kernel_linux thermal ACPI_THERMAL warn - - # vmem.c:/proc/vmstat - collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn - - # uuid.c:/sys/hypervisor/uuid - collectd_plugin_kernel_linux uuid SYSFS info - - # wireless.c:/proc/net/wireless - collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn -} - -pkg_setup() { - if use kernel_linux; then - if linux_config_exists; then - einfo "Checking your linux kernel configuration:" - collectd_linux_kernel_checks - else - elog "Cannot find a linux kernel configuration. Continuing anyway." - fi - fi - - java-pkg-opt-2_pkg_setup - use collectd_plugins_python && python-single-r1_pkg_setup - - enewgroup collectd - enewuser collectd -1 -1 /var/lib/collectd collectd -} - -src_prepare() { - epatch ${PATCHES[@]} - epatch_user - - # There's some strange prefix handling in the default config file, resulting in - # paths like "/usr/var/..." - sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die - - sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die - - # fix installdirs for perl, bug 444360 - sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die - - if use collectd_plugins_java; then - # Set javac -source and -target flags according to (R)DEPEND. - sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die - fi - - rm -r libltdl || die - - eautoreconf -} - -src_configure() { - # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here - # should work independent of the operating system. - - local linux_plugins="barometer battery cpu cpufreq disk drbd entropy - ethstat interface iptables ipvs irq ipc load memory md netlink nfs - numa processes serial swap tcpconns thermal turbostat users vmem - wireless zfs_arc" - - local libstatgrab_plugins="cpu disk interface load memory swap users" - local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc" - - local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns" - - local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}" - local myos_plugins="" - if use kernel_linux; then - einfo "Enabling Linux plugins." - myos_plugins=${linux_plugins} - elif use kernel_FreeBSD; then - einfo "Enabling FreeBSD plugins." - myos_plugins=${bsd_plugins} - elif use kernel_Darwin; then - einfo "Enabling Darwin plugins." - myos_plugins=${darwin_plugins} - fi - - # Do we debug? - local myconf="$(use_enable debug)" - - local plugin - - # Disable what needs to be disabled. - for plugin in ${COLLECTD_DISABLED_PLUGINS}; do - myconf+=" --disable-${plugin}" - done - - # Set enable/disable for each single plugin. - for plugin in ${COLLECTD_ALL_PLUGINS}; do - if has ${plugin} ${osdependent_plugins}; then - # plugin is os-dependent ... - if has ${plugin} ${myos_plugins}; then - # ... and available in this os - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - else - # ... and NOT available in this os - if use collectd_plugins_${plugin}; then - ewarn "You try to enable the ${plugin} plugin, but it is not available for this" - ewarn "kernel. Disabling it automatically." - fi - myconf+=" --disable-${plugin}" - fi - elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then - if use collectd_plugins_perl && ! use perl; then - ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag" - myconf+= --disable-perl - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - done - - # JAVA_HOME is set by eclasses. - if use collectd_plugins_java; then - myconf+=" --with-java" - fi - - # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens. - # lots of libs are only needed for plugins, if they are disabled, also disable the lib - use collectd_plugins_iptables || myconf+=" --with-libiptc=no" - use collectd_plugins_openldap || myconf+=" --with-libldap=no" - use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no" - use collectd_plugins_smart || myconf+=" --with-libatasmart=no" - use collectd_plugins_virt || myconf+=" --with-libvirt=no" - - if use perl; then - myconf+=" --with-perl-bindings=INSTALLDIRS=vendor" - else - myconf+=" --without-perl-bindings" - fi - - # No need for v5upgrade - myconf+=" --disable-target_v5upgrade" - - # Finally, run econf. - KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - perl_delete_localpod - - find "${D}/usr/" -name "*.la" -exec rm -f {} + || die - - use collectd_plugins_java && java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar - - fowners root:collectd /etc/collectd.conf - fperms u=rw,g=r,o= /etc/collectd.conf - - dodoc AUTHORS ChangeLog NEWS README TODO - - if use contrib ; then - insinto /usr/share/doc/${PF} - doins -r contrib - fi - - keepdir /var/lib/${PN} - fowners collectd:collectd /var/lib/${PN} - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - systemd_dounit "contrib/${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" collectd - - sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die -} - -collectd_rdeps() { - if (use collectd_plugins_${1} && ! has_version "${2}"); then - elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work." - fi -} - -pkg_postinst() { - use collectd_plugins_ping && fcaps cap_net_raw usr/sbin/collectd - - collectd_rdeps apcups sys-power/apcupsd - collectd_rdeps hddtemp app-admin/hddtemp - collectd_rdeps mbmon sys-apps/xmbmon - collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2" - collectd_rdeps ntpd net-misc/ntp - collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9" - collectd_rdeps write_mongodb "dev-db/mongodb" - - echo - elog "collectd is now started as unprivileged user by default." - elog "You may want to revisit the configuration." - elog - - if use collectd_plugins_email; then - ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin." - fi - if use contrib; then - elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," - elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." - fi -} diff --git a/app-admin/collectd/collectd-5.5.1.ebuild b/app-admin/collectd/collectd-5.5.1.ebuild index 5d65a4a59d3f..2f0983f3112c 100644 --- a/app-admin/collectd/collectd-5.5.1.ebuild +++ b/app-admin/collectd/collectd-5.5.1.ebuild @@ -418,7 +418,7 @@ src_install() { systemd_dounit "contrib/${PN}.service" insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" collectd + newins "${FILESDIR}/${PN}.logrotate" ${PN} sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die diff --git a/app-admin/collectd/files/collectd-5.4.1-libocci.patch b/app-admin/collectd/files/collectd-5.4.1-libocci.patch deleted file mode 100644 index 14b7d6992bb6..000000000000 --- a/app-admin/collectd/files/collectd-5.4.1-libocci.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git configure.ac configure.ac -index 7029e1e..72f6ff4 100644 ---- configure.ac -+++ configure.ac -@@ -2941,14 +2941,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t - ]) - if test "x$ORACLE_HOME" != "x" - then -- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public" -+ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci" - - if test -e "$ORACLE_HOME/lib/ldflags" - then - with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"` - fi - #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh" -- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh" -+ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci" - fi - if test "x$with_oracle" = "xyes" - then \ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.4.1-libperl.patch b/app-admin/collectd/files/collectd-5.4.1-libperl.patch deleted file mode 100644 index 4f60802240ac..000000000000 --- a/app-admin/collectd/files/collectd-5.4.1-libperl.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git configure.ac configure.ac -index ce8a9bc..eaa464e 100644 ---- configure.ac -+++ configure.ac -@@ -3109,11 +3109,13 @@ if test "x$with_libperl" = "xyes" \ - then - SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" -+ SAVE_LIBS="$LIBS" - dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) - PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` - PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` - CFLAGS="$CFLAGS $PERL_CFLAGS" - LDFLAGS="$LDFLAGS $PERL_LDFLAGS" -+ LIBS="$LIBS -lperl -lpthread" - - AC_CACHE_CHECK([for libperl], - [c_cv_have_libperl], -@@ -3132,7 +3134,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string - ]]] - )], - [c_cv_have_libperl="yes"], -- [c_cv_have_libperl="no"] -+ [ -+ c_cv_have_libperl="no" -+ LIBS="$SAVE_LIBS" -+ ] - ) - ) diff --git a/app-admin/collectd/files/collectd-5.4.1-lt.patch b/app-admin/collectd/files/collectd-5.4.1-lt.patch deleted file mode 100644 index bac1809f1c30..000000000000 --- a/app-admin/collectd/files/collectd-5.4.1-lt.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git Makefile.am Makefile.am -index 5267123..a7e0d0c 100644 ---- Makefile.am -+++ Makefile.am -@@ -1,6 +1,4 @@ --ACLOCAL_AMFLAGS = -I libltdl/m4 -- --SUBDIRS = libltdl src bindings . -+SUBDIRS = src bindings . - - INCLUDES = $(LTDLINCL) - -diff --git configure.ac configure.ac -index eaa464e..d652d46 100644 ---- configure.ac -+++ configure.ac -@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config]) - m4_ifdef([LT_PACKAGE_VERSION], - # libtool >= 2.2 - [ -- LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen]) - LTDL_INIT([convenience]) - AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) -@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION], - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) - AC_LIBTOOL_DLOPEN -- AC_CONFIG_SUBDIRS(libltdl) - AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) - ] - ) \ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.4.1-nohal.patch b/app-admin/collectd/files/collectd-5.4.1-nohal.patch deleted file mode 100644 index 9978296e8df6..000000000000 --- a/app-admin/collectd/files/collectd-5.4.1-nohal.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git configure.ac configure.ac -index 7029e1e..ad5e336 100644 ---- configure.ac -+++ configure.ac -@@ -1351,18 +1351,7 @@ AC_CHECK_LIB(resolv, res_search, - AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") - - dnl Check for HAL (hardware abstraction library) --with_libhal="yes" --AC_CHECK_LIB(hal,libhal_device_property_exists, -- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])], -- [with_libhal="no"]) --if test "x$with_libhal" = "xyes"; then -- if test "x$PKG_CONFIG" != "x"; then -- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`" -- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`" -- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) -- AC_SUBST(BUILD_WITH_LIBHAL_LIBS) -- fi --fi -+with_libhal="no" - - m4_divert_once([HELP_WITH], [ - collectd additional packages:]) \ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch deleted file mode 100644 index b14736bf2667..000000000000 --- a/app-admin/collectd/files/collectd-5.5.0-lt.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git Makefile.am Makefile.am -index 5267123..a7e0d0c 100644 ---- Makefile.am -+++ Makefile.am -@@ -1,6 +1,4 @@ --ACLOCAL_AMFLAGS = -I libltdl/m4 -- --SUBDIRS = libltdl src bindings . -+SUBDIRS = src bindings . - - INCLUDES = $(LTDLINCL) - ---- configure.ac.old 2016-01-04 13:55:39.286846436 +0400 -+++ configure.ac 2016-01-04 13:56:07.905362298 +0400 -@@ -2,12 +2,10 @@ - AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) - AC_CONFIG_SRCDIR(src/) - AC_CONFIG_HEADERS(src/config.h) --AC_CONFIG_AUX_DIR([libltdl/config]) - - m4_ifdef([LT_PACKAGE_VERSION], - # libtool >= 2.2 - [ -- LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen]) - LTDL_INIT([convenience]) - AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) -@@ -19,7 +17,6 @@ - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) - AC_LIBTOOL_DLOPEN -- AC_CONFIG_SUBDIRS(libltdl) - AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) - ] - ) diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd deleted file mode 100644 index 979b7255b0fc..000000000000 --- a/app-admin/collectd/files/collectd.confd +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Nice value used to launch collectd, to change priority of the process. As -# you usually will want to run it in background, a default of 5 is used. -# -#COLLECTD_NICELVL='5' - -# Location of configuration file. Modify if you don't like the standard one. -# -#COLLECTD_CFGFILE='/etc/collectd.conf' - -# File used to store the PID file. Usually you won't need to touch it. -# -#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid' - -# User to run collectd as (default is collectd, change to root or give -# collectd user appropriate privileges if you use one of the plugins that -# require it, as e.g. ping or iptables plugins) -# -#COLLECTD_USER='collectd' diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd deleted file mode 100644 index 10d29524d10a..000000000000 --- a/app-admin/collectd/files/collectd.initd +++ /dev/null @@ -1,62 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'} -: ${COLLECTD_CFGFILE:='/etc/collectd.conf'} -: ${COLLECTD_NICELVL:='5'} -: ${COLLECTD_USER:='collectd'} - -extra_commands="configtest" - -depend() { - use net -} - -configtest() { - ebegin "Checking ${SVCNAME} configuration" - checkconfig - eend $? -} - -checkconfig() { - if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; then - if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then - . /etc/env.d/50oracle-instantclient-basic - export ORACLE_HOME - export TNS_ADMIN - else - ewarn "Unable to set Oracle environment, Oracle plugin wont work" - fi - fi - - /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1 - ret=$? - if [ $ret -ne 0 ]; then - eerror "${SVCNAME} has detected an error in your setup:" - /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" - fi - - return $ret -} - -start() { - checkconfig || return 1 - [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd - - ebegin "Starting collectd" - start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \ - --env LC_NUMERIC=C \ - --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \ - -P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}" - eend $? "Failed to start collectd" -} - -stop() { - ebegin "Stopping collectd" - start-stop-daemon --stop \ - --env LC_NUMERIC=C \ - --pidfile "${COLLECTD_PIDFILE}" - eend $? "Failed to stop collectd" -} diff --git a/app-admin/collectd/files/collectd.logrotate b/app-admin/collectd/files/collectd.logrotate new file mode 100644 index 000000000000..5d344f6208f1 --- /dev/null +++ b/app-admin/collectd/files/collectd.logrotate @@ -0,0 +1,9 @@ +# +# /etc/logrotate.d/collectd +# +/var/log/collectd.log { + daily + rotate 5 + notifempty + missingok +} diff --git a/app-admin/collectd/files/logrotate b/app-admin/collectd/files/logrotate deleted file mode 100644 index 5d344f6208f1..000000000000 --- a/app-admin/collectd/files/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/logrotate.d/collectd -# -/var/log/collectd.log { - daily - rotate 5 - notifempty - missingok -} diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml index 2576b59235fd..cbf3a3e55494 100644 --- a/app-admin/collectd/metadata.xml +++ b/app-admin/collectd/metadata.xml @@ -67,7 +67,6 @@ Build the IPVS input plugin (collects statistics from Linux IP Virtual Server) Build the irq input plugin (collects the number of times each interrupt has been handled by the operating system) Build the java input plugin (embeds a JVM into collectd for writing plugins) - Build the (lib)virt input plugin (collects statistics about virtualized guests on a system) Build the load input plugin (collects the system load) Build the logfile output plugin (receives log messages from collectd and writes them to a text file) Build the Logstash output plugin (writes collectd logs and events as Logstash JSON formatted events) -- cgit v1.2.3-65-gdbad