public inbox for buildroot@busybox.net
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf
@ 2020-04-15  6:30 Fabrice Fontaine
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,2/6] package/collectd: remove lvm Fabrice Fontaine
                   ` (5 more replies)
  0 siblings, 6 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

autoreconf is not needed since bump to version 5.11.0 in commit
57adbfc482454e3fb17172626b2dc971afaf5cfd which dropped patch

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/collectd/collectd.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index c09edebfc9..dda15b0162 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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 = \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3,2/6] package/collectd: remove lvm
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
@ 2020-04-15  6:30 ` Fabrice Fontaine
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option Fabrice Fontaine
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

lvm has been removed since version 5.11.0 and
https://github.com/collectd/collectd/commit/0e73c26f5670b2f11eecfdadaf545bcc7f260658

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 Config.in.legacy             |  6 ++++++
 package/collectd/Config.in   | 13 -------------
 package/collectd/collectd.mk |  2 --
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 95f17b1b31..78b3b81e54 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -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
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 4b34ec60eb..1b6b3384c4 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -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
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index dda15b0162..24cdad7e1b 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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) \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,2/6] package/collectd: remove lvm Fabrice Fontaine
@ 2020-04-15  6:30 ` Fabrice Fontaine
  2020-04-19 21:14   ` Yann E. MORIN
  2020-08-17 10:18   ` Thomas Petazzoni
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support Fabrice Fontaine
                   ` (3 subsequent siblings)
  5 siblings, 2 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

DPDK 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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...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

diff --git a/package/collectd/0001-src-dpdk_telemetry.c-fix-build-on-musl.patch b/package/collectd/0001-src-dpdk_telemetry.c-fix-build-on-musl.patch
new file mode 100644
index 0000000000..8378cd0d33
--- /dev/null
+++ b/package/collectd/0001-src-dpdk_telemetry.c-fix-build-on-musl.patch
@@ -0,0 +1,37 @@
+From 70318d6bcf7ef89e1a73fc775d33f4c854aed484 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+[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
+
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 1b6b3384c4..f1f3c2ed9f 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -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
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 24cdad7e1b..52b218e139 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,2/6] package/collectd: remove lvm Fabrice Fontaine
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option Fabrice Fontaine
@ 2020-04-15  6:30 ` Fabrice Fontaine
  2020-04-21 17:24   ` [Buildroot] [PATCH v3, 4/6] " Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option Fabrice Fontaine
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

