* [Buildroot] [PATCH 1/3] package/collectd: add grpc support
@ 2019-06-10 15:45 Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 2/3] package/collectd: add onewire support Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2019-06-10 15:45 UTC (permalink / raw)
To: buildroot
Use --with-libgrpc++ option as otherwise collectd will try to find
grpc++.pc which is not available
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/collectd/Config.in | 17 +++++++++++++++++
package/collectd/collectd.mk | 7 ++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 990dd44e6d..4ca2204a56 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -549,6 +549,23 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE
Writes data collected to Carbon (Graphite's) storage API.
http://graphite.wikidot.com/start
+config BR2_PACKAGE_COLLECTD_GRPC
+ bool "grpc"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc
+ depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf
+ depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf
+ depends on BR2_HOST_GCC_AT_LEAST_4_8 # grpc -> protobuf
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf
+ select BR2_PACKAGE_GRPC
+ help
+ Send/receive values using the gRPC protocol.
+
+comment "grpc needs a toolchain w/ C++, host and target gcc >= 4.8"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_8 \
+ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+ depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
+
config BR2_PACKAGE_COLLECTD_MQTT
bool "mqtt"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index ca9a9e7a95..6563668ce0 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
- gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lua lvm \
+ gmond hddtemp intel_rdt ipmi java libvirt lpar lua lvm \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut onewire oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
@@ -75,6 +75,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \
$(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \
$(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \
+ $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \
$(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \
$(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \
$(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \
@@ -153,6 +154,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
$(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \
+ $(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
@@ -176,6 +178,9 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis)
# include/library fixups
+ifeq ($(BR2_PACKAGE_GRPC),y)
+COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr
+endif
ifeq ($(BR2_PACKAGE_LIBCURL),y)
COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
endif
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/3] package/collectd: add onewire support
2019-06-10 15:45 [Buildroot] [PATCH 1/3] package/collectd: add grpc support Fabrice Fontaine
@ 2019-06-10 15:45 ` Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 3/3] package/collectd: add lvm support Fabrice Fontaine
2019-10-28 13:06 ` [Buildroot] [PATCH 1/3] package/collectd: add grpc support Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2019-06-10 15:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/collectd/Config.in | 7 +++++++
package/collectd/collectd.mk | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 4ca2204a56..32a7441324 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -359,6 +359,13 @@ config BR2_PACKAGE_COLLECTD_OLSRD
help
Reads information about meshed networks from olsrd.
+config BR2_PACKAGE_COLLECTD_ONEWIRE
+ bool "onewire"
+ select BR2_PACKAGE_OWFS
+ help
+ Collects temperature information from sensors connected over
+ the OneWire bus.
+
config BR2_PACKAGE_COLLECTD_OPENLDAP
bool "openldap"
depends on BR2_USE_WCHAR
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6563668ce0..3ff314bb82 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -17,7 +17,7 @@ COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
gmond hddtemp intel_rdt ipmi java libvirt lpar lua lvm \
madwifi mbmon mic multimeter netapp notify_desktop numa \
- nut onewire oracle perl pf pinba powerdns python routeros \
+ nut oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
tokyotyrant turbostat uuid varnish virt vserver write_kafka \
write_mongodb xencpu xmms zfs_arc zone
@@ -102,6 +102,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \
$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
+ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),--enable-onewire,--disable-onewire) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \
$(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \
$(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \
@@ -164,6 +165,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \
$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
+ $(if $(BR2_PACKAGE_COLLECTD_ONEWIRE),owfs) \
$(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
$(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),postgresql) \
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/collectd: add lvm support
2019-06-10 15:45 [Buildroot] [PATCH 1/3] package/collectd: add grpc support Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 2/3] package/collectd: add onewire support Fabrice Fontaine
@ 2019-06-10 15:45 ` Fabrice Fontaine
2019-10-28 13:06 ` [Buildroot] [PATCH 1/3] package/collectd: add grpc support Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2019-06-10 15:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/collectd/Config.in | 13 +++++++++++++
package/collectd/collectd.mk | 4 +++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 32a7441324..7d375f2c67 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -289,6 +289,19 @@ 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 3ff314bb82..3d0d04826e 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
apple_sensors aquaero ascent barometer dbi dpdkstat email \
- gmond hddtemp intel_rdt ipmi java libvirt lpar lua lvm \
+ gmond hddtemp intel_rdt ipmi java libvirt lpar lua \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut oracle perl pf pinba powerdns python routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
@@ -86,6 +86,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \
$(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \
+ $(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) \
@@ -158,6 +159,7 @@ COLLECTD_DEPENDENCIES = \
$(if $(BR2_PACKAGE_COLLECTD_GRPC),grpc) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \
+ $(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.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] package/collectd: add grpc support
2019-06-10 15:45 [Buildroot] [PATCH 1/3] package/collectd: add grpc support Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 2/3] package/collectd: add onewire support Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 3/3] package/collectd: add lvm support Fabrice Fontaine
@ 2019-10-28 13:06 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-10-28 13:06 UTC (permalink / raw)
To: buildroot
On Mon, 10 Jun 2019 17:45:28 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Use --with-libgrpc++ option as otherwise collectd will try to find
> grpc++.pc which is not available
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/collectd/Config.in | 17 +++++++++++++++++
> package/collectd/collectd.mk | 7 ++++++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
Series applied to master, thanks. I had to rework a bit PATCH 1/3 since
we dropped the host gcc 4.8 option, as we now always require gcc 4.8.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-28 13:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-10 15:45 [Buildroot] [PATCH 1/3] package/collectd: add grpc support Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 2/3] package/collectd: add onewire support Fabrice Fontaine
2019-06-10 15:45 ` [Buildroot] [PATCH 3/3] package/collectd: add lvm support Fabrice Fontaine
2019-10-28 13:06 ` [Buildroot] [PATCH 1/3] package/collectd: add grpc support Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.