aboutsummaryrefslogtreecommitdiff
path: root/package/collectd
diff options
context:
space:
mode:
Diffstat (limited to 'package/collectd')
-rw-r--r--package/collectd/Config.in39
-rw-r--r--package/collectd/collectd.mk9
2 files changed, 42 insertions, 6 deletions
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 9723b1ae1c..82c24fdbc3 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -285,6 +285,11 @@ config BR2_PACKAGE_COLLECTD_HUGEPAGES
help
Reports the number of used and free hugepages on Linux.
+config BR2_PACKAGE_COLLECTD_INFINIBAND
+ bool "infiniband"
+ help
+ Attributes and counters for each port on each IB device.
+
config BR2_PACKAGE_COLLECTD_INTERFACE
bool "interface"
help
@@ -321,11 +326,21 @@ config BR2_PACKAGE_COLLECTD_LOAD
help
Collects the system load.
+config BR2_PACKAGE_COLLECTD_LOGPARSER
+ bool "logparser"
+ help
+ Plugin for filtering and parsing log messages.
+
config BR2_PACKAGE_COLLECTD_MD
bool "md"
help
Collects software-RAID device information.
+config BR2_PACKAGE_COLLECTD_MDEVENTS
+ bool "mdevents"
+ help
+ Events from md (Linux Software RAID) devices.
+
config BR2_PACKAGE_COLLECTD_MEMCACHEC
bool "memcachec"
depends on BR2_INSTALL_LIBSTDCPP
@@ -498,6 +513,11 @@ config BR2_PACKAGE_COLLECTD_SWAP
help
Collects the amount of memory currently written to disk.
+config BR2_PACKAGE_COLLECTD_SYNPROXY
+ bool "synproxy"
+ help
+ Synproxy stats plugin.
+
config BR2_PACKAGE_COLLECTD_TABLE
bool "table"
help
@@ -525,6 +545,16 @@ config BR2_PACKAGE_COLLECTD_THERMAL
help
Reads ACPI thermal zone information.
+config BR2_PACKAGE_COLLECTD_UBI
+ bool "ubi"
+ help
+ UBI (Unsorted Block Images) is an erase block management layer
+ for flash memory devices. UBI serves two purposes, tracking
+ NAND flash bad blocks and providing wear leveling.
+ This plugin collects some stats about UBI devices:
+ * bad physical underlying blocks (bad_peb_count)
+ * max erase counter value (max_ec)
+
config BR2_PACKAGE_COLLECTD_UPTIME
bool "uptime"
help
@@ -582,6 +612,7 @@ comment "Select at least one for collectd to be useful"
config BR2_PACKAGE_COLLECTD_AMQP
bool "amqp"
+ select BR2_PACKAGE_OPENSSL # needs rabbitmq-c with ssl support
select BR2_PACKAGE_RABBITMQ_C
help
Send/receive values via the Advanced Message Queuing Protocol
@@ -604,15 +635,17 @@ config BR2_PACKAGE_COLLECTD_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_TOOLCHAIN_GCC_AT_LEAST_4_8 # grpc -> protobuf
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp
+ depends on BR2_HOST_GCC_AT_LEAST_4_9 # grpc -> host-libabseil-cpp
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc
select BR2_PACKAGE_GRPC
help
Send/receive values using the gRPC protocol.
-comment "grpc needs a toolchain w/ C++, gcc >= 4.8"
+comment "grpc needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
+ || !BR2_HOST_GCC_AT_LEAST_4_9
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 00e33f27df..7db753b342 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -12,6 +12,7 @@ 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
+COLLECTD_CPE_ID_VENDOR = collectd
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
@@ -82,6 +83,7 @@ COLLECTD_CONF_OPTS += \
$(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_INFINIBAND),--enable-infiniband,--disable-infiniband) \
$(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \
$(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \
@@ -89,9 +91,11 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \
$(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \
$(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \
+ $(if $(BR2_PACKAGE_COLLECTD_LOGPARSER),--enable-logparser,--disable-logparser) \
$(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \
$(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \
$(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \
+ $(if $(BR2_PACKAGE_COLLECTD_MDEVENTS),--enable-mdevents,--disable-mdevents) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
$(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \
@@ -128,6 +132,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_SMART),--enable-smart,--disable-smart) \
$(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \
$(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \
+ $(if $(BR2_PACKAGE_COLLECTD_SYNPROXY),--enable-synproxy,--disable-synproxy) \
$(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \
$(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \
$(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \
@@ -136,6 +141,7 @@ COLLECTD_CONF_OPTS += \
$(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \
$(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \
$(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \
+ $(if $(BR2_PACKAGE_COLLECTD_UBI),--enable-ubi,--disable-ubi) \
$(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \
$(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \
$(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \
@@ -191,9 +197,6 @@ 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_JANSSON),y)
COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr
endif