InfluxDB support is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/605fcdcddeefb23b945203079e5c87625ce0e336

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/collectd/Config.in   | 6 ++++++
 package/collectd/collectd.mk | 1 +
 2 files changed, 7 insertions(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index f1f3c2ed9f..7186d67c36 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -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
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 52b218e139..964f4dc694 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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) \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
                   ` (2 preceding siblings ...)
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support Fabrice Fontaine
@ 2020-04-15  6:30 ` Fabrice Fontaine
  2020-04-21 17:25   ` Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option Fabrice Fontaine
  2020-04-19 21:38 ` [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Yann E. MORIN
  5 siblings, 2 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

capabilities 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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v2 -> v3 (after review of Thomas Petazzoni):
 - Add dmidecode runtime dependency

 package/collectd/Config.in   | 10 ++++++++++
 package/collectd/collectd.mk |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 7186d67c36..3fc07a9014 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -128,6 +128,16 @@ config BR2_PACKAGE_COLLECTD_BIND
 	help
 	  Collects BIND DNS statistics.
 
+config BR2_PACKAGE_COLLECTD_CAPABILITIES
+	bool "capabilities"
+	depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode
+	select BR2_PACKAGE_DMIDECODE # runtime
+	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
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 964f4dc694..f04ccdb2ff 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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) \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
                   ` (3 preceding siblings ...)
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option Fabrice Fontaine
@ 2020-04-15  6:30 ` Fabrice Fontaine
  2020-04-21 17:25   ` [Buildroot] [PATCH v3, 6/6] " Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  2020-04-19 21:38 ` [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Yann E. MORIN
  5 siblings, 2 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-15  6:30 UTC (permalink / raw)
  To: buildroot

buddyinfo is available since version 5.11.0 and
https://github.com/collectd/collectd/commit/cb19ecf90d89a79836b8b5236d2b66277dd79c5f

It is currently enabled by default

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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(+)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 3fc07a9014..54b218754a 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -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"
 	depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index f04ccdb2ff..6bd1754ad7 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -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) \
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option Fabrice Fontaine
@ 2020-04-19 21:14   ` Yann E. MORIN
  2020-04-19 22:34     ` Fabrice Fontaine
  2020-04-20  5:16     ` Thomas Petazzoni
  2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 2 replies; 18+ messages in thread
From: Yann E. MORIN @ 2020-04-19 21:14 UTC (permalink / raw)
  To: buildroot

Fabrice, All,

+Peter, +Thomas, +Arnout for your feedback below...

On 2020-04-15 08:30 +0200, Fabrice Fontaine spake thusly:
> DPDK 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
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...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
> 
[--SNIP--]
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index 24cdad7e1b..52b218e139 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -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

This code is bugging me: it decorelates the --enable/disable options,
the dependencies and the --with option.

With this patch, this means that is jansoon is enabled, but DPDK
telemetry is not, then we still pass --with-libjansson.

I think the $(if blabla,--enable-bla,--disable-bla) construct should be
limited to thos options that do not require a dependency or another
--with option. If it does, then we should revert to using the
traditional conditional block:

    ifeq ($(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),y)
    COLLECTD_DEPENDENCIES += jansson
    COLLECTD_CONF_OPTS += --enable-dpdk_telemetry --with-libjansson=$(STAGING_DIR)/usr
    else
    COLLECTD_CONF_OPTS += --disable-dpdk_telemetr
    endif

I know you mimicked the existing code, but short of fixing it, could you
please respin patches 3-6 with that in mind, pretty please? But first
wait a bit for another maintainer to expres their opionion: Peter,
Thomas, Arnout: what's your feeling?

Regards,
Yann E. MORIN.

>  ifeq ($(BR2_PACKAGE_LIBCURL),y)
>  COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
>  endif
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf
  2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
                   ` (4 preceding siblings ...)
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option Fabrice Fontaine
@ 2020-04-19 21:38 ` Yann E. MORIN
  5 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2020-04-19 21:38 UTC (permalink / raw)
  To: buildroot

Fabrice, All,

On 2020-04-15 08:30 +0200, Fabrice Fontaine spake thusly:
> autoreconf is not needed since bump to version 5.11.0 in commit
> 57adbfc482454e3fb17172626b2dc971afaf5cfd which dropped patch
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Patches 1 and 2 applied to master, thanks. I'm deffering the rest of the
series for a while, waiting for feedback from the other maintainers...

Regards,
Yann E. MORIN.

> ---
>  package/collectd/collectd.mk | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index c09edebfc9..dda15b0162 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -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 = \
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-04-19 21:14   ` Yann E. MORIN
@ 2020-04-19 22:34     ` Fabrice Fontaine
  2020-04-20  5:16     ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Fabrice Fontaine @ 2020-04-19 22:34 UTC (permalink / raw)
  To: buildroot

Hi Yann,

Le dim. 19 avr. 2020 ? 23:15, Yann E. MORIN <yann.morin.1998@free.fr> a ?crit :
>
> Fabrice, All,
>
> +Peter, +Thomas, +Arnout for your feedback below...
>
> On 2020-04-15 08:30 +0200, Fabrice Fontaine spake thusly:
> > DPDK 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
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  ...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
> >
> [--SNIP--]
> > diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> > index 24cdad7e1b..52b218e139 100644
> > --- a/package/collectd/collectd.mk
> > +++ b/package/collectd/collectd.mk
> > @@ -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
>
> This code is bugging me: it decorelates the --enable/disable options,
> the dependencies and the --with option.
>
> With this patch, this means that is jansoon is enabled, but DPDK
> telemetry is not, then we still pass --with-libjansson.
Indeed, but jansson is not only used by DPDK but also by the
capabilities plugin (fifth patch of the serie).
However, that's true that I could move the jansson dependency under
the BR2_PACKAGE_JANSSON block but as you pointed out I basically
mimicked the existing code.
>
> I think the $(if blabla,--enable-bla,--disable-bla) construct should be
> limited to thos options that do not require a dependency or another
> --with option. If it does, then we should revert to using the
> traditional conditional block:
>
>     ifeq ($(BR2_PACKAGE_COLLECTD_DPDK_TELEMETRY),y)
>     COLLECTD_DEPENDENCIES += jansson
>     COLLECTD_CONF_OPTS += --enable-dpdk_telemetry --with-libjansson=$(STAGING_DIR)/usr
>     else
>     COLLECTD_CONF_OPTS += --disable-dpdk_telemetr
>     endif
>
> I know you mimicked the existing code, but short of fixing it, could you
> please respin patches 3-6 with that in mind, pretty please? But first
> wait a bit for another maintainer to expres their opionion: Peter,
> Thomas, Arnout: what's your feeling?
>
> Regards,
> Yann E. MORIN.
>
> >  ifeq ($(BR2_PACKAGE_LIBCURL),y)
> >  COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
> >  endif
> > --
> > 2.25.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
Best Regards,

Fabrice

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-04-19 21:14   ` Yann E. MORIN
  2020-04-19 22:34     ` Fabrice Fontaine
@ 2020-04-20  5:16     ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2020-04-20  5:16 UTC (permalink / raw)
  To: buildroot

On Sun, 19 Apr 2020 23:14:56 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> > @@ -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  
> 
> This code is bugging me: it decorelates the --enable/disable options,
> the dependencies and the --with option.
> 
> With this patch, this means that is jansoon is enabled, but DPDK
> telemetry is not, then we still pass --with-libjansson.

If libjansson is only detected/used when --enable-dpdk-telemetry is
passed, then I agree with you.

> I think the $(if blabla,--enable-bla,--disable-bla) construct should be
> limited to thos options that do not require a dependency or another
> --with option. If it does, then we should revert to using the
> traditional conditional block:

I agree that I don't like how collectd.mk is written today. I very much
prefer each option to be handled in one place, like you illustrated
below, rather than handling separately the <pkg>_DEPENDENCIES part and
the <pkg>_CONF_OPTS part.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 4/6] package/collectd: add InfluxDB support
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support Fabrice Fontaine
@ 2020-04-21 17:24   ` Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Asaf Kahlon @ 2020-04-21 17:24 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, Apr 15, 2020 at 9:28 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> InfluxDB support is available since version 5.11.0 and
> https://github.com/collectd/collectd/commit/605fcdcddeefb23b945203079e5c87625ce0e336
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/collectd/Config.in   | 6 ++++++
>  package/collectd/collectd.mk | 1 +
>  2 files changed, 7 insertions(+)
>
> diff --git a/package/collectd/Config.in b/package/collectd/Config.in
> index f1f3c2ed9f..7186d67c36 100644
> --- a/package/collectd/Config.in
> +++ b/package/collectd/Config.in
> @@ -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
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index 52b218e139..964f4dc694 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -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) \
> --
> 2.25.1
>
Reviewed-by: Asaf Kahlon <asafka7@gmail.com>

