Browse Source

package/collectd: add virt support

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 3 years ago
parent
commit
981e7b245a
2 changed files with 21 additions and 1 deletions
  1. 18 0
      package/collectd/Config.in
  2. 3 1
      package/collectd/collectd.mk

+ 18 - 0
package/collectd/Config.in

@@ -591,6 +591,24 @@ config BR2_PACKAGE_COLLECTD_USERS
 	help
 	  Counts the number of users currently logged in.
 
+config BR2_PACKAGE_COLLECTD_VIRT
+	bool "virt"
+	depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS # libvirt
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libvirt
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 # libvirt
+	depends on BR2_PACKAGE_HAS_UDEV # libvirt
+	depends on BR2_USE_WCHAR # libvirt
+	select BR2_PACKAGE_LIBVIRT
+	select BR2_PACKAGE_LIBXML2
+	help
+	  Gather statistics about virtualized guests on a system.
+
+comment "virt needs udev /dev management, a toolchain w/ wchar, kernel headers >= 3.12 (4.11 for AArch64)"
+	depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR || \
+		!(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \
+			(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64))
+
 config BR2_PACKAGE_COLLECTD_VMEM
 	bool "vmem"
 	help

+ 3 - 1
package/collectd/collectd.mk

@@ -22,7 +22,7 @@ COLLECTD_PLUGINS_DISABLE = \
 	madwifi mbmon mic multimeter netapp notify_desktop numa \
 	oracle perl pf pinba powerdns python routeros \
 	rrdcached sigrok tape target_v5upgrade teamspeak2 ted \
-	tokyotyrant turbostat uuid varnish virt vserver write_kafka \
+	tokyotyrant turbostat uuid varnish vserver write_kafka \
 	write_mongodb xencpu xmms zfs_arc zone
 
 COLLECTD_CONF_ENV += LIBS="-lm"
@@ -149,6 +149,7 @@ COLLECTD_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \
 	$(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \
 	$(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \
+	$(if $(BR2_PACKAGE_COLLECTD_VIRT),--enable-virt,--disable-virt) \
 	$(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) \
@@ -197,6 +198,7 @@ COLLECTD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \
 	$(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
+	$(if $(BR2_PACKAGE_COLLECTD_VIRT),libvirt libxml2) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis)