package/collectd: drop autoreconf
PATCH v2 1/6 package/collectd: drop autoreconf
autoreconf is not needed since bump to version 5.11.0 in commit 57adbfc482454e3fb17172626b2dc971afaf5cfd which dropped patch
--- package/collectd/collectd.mk | 2 -- 1 file changed, 2 deletions(-)
package/collectd/collectd.mk +0 -2
@@ -12,8 +12,6 @@ COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING -# We're patching configure.ac -COLLECTD_AUTORECONF = YES # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \
Signature · 1 line
2.25.1
PATCH v2 2/6 package/collectd: remove lvm
lvm has been removed since version 5.11.0 and
https://github.com/collectd/collectd/commit/0e73c26f5670b2f11eecfdadaf545bcc7f260658
--- Config.in.legacy | 6 ++++++ package/collectd/Config.in | 13 ------------- package/collectd/collectd.mk | 2 -- 3 files changed, 6 insertions(+), 15 deletions(-)
Config.in.legacy +6 -0
@@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2020.05" +config BR2_PACKAGE_COLLECTD_LVM + bool "lvm support in collectd was removed" + select BR2_LEGACY + help + collectd removed LVM plugin, liblvm2app has been deprecated + config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174 bool "duplicate QCA6174 firmware symbol removed" select BR2_LEGACY
package/collectd/Config.in +0 -13
@@ -296,19 +296,6 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. -config BR2_PACKAGE_COLLECTD_LVM - bool "lvm" - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 app library - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY - help - Collects the size of logical volumes (LV) and free space - inside a volume group (VG) from Linux' Logical Volume Manager - (LVM). - -comment "lvm needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_COLLECTD_MD bool "md" help
package/collectd/collectd.mk +0 -2
@@ -88,7 +88,6 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),--enable-lvm,--disable-lvm) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
@@ -162,7 +161,6 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),lua) \ - $(if $(BR2_PACKAGE_COLLECTD_LVM),lvm2) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \
Signature · 1 line
2.25.1
PATCH v2 3/6 package/collectd: add DPDK_TELEMETRY option
In reply to Fabrice FontaineDPDK support is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/00cbd4d2c016a676db476ae66bbc58d6bf11a6a0
It depends on jansson and is currently enabled by default raising the following build failure on musl:
src/dpdk_telemetry.c:43:10: fatal error: sys/unistd.h: No such file or directory
#include <sys/unistd.h>
^~~~~~~~~~~~~~Fixes:
- autobuild.buildroot.org/results/aafb8c72f147fefc7a988c45e4dc17de48b07a95
--- ...c-dpdk_telemetry.c-fix-build-on-musl.patch | 37 +++++++++++++++++++ package/collectd/Config.in | 7 ++++ package/collectd/collectd.mk | 5 +++ 3 files changed, 49 insertions(+) create mode 100644 package/collectd/0001-src-dpdk_telemetry.c-fix-build-on-musl.patch
package/collectd/0001-src-dpdk_telemetry.c-fix-build-on-musl.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 70318d6bcf7ef89e1a73fc775d33f4c854aed484 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Tue, 14 Apr 2020 14:49:19 +0200 +Subject: [PATCH] src/dpdk_telemetry.c: fix build on musl + +Include unistd.h instead of sys/unistd.h to fix the following build +failure on musl: + +src/dpdk_telemetry.c:43:10: fatal error: sys/unistd.h: No such file or directory + #include <sys/unistd.h> + ^~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/aafb8c72f147fefc7a988c45e4dc17de48b07a95 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/collectd/collectd/pull/3439] +--- + src/dpdk_telemetry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dpdk_telemetry.c b/src/dpdk_telemetry.c +index b46e8574..cfee5f12 100755 +--- a/src/dpdk_telemetry.c ++++ b/src/dpdk_telemetry.c +@@ -40,7 +40,7 @@ + #include <sys/queue.h> + #include <sys/socket.h> + #include <sys/un.h> +-#include <sys/unistd.h> ++#include <unistd.h> + + #define BUF_SIZE 100000 + #define PLUGIN_NAME "dpdk_telemetry" +-- +2.25.1 +
package/collectd/Config.in +7 -0
@@ -210,6 +210,13 @@ config BR2_PACKAGE_COLLECTD_DNS help Collects statistics of DNS traffic using libpcap. +config BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY + bool "dpdk_telemetry" + select BR2_PACKAGE_JANSSON + help + Collects DPDK ethernet device metrics via dpdk_telemetry + library. + config BR2_PACKAGE_COLLECTD_DRBD bool "drbd" help
package/collectd/collectd.mk +5 -0
@@ -66,6 +66,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \ $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \ + $(if $(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),--enable-dpdk_telemetry,--disable-dpdk_telemetry) \ $(if $(BR2_PACKAGE_COLLECTD_DRBD),--enable-drbd,--disable-drbd) \ $(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \ $(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \
@@ -156,6 +157,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ + $(if $(BR2_PACKAGE_COLLECTD_DPKD_TELEMETRY),jansson) \ $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
@@ -186,6 +188,9 @@ COLLECTD_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_GRPC),y) COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_JANSSON),y) +COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr +endif ifeq ($(BR2_PACKAGE_LIBCURL),y) COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr endif
Signature · 1 line
2.25.1
PATCH v2 4/6 package/collectd: add InfluxDB support
In reply to Fabrice FontaineInfluxDB support is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/605fcdcddeefb23b945203079e5c87625ce0e336
--- package/collectd/Config.in | 6 ++++++ package/collectd/collectd.mk | 1 + 2 files changed, 7 insertions(+)
package/collectd/Config.in +6 -0
@@ -638,6 +638,12 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP Sends values collected to a web-server using HTTP POST and PUTVAL. +config BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP + bool "write_influxdb_udp" + help + Sends data to an instance of InfluxDB using the "Line + Protocol". + config BR2_PACKAGE_COLLECTD_WRITELOG bool "write_log" help
package/collectd/collectd.mk +1 -0
@@ -140,6 +140,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEINFLUXDBUDP),--enable-write_influxdb_udp,--disable-write_influxdb_udp) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),--enable-write_redis,--disable-write_redis) \
Signature · 1 line
2.25.1
PATCH v2 5/6 package/collectd: add capabilities option
In reply to Fabrice Fontainecapabilities plugin is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/b934f1572cdb54cf485b600546a72dbf9929ba2c
It is currently enabled by default depending on jansson and libmicrohttpd availability
--- package/collectd/Config.in | 8 ++++++++ package/collectd/collectd.mk | 2 ++ 2 files changed, 10 insertions(+)
package/collectd/Config.in +8 -0
@@ -128,6 +128,14 @@ config BR2_PACKAGE_COLLECTD_BIND help Collects BIND DNS statistics. +config BR2_PACKAGE_COLLECTD_CAPABILITIES + bool "capabilities" + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBMICROHTTPD + help + Collects selected static platform data using dmidecode and + expose it through micro embedded webserver. + config BR2_PACKAGE_COLLECTD_CEPH bool "ceph" select BR2_PACKAGE_YAJL
package/collectd/collectd.mk +2 -0
@@ -51,6 +51,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),--enable-capabilities,--disable-capabilities) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \
@@ -153,6 +154,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_AMQP),rabbitmq-c) \ $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ + $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),jansson libmicrohttpd) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
Signature · 1 line
2.25.1
PATCH v2 6/6 package/collectd: add buddyinfo option
In reply to Fabrice Fontainebuddyinfo is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/cb19ecf90d89a79836b8b5236d2b66277dd79c5f
It is currently enabled by default
---
Changes v1 -> v2 (after review of Asaf Kahlon):
- Add missing COLLECTD_ prefix for buddyinfo option in Config.in
package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+)
package/collectd/Config.in +5 -0
@@ -128,6 +128,11 @@ config BR2_PACKAGE_COLLECTD_BIND help Collects BIND DNS statistics. +config BR2_PACKAGE_COLLECTD_BUDDYINFO + bool "buddyinfo" + help + Statistics from buddyinfo file about memory fragmentation. + config BR2_PACKAGE_COLLECTD_CAPABILITIES bool "capabilities" select BR2_PACKAGE_JANSSON
package/collectd/collectd.mk +1 -0
@@ -51,6 +51,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_BUDDYINFO),--enable-buddyinfo,--disable-buddyinfo) \ $(if $(BR2_PACKAGE_COLLECTD_CAPABILITIES),--enable-capabilities,--disable-capabilities) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \
Signature · 1 line
2.25.1