Regards,
Asaf.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option Fabrice Fontaine
@ 2020-04-21 17:25   ` Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Asaf Kahlon @ 2020-04-21 17:25 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, Apr 15, 2020 at 9:28 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> capabilities 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
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v2 -> v3 (after review of Thomas Petazzoni):
>  - Add dmidecode runtime dependency
>
>  package/collectd/Config.in   | 10 ++++++++++
>  package/collectd/collectd.mk |  2 ++
>  2 files changed, 12 insertions(+)
>
> diff --git a/package/collectd/Config.in b/package/collectd/Config.in
> index 7186d67c36..3fc07a9014 100644
> --- a/package/collectd/Config.in
> +++ b/package/collectd/Config.in
> @@ -128,6 +128,16 @@ config BR2_PACKAGE_COLLECTD_BIND
>         help
>           Collects BIND DNS statistics.
>
> +config BR2_PACKAGE_COLLECTD_CAPABILITIES
> +       bool "capabilities"
> +       depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode
> +       select BR2_PACKAGE_DMIDECODE # runtime
> +       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
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index 964f4dc694..f04ccdb2ff 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -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) \
> --
> 2.25.1
>
Reviewed-by: Asaf Kahlon <asafka7@gmail.com>

Regards,
Asaf.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 6/6] package/collectd: add buddyinfo option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option Fabrice Fontaine
@ 2020-04-21 17:25   ` Asaf Kahlon
  2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Asaf Kahlon @ 2020-04-21 17:25 UTC (permalink / raw)
  To: buildroot

Hello,

On Wed, Apr 15, 2020 at 9:29 AM Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
>
> buddyinfo is available since version 5.11.0 and
> https://github.com/collectd/collectd/commit/cb19ecf90d89a79836b8b5236d2b66277dd79c5f
>
> It is currently enabled by default
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> 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(+)
>
> diff --git a/package/collectd/Config.in b/package/collectd/Config.in
> index 3fc07a9014..54b218754a 100644
> --- a/package/collectd/Config.in
> +++ b/package/collectd/Config.in
> @@ -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"
>         depends on BR2_aarch64 || BR2_i386 || BR2_x86_64 # dmidecode
> diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
> index f04ccdb2ff..6bd1754ad7 100644
> --- a/package/collectd/collectd.mk
> +++ b/package/collectd/collectd.mk
> @@ -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) \
> --
> 2.25.1
>
Reviewed-by: Asaf Kahlon <asafka7@gmail.com>

