diff options
author | fhajny <fhajny@pkgsrc.org> | 2017-11-21 15:18:22 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2017-11-21 15:18:22 +0000 |
commit | 24d9a3d9332883c87b659d1be320d1178bf24cfe (patch) | |
tree | d5c359628d89edb311e17421419e7b248707df99 /sysutils | |
parent | a9372862228e2836afc2c2a628131e20bacff091 (diff) | |
download | pkgsrc-24d9a3d9332883c87b659d1be320d1178bf24cfe.tar.gz |
Update sysutils/*collectd* to 5.8.0.
Temporarily disable the processes plugin for NetBSD, until the patch
is rewritten to build again.
Upstream changes since 5.7.2:
- collectd: The core daemon is now completely licensed under the MIT
license.
- collectd: Added daemon option to avoid making BaseDir.
- collectd: Global variables have been moved to their own module to
make porting collectd easier.
- collectd as well as Apache, memcached, OpenLDAP, Perl, RouterOS,
SNMP, Tail-CSV plugins: Free userdata for
"plugin_register_complex_read()".
- Collectd client library: Added parsing and server code.
- Build system: Dependency on libltdl has been removed, support for
libtool 1 has been dropped.
- Build system: The build system has been switched to non-recursive
make.
- APC UPS plugin: The plugin's configuration is now optional. Without
a "<Plugin />" block reasonable defaults will be used.
- Chrony plugin: Several issues found when working with a stratum-1
server have been fixed.
- Ceph plugin: Support for the Ceph version "Luminous" has been added.
- CPU plugin : Linux-specific "guest" states have been added.
- cURL plugin, cURL-JSON, cURL-XML, DBI, FileCount, memcachec, Oracle,
PostgreSQL, Table, Tail, Tail CSV plugins: The ability to configure
the "plugin" field of generated metrics has been added.
- cURL-JSON plugin: Parsing of arrays has been fixed.
- DPDKEvents plugin: This new plugin reports link status and keep
alive events.
- DPDKStat plugin: The plugin has been refactored to make DPDK related
utility functions reusable.
- DPDKStat plugin: The "LogLevel" and "RteDriverLibPath" config
options have been added.
- Email plugin as well as Exec and Unixsock plugins: Use
"_SC_GETPW_R_SIZE_MAX".
- FileCount plugin: Custom values for reported plugin, type and type
instance.
- GenericJMX plugin: Support for "AtomicInteger" and "AtomicLong" has
been added.
- gRPC plugin: Support for meta data has been added.
- IPC plugin: Fixed failed compilation on AIX.
- Intel PMU plugin: This new plugin collects CPU performance metrics
using Intel's Performance Monitoring Unit (PMU). Scaling information
added to metadata.
- Intel RDT plugin: Support for collectd's logging infrastructure has
been added. PQoS monitoring groups are being reset on start-up to
fix potential previous unclean shutdowns.
- IPMI plugin: Support for System Event Log (SEL) has been added.
- IPMI plugin: Support for remote IPMI controllers has been added.
- LVM plugin: A check for the "CAP_SYS_ADMIN" capability has been
added. This will give users an informative warning when the process
is not running with the required privileges for this plugin.
- mcelog plugin: This new plugin subscribes to Machine Check
Exceptions (MCE) and dispatches notifications. Metadata reset.
- MQTT plugin: Add support for TLS in "Subscriber" blocks.
- memcached plugin: Persistent connections have been implemented. Fix
hit ratio reporting, add connections rate report.
- memcached plugin: The type of the "listen_disabled" metric has been
changed to "total_events".
- Netlink plugin: The dropped packets metric has been added.
- NFS plugin: Support for NFS 4.2 metrics has been added.
- NFS plugin: Config options to ignore specified NFS versions have
been added.
- NUT plugin: The "ConnectTimeout", "ForceSSL", "VerifyPeer" and
"CAPath" options have been added.
- OpenLDAP plugin: A segfault after a connection failure has been
fixed.
- Openvpn plugin: Added support for status files from latest
OpenVPN-2.4 and possible from future versions.
- OVS Events plugin: This new plugin reports link state changes from
Open vSwitch (OVS).
- OVS Stats plugin: This new plugin reports bridge / interface
statistics from Open vSwitch (OVS).
- Perl plugin: Bugfix, added check of proper interpreter
initialization.
- PostgreSQL plugin: The plugin now sets the "application_name"
parameter when connecting to the database.
- Processes plugin: The I/O operations reported for selected processes
has been fixed. The metric "ps_disk_octets" has been renamed to
"io_octets" because it actually contains the number of I/O operation
by the process, not just disk related I/O. Same for "io_ops"
(previously "ps_disk_ops"). The new metric "disk_octets" has been
added and is reporting disk I/O only. Add option to collect the count
of active memory maps for Linux processes. The "CollectFileDescriptor"
and "CollectContextSwitch" options have been added.
- Processes and TCPConns plugins: The OpenBSD implementation has been
changed to use "kvm_openfiles" with "KVM_NO_FILES".
- Python plugin: Extend Notification class to include metadata.
- Python plugin: The "CollectdException" class has been added. This
allows to throw an exception without a stack trace being logged.
- Sensors plugin: Support for (electrical) current has been added.
- SNMP plugin: Error handling has been improved: a potential
double-free is now avoided (potentially leaking memory) and handling
of non-failing subtrees has been fixed.
- SNMP plugin: The "Timeout" and "Retries" config options have been
added.
- SNMP Agent plugin: This new plugin implements an SNMP AgentX
subagent that receives and handles queries from SNMP master agent
and returns configured metrics.
- Synproxy plugin: This new plugin provides statistics for Linux
SYNPROXY.
- Tail plugin: Allow the calculation of several distributions in one
"tail" instance through a "bucket" type.
- Turbostat plugin: Import "msr-index.h" header from Linux and better
support for mutliple packages.
- Uptime plugin: Changed implementation to read from "/proc/uptime"
instead of "/proc/stat". Update for Linux and AIX, uptime is read
directly using a system call. Update for BSD and Solaris, uptime is
calculated by subtracting boot time from current time.
- UUID plugin: Support for libhal has been removed.
- Varnish plugin: Extended the varnish plugin with varnish-plus
counters. Fixed invalid data source type.
- virt plugin: The plugin has been updated to use
"virConnectListAllDomains()".
- virt plugin: Support for domain tags has been added.
- virt plugin: Connection handling has been improved.
- virt plugin: Many metrics have been added, including disk,
hypervisor CPU usage, performance monitoring events, domain state,
CPU pinning (affinity), file system, and job statistics.
- Write Graphite plugin: Additional tests have been added.
- Write HTTP plugin: The "Attribute" and "TTL" options for the
KairosDB format have been added. Implementation of "Prefix" option.
- Write MongoDB plugin: Memory leaks have been fixed.
- Write Prometheus plugin: Label values are now properly escaped.
- Write Redis plugin: Add "max_set_duration" to set duration for
value.
- Write Riemann plugin: Export times with microsecond resolution.
- Write TSDB plugin: The options "ResolveInterval" and "ResolveJitter"
have been added to control DNS lookup behavior. This prevents DNS
flooding in case TSDB is not available.
- ZFS ARC plugin: Header lines are now ignored in the Linux
implementation.
Diffstat (limited to 'sysutils')
20 files changed, 152 insertions, 144 deletions
diff --git a/sysutils/collectd-curl/Makefile b/sysutils/collectd-curl/Makefile index b075d6f183e..0920223d755 100644 --- a/sysutils/collectd-curl/Makefile +++ b/sysutils/collectd-curl/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2017/08/24 20:03:39 adam Exp $ +# $NetBSD: Makefile,v 1.10 2017/11/21 15:18:23 fhajny Exp $ COLLECTD_PACKAGE= curl COLLECTD_PLUGINS= curl curl_json curl_xml apache bind nginx write_http COMMENT= Statistics collection daemon - curl-based plugins -PKGREVISION= 1 .include "../../sysutils/collectd/Makefile.common" diff --git a/sysutils/collectd/Makefile.common b/sysutils/collectd/Makefile.common index b7b7de0c195..15a96304d26 100644 --- a/sysutils/collectd/Makefile.common +++ b/sysutils/collectd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2017/06/14 13:42:53 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.16 2017/11/21 15:18:22 fhajny Exp $ # # used by sysutils/collectd/Makefile # used by sysutils/collectd-amqp/Makefile @@ -16,7 +16,7 @@ # used by sysutils/p5-collectd/Makefile # used by sysutils/py-collectd/Makefile -DISTNAME= collectd-5.7.2 +DISTNAME= collectd-5.8.0 MASTER_SITES= http://collectd.org/files/ CATEGORIES= sysutils EXTRACT_SUFX= .tar.bz2 @@ -40,9 +40,7 @@ DEPENDS+= collectd>=${PKGVERSION_NOREV}:../../sysutils/collectd COLLECTD_PLUGINS?= ${COLLECTD_PACKAGE:S/-/_/} -BUILD_DIRS= src BUILD_TARGET= ${COLLECTD_PLUGINS:S/$/.la/} -INSTALL_DIRS= src INSTALL_TARGET= install-pkglibLTLIBRARIES . for plugin in ${COLLECTD_PLUGINS} CONFIGURE_ARGS+= --enable-${plugin} @@ -90,10 +88,5 @@ SUBST_SED.ver= -e 's,m4_esyscmd(./version-gen.sh),${PKGVERSION_NOREV},' pre-configure: cd ${WRKSRC} && autoreconf -# Dirty, but needed by several plugin sub-packages -pre-build: - cd ${WRKSRC}/src/daemon && ${BUILD_MAKE_CMD} ${MAKE_FLAGS} \ - libcommon.la libmetadata.la - .include "../../devel/libltdl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/collectd/PLIST b/sysutils/collectd/PLIST index eedea9fc044..5bf745064c6 100644 --- a/sysutils/collectd/PLIST +++ b/sysutils/collectd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2016/10/13 15:17:28 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.8 2017/11/21 15:18:22 fhajny Exp $ bin/collectd-nagios bin/collectd-tg bin/collectdctl @@ -6,6 +6,9 @@ include/collectd/client.h include/collectd/lcc_features.h include/collectd/network.h include/collectd/network_buffer.h +include/collectd/network_parse.h +include/collectd/server.h +include/collectd/types.h lib/collectd/aggregation.la lib/collectd/apcups.la ${PLIST.apple-sensors}lib/collectd/apple_sensors.la diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index 495789bc948..7a359e97cac 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.39 2017/07/26 12:47:35 alnsn Exp $ +$NetBSD: distinfo,v 1.40 2017/11/21 15:18:22 fhajny Exp $ -SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0 -RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2 -SHA512 (collectd-5.7.2.tar.bz2) = 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 -Size (collectd-5.7.2.tar.bz2) = 1798777 bytes -SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319 -SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1 -SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765 +SHA1 (collectd-5.8.0.tar.bz2) = eb3567563de471e1950b7388e8883b911be3756a +RMD160 (collectd-5.8.0.tar.bz2) = 7b812b1046d57a9047213bb182b8744d98606547 +SHA512 (collectd-5.8.0.tar.bz2) = 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008 +Size (collectd-5.8.0.tar.bz2) = 1686017 bytes +SHA1 (patch-Makefile.am) = 88442293d3bba24c1504eea5a27e2fcb8cfb59b9 +SHA1 (patch-configure.ac) = a0186e11a681cafdcf9ac2d31759259f69c4737f SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66 -SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c +SHA1 (patch-src_daemon_collectd.c) = 155da2fde889e961719fe6be47aa7fc25199fbe7 +SHA1 (patch-src_daemon_common.h) = d1ef6a5257156a864bf896629870f0f83a858cff SHA1 (patch-src_df.c) = 5c6549cd9ec72efed5cdb7d8dd9297c50491426e -SHA1 (patch-src_disk.c) = 1d458db9753be9c8ad1ae5edb3468acf7419a66b -SHA1 (patch-src_entropy.c) = 293e7105866b9b7c3eb5058dc314eaa510899843 -SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0 -SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e -SHA1 (patch-src_lua.c) = 83e5db00adee0636c46b22541d7e016826c2fcd2 -SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7 +SHA1 (patch-src_disk.c) = 6b51454f88ef728abd22cdae5fdd7a81289d502c +SHA1 (patch-src_entropy.c) = f20ad4ce2e968ba0b20bb13aa00771fc424562fd +SHA1 (patch-src_irq.c) = 18106e9051ec344b0d45a23814eae5ba3be2f908 +SHA1 (patch-src_libcollectclient_network__buffer.c) = a19e1658017279c35fd9860e2ab855081bad8327 +SHA1 (patch-src_lua.c) = 656934889976f489abb80a8244492f845a3bd9f8 +SHA1 (patch-src_memory.c) = 3276b09d0c09e0a9446519bd6c304d95c30b617a SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61 SHA1 (patch-src_processes.c) = 3dd8510bfd0d25051f30519f62d638536c45a6e2 SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6 -SHA1 (patch-src_swap.c) = 24da6e04e3006639311e8111f26f72e4fab4054a -SHA1 (patch-src_tcpconns.c) = b85de1d0eb03989df12d9688b38d61733a13c028 +SHA1 (patch-src_swap.c) = 98984dc7c6eee4f17b2f291124431172b06aa6c2 +SHA1 (patch-src_tcpconns.c) = 0469ffe477ae96a79e4fd28c4428a1e7682e9461 SHA1 (patch-src_utils__dns.c) = 138a3168dc109d785412ffd068edab3b4dacca36 SHA1 (patch-src_utils__format__kairosdb.c) = 2f7bde47682d2b877f9bd2d2c794a21c297aa9e5 diff --git a/sysutils/collectd/options.mk b/sysutils/collectd/options.mk index 3b2e61fc016..30757ac703f 100644 --- a/sysutils/collectd/options.mk +++ b/sysutils/collectd/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.9 2017/01/19 17:20:42 he Exp $ +# $NetBSD: options.mk,v 1.10 2017/11/21 15:18:22 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.collectd PKG_SUPPORTED_OPTIONS= cpu df interface load memory syslog uptime PKG_SUGGESTED_OPTIONS+= cpu df interface load memory syslog uptime PKG_SUPPORTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp -PKG_SUPPORTED_OPTIONS.NetBSD+= swap tcpconns users processes +PKG_SUPPORTED_OPTIONS.NetBSD+= swap tcpconns users # processes PKG_SUGGESTED_OPTIONS.NetBSD+= contextswitch disk entropy irq pf netstat_udp -PKG_SUGGESTED_OPTIONS.NetBSD+= swap tcpconns users processes +PKG_SUGGESTED_OPTIONS.NetBSD+= swap tcpconns users # processes PKG_SUPPORTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc PKG_SUGGESTED_OPTIONS.FreeBSD+= contextswitch pf processes swap tcpconns zfs-arc diff --git a/sysutils/collectd/patches/patch-Makefile.am b/sysutils/collectd/patches/patch-Makefile.am index 2dd339826b6..5b79e03dd4b 100644 --- a/sysutils/collectd/patches/patch-Makefile.am +++ b/sysutils/collectd/patches/patch-Makefile.am @@ -1,15 +1,37 @@ -$NetBSD: patch-Makefile.am,v 1.1 2015/08/18 07:47:46 he Exp $ +$NetBSD: patch-Makefile.am,v 1.2 2017/11/21 15:18:23 fhajny Exp $ Use other data directory. ---- Makefile.am.orig 2015-03-09 09:38:22.000000000 +0000 +--- Makefile.am.orig 2017-11-18 09:03:27.326751649 +0000 +++ Makefile.am -@@ -8,7 +8,7 @@ EXTRA_DIST = contrib version-gen.sh +@@ -165,7 +165,7 @@ AM_CPPFLAGS = \ + -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +- -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \ ++ -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' \ + -DPLUGINDIR='"${pkglibdir}"' \ + -DPKGDATADIR='"${pkgdatadir}"' + +@@ -1205,6 +1205,12 @@ netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS) + netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) + endif + ++if BUILD_PLUGIN_NETSTAT_UDP ++pkglib_LTLIBRARIES += netstat_udp.la ++netstat_udp_la_SOURCES = src/netstat_udp.c ++netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS) ++endif ++ + if BUILD_PLUGIN_NETWORK + pkglib_LTLIBRARIES += network.la + network_la_SOURCES = \ +@@ -1964,7 +1970,7 @@ endif install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/db/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log - - maintainer-clean-local: + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ diff --git a/sysutils/collectd/patches/patch-configure.ac b/sysutils/collectd/patches/patch-configure.ac index a37c962441b..a017a8a65e3 100644 --- a/sysutils/collectd/patches/patch-configure.ac +++ b/sysutils/collectd/patches/patch-configure.ac @@ -1,36 +1,44 @@ -$NetBSD: patch-configure.ac,v 1.10 2016/10/13 15:17:28 fhajny Exp $ +$NetBSD: patch-configure.ac,v 1.11 2017/11/21 15:18:23 fhajny Exp $ Add KERNEL_NETBSD, add entry and disk plugins for NetBSD, and also do swap for "have_swapctl_three_args" (as for NetBSD). Also, the start of process support, but that's not yet finished. ---- configure.ac.orig 2016-09-11 08:10:25.243038749 +0000 +--- configure.ac.orig 2017-11-18 09:03:27.330751467 +0000 +++ configure.ac -@@ -147,6 +147,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$ +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ([2.60]) +-AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) ++AC_INIT([collectd],[5.8.0]) + AC_CONFIG_SRCDIR(src/target_set.c) + AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_AUX_DIR([build-aux]) +@@ -110,6 +110,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$ AM_CONDITIONAL([BUILD_FREEBSD], [test "x$ac_system" = "xFreeBSD"]) AM_CONDITIONAL([BUILD_LINUX], [test "x$ac_system" = "xLinux"]) AM_CONDITIONAL([BUILD_OPENBSD], [test "x$ac_system" = "xOpenBSD"]) +AM_CONDITIONAL([BUILD_NETBSD], [test "x$ac_system" = "xNetBSD"]) AM_CONDITIONAL([BUILD_SOLARIS], [test "x$ac_system" = "xSolaris"]) - if test "x$ac_system" = "xLinux" -@@ -5717,6 +5718,7 @@ plugin_load="no" - plugin_log_logstash="no" + if test "x$ac_system" = "xSolaris"; then +@@ -6136,6 +6137,7 @@ plugin_log_logstash="no" + plugin_mcelog="no" plugin_memory="no" plugin_multimeter="no" +plugin_netstat_udp="no" plugin_nfs="no" plugin_numa="no" - plugin_perl="no" -@@ -5803,6 +5805,7 @@ then - plugin_entropy="yes" - plugin_irq="yes" - plugin_processes="yes" -+ plugin_netstat_udp="yes" + plugin_ovs_events="no" +@@ -6229,6 +6231,7 @@ if test "x$ac_system" = "xNetBSD"; then + plugin_entropy="yes" + plugin_irq="yes" + plugin_processes="yes" ++ plugin_netstat_udp="yes" fi # Mac OS X devices -@@ -6194,6 +6197,7 @@ AC_PLUGIN([multimeter], [$plugi +@@ -6568,6 +6571,7 @@ AC_PLUGIN([multimeter], [$plugi AC_PLUGIN([mysql], [$with_libmysql], [MySQL statistics]) AC_PLUGIN([netapp], [$with_libnetapp], [NetApp plugin]) AC_PLUGIN([netlink], [$with_libmnl], [Enhanced Linux network statistics]) @@ -38,7 +46,7 @@ Also, the start of process support, but that's not yet finished. AC_PLUGIN([network], [yes], [Network communication plugin]) AC_PLUGIN([nfs], [$plugin_nfs], [NFS statistics]) AC_PLUGIN([nginx], [$with_libcurl], [nginx statistics]) -@@ -6624,6 +6628,7 @@ AC_MSG_RESULT([ multimeter . . . . . +@@ -6987,6 +6991,7 @@ AC_MSG_RESULT([ multimeter . . . . . AC_MSG_RESULT([ mysql . . . . . . . . $enable_mysql]) AC_MSG_RESULT([ netapp . . . . . . . $enable_netapp]) AC_MSG_RESULT([ netlink . . . . . . . $enable_netlink]) diff --git a/sysutils/collectd/patches/patch-src_Makefile.am b/sysutils/collectd/patches/patch-src_Makefile.am deleted file mode 100644 index 289310967f8..00000000000 --- a/sysutils/collectd/patches/patch-src_Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-src_Makefile.am,v 1.3 2016/10/13 15:17:28 fhajny Exp $ - -Install config file in example directory. - ---- src/Makefile.am.orig 2016-09-11 08:10:25.251038738 +0000 -+++ src/Makefile.am -@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon - AM_CPPFLAGS += -DPREFIX='"${prefix}"' - AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' - AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' --AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' -+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' - if BUILD_FEATURE_DAEMON - AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' - endif -@@ -737,6 +737,12 @@ netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD - netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) - endif - -+if BUILD_PLUGIN_NETSTAT_UDP -+pkglib_LTLIBRARIES += netstat_udp.la -+netstat_udp_la_SOURCES = netstat_udp.c -+netstat_udp_la_LDFLAGS = $(PLUGIN_LDFLAGS) -+endif -+ - if BUILD_PLUGIN_NETWORK - pkglib_LTLIBRARIES += network.la - network_la_SOURCES = network.c network.h \ diff --git a/sysutils/collectd/patches/patch-src_daemon_Makefile.am b/sysutils/collectd/patches/patch-src_daemon_Makefile.am deleted file mode 100644 index 94ea2fcd932..00000000000 --- a/sysutils/collectd/patches/patch-src_daemon_Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_daemon_Makefile.am,v 1.1 2016/10/13 15:17:28 fhajny Exp $ - -Use other data directory. - ---- src/daemon/Makefile.am.orig 2016-10-07 06:49:37.631866621 +0000 -+++ src/daemon/Makefile.am -@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src - AM_CPPFLAGS += -DPREFIX='"${prefix}"' - AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' - AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' --AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' -+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' - if BUILD_FEATURE_DAEMON - AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' - endif diff --git a/sysutils/collectd/patches/patch-src_daemon_collectd.c b/sysutils/collectd/patches/patch-src_daemon_collectd.c new file mode 100644 index 00000000000..9fdb225bd1a --- /dev/null +++ b/sysutils/collectd/patches/patch-src_daemon_collectd.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_daemon_collectd.c,v 1.1 2017/11/21 15:18:23 fhajny Exp $ + +Fix missing declaration. + +--- src/daemon/collectd.c.orig 2017-11-18 09:03:27.350750556 +0000 ++++ src/daemon/collectd.c +@@ -208,6 +208,7 @@ static int change_basedir(const char *or + } /* static int change_basedir (char *dir) */ + + #if HAVE_LIBKSTAT ++extern kstat_ctl_t *kc; + static void update_kstat(void) { + if (kc == NULL) { + if ((kc = kstat_open()) == NULL) diff --git a/sysutils/collectd/patches/patch-src_daemon_common.h b/sysutils/collectd/patches/patch-src_daemon_common.h new file mode 100644 index 00000000000..d2fe6debd37 --- /dev/null +++ b/sysutils/collectd/patches/patch-src_daemon_common.h @@ -0,0 +1,17 @@ +$NetBSD: patch-src_daemon_common.h,v 1.1 2017/11/21 15:18:23 fhajny Exp $ + +Need kstat.h if available. + +--- src/daemon/common.h.orig 2017-11-18 09:03:27.350750556 +0000 ++++ src/daemon/common.h +@@ -32,6 +32,10 @@ + + #include "plugin.h" + ++#if HAVE_KSTAT_H ++#include <kstat.h> ++#endif ++ + #if HAVE_PWD_H + #include <pwd.h> + #endif diff --git a/sysutils/collectd/patches/patch-src_disk.c b/sysutils/collectd/patches/patch-src_disk.c index ff44eaefe48..450b65dab45 100644 --- a/sysutils/collectd/patches/patch-src_disk.c +++ b/sysutils/collectd/patches/patch-src_disk.c @@ -1,8 +1,8 @@ -$NetBSD: patch-src_disk.c,v 1.2 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_disk.c,v 1.3 2017/11/21 15:18:23 fhajny Exp $ Provide a port to NetBSD. ---- src/disk.c.orig 2016-11-30 08:52:01.312911569 +0000 +--- src/disk.c.orig 2017-11-18 09:03:27.354750373 +0000 +++ src/disk.c @@ -135,6 +135,35 @@ static int numdisk; static int pnumdisk; @@ -73,9 +73,9 @@ Provide a port to NetBSD. + +#endif /* HAVE_SYSCTL && KERNEL_NETBSD */ - return (0); + return 0; } /* int disk_init */ -@@ -1026,7 +1081,129 @@ static int disk_read(void) { +@@ -1017,7 +1072,129 @@ static int disk_read(void) { 1000000.0; disk_submit(stat_disk[i].name, "disk_time", read_time, write_time); } @@ -204,5 +204,5 @@ Provide a port to NetBSD. + +#endif /* HAVE_SYSCTL && KERNEL_NETBSD */ - return (0); + return 0; } /* int disk_read */ diff --git a/sysutils/collectd/patches/patch-src_entropy.c b/sysutils/collectd/patches/patch-src_entropy.c index a1a544a143a..16106cfa953 100644 --- a/sysutils/collectd/patches/patch-src_entropy.c +++ b/sysutils/collectd/patches/patch-src_entropy.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_entropy.c,v 1.9 2017/02/14 21:23:13 joerg Exp $ +$NetBSD: patch-src_entropy.c,v 1.10 2017/11/21 15:18:23 fhajny Exp $ Provide a NetBSD implementation for graphing available entropy. This version tries to keep /dev/urandom open (for repeated use), instead of constantly re-opening/closing it, since the latter will needlessly reduce the kernel's entropy estimate. ---- src/entropy.c.orig 2017-01-23 07:53:57.000000000 +0000 +--- src/entropy.c.orig 2017-11-18 09:03:27.354750373 +0000 +++ src/entropy.c @@ -29,23 +29,16 @@ #include "common.h" @@ -38,7 +38,7 @@ needlessly reduce the kernel's entropy estimate. if (parse_value_file(ENTROPY_FILE, &v, DS_TYPE_GAUGE) != 0) { @@ -56,6 +49,70 @@ static int entropy_read(void) { entropy_submit(v); - return (0); + return 0; } +#endif /* KERNEL_LINUX */ + diff --git a/sysutils/collectd/patches/patch-src_irq.c b/sysutils/collectd/patches/patch-src_irq.c index 1dc8bd3ce77..79634a5d803 100644 --- a/sysutils/collectd/patches/patch-src_irq.c +++ b/sysutils/collectd/patches/patch-src_irq.c @@ -1,8 +1,8 @@ -$NetBSD: patch-src_irq.c,v 1.4 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_irq.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $ Provide a port to NetBSD. ---- src/irq.c.orig 2016-11-30 08:52:01.316911197 +0000 +--- src/irq.c.orig 2017-11-18 09:03:27.354750373 +0000 +++ src/irq.c @@ -27,10 +27,20 @@ #include "plugin.h" @@ -26,7 +26,7 @@ Provide a port to NetBSD. /* * (Module-)Global variables */ -@@ -79,6 +89,7 @@ static void irq_submit(const char *irq_n +@@ -75,6 +85,7 @@ static void irq_submit(const char *irq_n plugin_dispatch_values(&vl); } /* void irq_submit */ @@ -34,9 +34,9 @@ Provide a port to NetBSD. static int irq_read(void) { FILE *fh; char buffer[1024]; -@@ -171,6 +182,64 @@ static int irq_read(void) { +@@ -167,6 +178,64 @@ static int irq_read(void) { - return (0); + return 0; } /* int irq_read */ +#endif /* KERNEL_LINUX */ + diff --git a/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c b/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c index f5547a62f9b..92db7ddf017 100644 --- a/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c +++ b/sysutils/collectd/patches/patch-src_libcollectclient_network__buffer.c @@ -1,12 +1,13 @@ -$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.3 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_libcollectclient_network__buffer.c,v 1.4 2017/11/21 15:18:23 fhajny Exp $ Need the workaround on at least SunOS too. ---- src/libcollectdclient/network_buffer.c.orig 2016-11-30 08:52:01.316911197 +0000 + +--- src/libcollectdclient/network_buffer.c.orig 2017-11-18 09:03:27.358750191 +0000 +++ src/libcollectdclient/network_buffer.c @@ -36,7 +36,7 @@ #include <pthread.h> - #if HAVE_LIBGCRYPT + #if HAVE_GCRYPT_H -#if defined __APPLE__ +#if defined __APPLE__ || defined(__sun) /* default xcode compiler throws warnings even when deprecated functionality diff --git a/sysutils/collectd/patches/patch-src_lua.c b/sysutils/collectd/patches/patch-src_lua.c index 53a8abe7bfd..68f768ec4f3 100644 --- a/sysutils/collectd/patches/patch-src_lua.c +++ b/sysutils/collectd/patches/patch-src_lua.c @@ -1,16 +1,16 @@ -$NetBSD: patch-src_lua.c,v 1.1 2017/07/26 12:43:02 alnsn Exp $ +$NetBSD: patch-src_lua.c,v 1.2 2017/11/21 15:18:23 fhajny Exp $ Make it possible to register more than one reader/writer. Upstream request: https://github.com/collectd/collectd/pull/2379 ---- src/lua.c.orig 2017-06-06 18:13:54.000000000 +0000 +--- src/lua.c.orig 2017-11-18 09:03:27.358750191 +0000 +++ src/lua.c @@ -281,9 +281,6 @@ static int lua_cb_register_read(lua_Stat luaL_checktype(L, 1, LUA_TFUNCTION); - char function_name[DATA_MAX_NAME_LEN]; -- ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); +- snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); - int callback_id = clua_store_callback(L, 1); if (callback_id < 0) @@ -20,27 +20,27 @@ Upstream request: https://github.com/collectd/collectd/pull/2379 return luaL_error(L, "%s", "calloc failed"); + char function_name[DATA_MAX_NAME_LEN]; -+ ssnprintf(function_name, sizeof(function_name), "lua/%p", thread); ++ snprintf(function_name, sizeof(function_name), "lua/%p", thread); + cb->lua_state = thread; cb->callback_id = callback_id; cb->lua_function_name = strdup(function_name); -@@ -324,9 +324,6 @@ static int lua_cb_register_write(lua_Sta +@@ -325,9 +325,6 @@ static int lua_cb_register_write(lua_Sta luaL_checktype(L, 1, LUA_TFUNCTION); - char function_name[DATA_MAX_NAME_LEN] = ""; -- ssnprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); +- snprintf(function_name, sizeof(function_name), "lua/%s", lua_tostring(L, 1)); - int callback_id = clua_store_callback(L, 1); if (callback_id < 0) return luaL_error(L, "%s", "Storing callback function failed"); -@@ -341,6 +338,9 @@ static int lua_cb_register_write(lua_Sta +@@ -342,6 +339,9 @@ static int lua_cb_register_write(lua_Sta if (cb == NULL) return luaL_error(L, "%s", "calloc failed"); + char function_name[DATA_MAX_NAME_LEN]; -+ ssnprintf(function_name, sizeof(function_name), "lua/%p", thread); ++ snprintf(function_name, sizeof(function_name), "lua/%p", thread); + cb->lua_state = thread; cb->callback_id = callback_id; diff --git a/sysutils/collectd/patches/patch-src_memory.c b/sysutils/collectd/patches/patch-src_memory.c index 2e0f27f65f0..19397ca0595 100644 --- a/sysutils/collectd/patches/patch-src_memory.c +++ b/sysutils/collectd/patches/patch-src_memory.c @@ -1,9 +1,9 @@ -$NetBSD: patch-src_memory.c,v 1.4 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_memory.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $ Add a port for NetBSD using VM_UVMEXP2, and preferring sysctl over sysctlbyname. ---- src/memory.c.orig 2016-11-30 08:52:01.316911197 +0000 +--- src/memory.c.orig 2017-11-18 09:03:27.358750191 +0000 +++ src/memory.c @@ -66,6 +66,10 @@ static mach_port_t port_host; static vm_size_t pagesize; @@ -61,7 +61,7 @@ sysctl over sysctlbyname. - pagesize = getpagesize(); - if (pagesize <= 0) { - ERROR("memory plugin: Invalid pagesize: %i", pagesize); -- return (-1); +- return -1; - } -/* #endif HAVE_SYSCTL */ - diff --git a/sysutils/collectd/patches/patch-src_swap.c b/sysutils/collectd/patches/patch-src_swap.c index b0cc2dfe8d4..7eba7bf5e49 100644 --- a/sysutils/collectd/patches/patch-src_swap.c +++ b/sysutils/collectd/patches/patch-src_swap.c @@ -1,9 +1,9 @@ -$NetBSD: patch-src_swap.c,v 1.4 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_swap.c,v 1.5 2017/11/21 15:18:23 fhajny Exp $ Extend support for NetBSD, and add per-swap-device reporting for HAVE_SWAPCTL_THREE_ARGS. ---- src/swap.c.orig 2016-11-30 08:52:01.324910450 +0000 +--- src/swap.c.orig 2017-11-18 09:03:27.366749826 +0000 +++ src/swap.c @@ -78,9 +78,12 @@ static _Bool report_bytes = 0; static _Bool report_by_device = 0; @@ -19,7 +19,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. static _Bool report_by_device = 0; /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ -@@ -117,7 +120,7 @@ static int swap_config(oconfig_item_t *c +@@ -118,7 +121,7 @@ static int swap_config(oconfig_item_t *c for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; if (strcasecmp("ReportBytes", child->key) == 0) @@ -28,7 +28,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. cf_util_get_boolean(child, &report_bytes); #else WARNING("swap plugin: The \"ReportBytes\" option " -@@ -149,7 +152,7 @@ static int swap_init(void) /* {{{ */ +@@ -152,7 +155,7 @@ static int swap_init(void) /* {{{ */ pagesize = (derive_t)sysconf(_SC_PAGESIZE); /* #endif KERNEL_LINUX */ @@ -37,7 +37,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. /* getpagesize(3C) tells me this does not fail.. */ pagesize = (derive_t)getpagesize(); /* #endif HAVE_SWAPCTL */ -@@ -209,7 +212,7 @@ static void swap_submit_usage(char const +@@ -210,7 +213,7 @@ static void swap_submit_usage(char const free, other_name, other_value, NULL); } /* }}} void swap_submit_usage */ @@ -46,7 +46,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. __attribute__((nonnull(1))) static void swap_submit_derive(char const *type_instance, /* {{{ */ derive_t value) { -@@ -579,6 +582,43 @@ static int swap_read(void) /* {{{ */ +@@ -577,6 +580,43 @@ static int swap_read(void) /* {{{ */ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS @@ -90,7 +90,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. static int swap_read(void) /* {{{ */ { struct swapent *swap_entries; -@@ -617,12 +657,32 @@ static int swap_read(void) /* {{{ */ +@@ -615,12 +655,32 @@ static int swap_read(void) /* {{{ */ /* TODO: Report per-device stats. The path name is available from * swap_entries[i].se_path */ for (int i = 0; i < swap_num; i++) { @@ -126,7 +126,7 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. if (total < used) { ERROR( -@@ -633,8 +693,15 @@ static int swap_read(void) /* {{{ */ +@@ -631,8 +691,15 @@ static int swap_read(void) /* {{{ */ } swap_submit_usage(NULL, used, total - used, NULL, NAN); @@ -139,6 +139,6 @@ reporting for HAVE_SWAPCTL_THREE_ARGS. +#if KERNEL_NETBSD + swap_read_io (); +#endif - return (0); + return 0; } /* }}} int swap_read */ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */ diff --git a/sysutils/collectd/patches/patch-src_tcpconns.c b/sysutils/collectd/patches/patch-src_tcpconns.c index 24d5153f2bf..a669589c8cc 100644 --- a/sysutils/collectd/patches/patch-src_tcpconns.c +++ b/sysutils/collectd/patches/patch-src_tcpconns.c @@ -1,11 +1,11 @@ -$NetBSD: patch-src_tcpconns.c,v 1.6 2016/12/07 17:28:39 fhajny Exp $ +$NetBSD: patch-src_tcpconns.c,v 1.7 2017/11/21 15:18:23 fhajny Exp $ Include <sys/param.h> Re-order to fix build on NetBSD. ---- src/tcpconns.c.orig 2016-11-30 08:52:01.328910078 +0000 +--- src/tcpconns.c.orig 2017-11-18 09:03:27.370749644 +0000 +++ src/tcpconns.c -@@ -111,9 +111,9 @@ +@@ -128,9 +128,9 @@ #include <net/route.h> #include <netdb.h> #include <netinet/in.h> @@ -16,8 +16,8 @@ Re-order to fix build on NetBSD. #include <netinet/ip_var.h> #include <netinet/tcp.h> #include <netinet/tcp_timer.h> -@@ -820,6 +820,7 @@ static int conn_init(void) { - return (0); +@@ -897,6 +897,7 @@ static int conn_init(void) { + return 0; } /* int conn_init */ +#include <sys/param.h> diff --git a/sysutils/p5-collectd/Makefile b/sysutils/p5-collectd/Makefile index 2f38e445731..48074cce6de 100644 --- a/sysutils/p5-collectd/Makefile +++ b/sysutils/p5-collectd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/06/14 13:42:54 fhajny Exp $ +# $NetBSD: Makefile,v 1.7 2017/11/21 15:18:23 fhajny Exp $ PKGNAME= p5-${DISTNAME} COLLECTD_PACKAGE= perl @@ -15,14 +15,8 @@ PERL5_PACKLIST+= auto/Collectd/.packlist CONFIGURE_ARGS+= --with-libperl=${BUILDLINK_PREFIX.perl} CONFIGURE_ARGS+= --with-perl-bindings=${MAKE_PARAMS:Q} -post-build: - cd ${WRKSRC}/bindings && ${BUILD_MAKE_CMD} perl - -do-install: - cd ${WRKSRC}/src && ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} ${INSTALL_TARGET} - cd ${WRKSRC}/bindings && ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install +BUILD_TARGET+= perl +INSTALL_TARGET+= install-exec-local .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" |