Regards,
Asaf.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option Fabrice Fontaine
  2020-04-19 21:14   ` Yann E. MORIN
@ 2020-08-17 10:18   ` Thomas Petazzoni
  2020-08-28 16:49     ` Peter Korsgaard
  1 sibling, 1 reply; 18+ messages in thread
From: Thomas Petazzoni @ 2020-08-17 10:18 UTC (permalink / raw)
  To: buildroot

On Wed, 15 Apr 2020 08:30:05 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> DPDK 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
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...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

Even though I dislike how the options/dependencies are handled in
collectd.mk, this particular patch is not really the culprit, and it
fixes a build issue, so I've applied.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 4/6] package/collectd: add InfluxDB support
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support Fabrice Fontaine
  2020-04-21 17:24   ` [Buildroot] [PATCH v3, 4/6] " Asaf Kahlon
@ 2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2020-08-17 10:18 UTC (permalink / raw)
  To: buildroot

On Wed, 15 Apr 2020 08:30:06 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> InfluxDB support is available since version 5.11.0 and
> https://github.com/collectd/collectd/commit/605fcdcddeefb23b945203079e5c87625ce0e336
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/collectd/Config.in   | 6 ++++++
>  package/collectd/collectd.mk | 1 +
>  2 files changed, 7 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option Fabrice Fontaine
  2020-04-21 17:25   ` Asaf Kahlon
@ 2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2020-08-17 10:18 UTC (permalink / raw)
  To: buildroot

On Wed, 15 Apr 2020 08:30:07 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> capabilities 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
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v2 -> v3 (after review of Thomas Petazzoni):
>  - Add dmidecode runtime dependency

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 6/6] package/collectd: add buddyinfo option
  2020-04-15  6:30 ` [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option Fabrice Fontaine
  2020-04-21 17:25   ` [Buildroot] [PATCH v3, 6/6] " Asaf Kahlon
@ 2020-08-17 10:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2020-08-17 10:18 UTC (permalink / raw)
  To: buildroot

On Wed, 15 Apr 2020 08:30:08 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> buddyinfo is available since version 5.11.0 and
> https://github.com/collectd/collectd/commit/cb19ecf90d89a79836b8b5236d2b66277dd79c5f
> 
> It is currently enabled by default
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Asaf Kahlon):
>  - Add missing COLLECTD_ prefix for buddyinfo option in Config.in

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option
  2020-08-17 10:18   ` Thomas Petazzoni
@ 2020-08-28 16:49     ` Peter Korsgaard
  0 siblings, 0 replies; 18+ messages in thread
From: Peter Korsgaard @ 2020-08-28 16:49 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Wed, 15 Apr 2020 08:30:05 +0200
 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

 >> DPDK 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
 >> 
 >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 >> ---
 >> ...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

Committed to 2020.05.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2020-08-28 16:49 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-15  6:30 [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Fabrice Fontaine
2020-04-15  6:30 ` [Buildroot] [PATCH v3,2/6] package/collectd: remove lvm Fabrice Fontaine
2020-04-15  6:30 ` [Buildroot] [PATCH v3, 3/6] package/collectd: add DPDK_TELEMETRY option Fabrice Fontaine
2020-04-19 21:14   ` Yann E. MORIN
2020-04-19 22:34     ` Fabrice Fontaine
2020-04-20  5:16     ` Thomas Petazzoni
2020-08-17 10:18   ` Thomas Petazzoni
2020-08-28 16:49     ` Peter Korsgaard
2020-04-15  6:30 ` [Buildroot] [PATCH v3,4/6] package/collectd: add InfluxDB support Fabrice Fontaine
2020-04-21 17:24   ` [Buildroot] [PATCH v3, 4/6] " Asaf Kahlon
2020-08-17 10:18   ` Thomas Petazzoni
2020-04-15  6:30 ` [Buildroot] [PATCH v3, 5/6] package/collectd: add capabilities option Fabrice Fontaine
2020-04-21 17:25   ` Asaf Kahlon
2020-08-17 10:18   ` Thomas Petazzoni
2020-04-15  6:30 ` [Buildroot] [PATCH v3,6/6] package/collectd: add buddyinfo option Fabrice Fontaine
2020-04-21 17:25   ` [Buildroot] [PATCH v3, 6/6] " Asaf Kahlon
2020-08-17 10:18   ` Thomas Petazzoni
2020-04-19 21:38 ` [Buildroot] [PATCH v3,1/6] package/collectd: drop autoreconf Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox