commit: ba9f44cddffb2ae8c4a5f759817499a511449966 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Sep 7 00:45:48 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Sep 7 00:46:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f44cd
app-metrics/collectd: add gpu_nvidia plugin Closes: https://bugs.gentoo.org/740106 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> app-metrics/collectd/collectd-5.12.0.ebuild | 11 +++++++++-- profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/amd64/package.use.stable.mask | 5 +++-- profiles/arch/base/package.use.mask | 4 ++++ profiles/desc/collectd_plugins.desc | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app-metrics/collectd/collectd-5.12.0.ebuild b/app-metrics/collectd/collectd-5.12.0.ebuild index e3d3fc157a4..b4afd4d953e 100644 --- a/app-metrics/collectd/collectd-5.12.0.ebuild +++ b/app-metrics/collectd/collectd-5.12.0.ebuild @@ -52,8 +52,8 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind buddyinfo capabilities ceph cgroups check_uptime chrony connectivity conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount - filecount fscache gmond gps hddtemp hugepages interface ipc ipmi - iptables ipvs irq java lua load logfile logparser log_logstash + filecount fscache gmond gps gpu_nvidia hddtemp hugepages interface ipc + ipmi iptables ipvs irq java lua load logfile logparser log_logstash madwifi match_empty_counter match_hashed match_regex match_timediff match_value mbmon mcelog md memcachec memcached memory modbus mqtt multimeter mysql netlink network network nfs nginx notify_desktop @@ -101,6 +101,7 @@ COMMON_DEPEND=" collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) + collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) @@ -413,6 +414,12 @@ src_configure() { use collectd_plugins_smart || myconf+=" --with-libatasmart=no" use collectd_plugins_gps || myconf+=" --with-libgps=no" + if use collectd_plugins_gpu_nvidia; then + myconf+=" --with-cuda=${EPREFIX}/opt/cuda" + else + myconf+=" --with-cuda=no" + fi + if use perl; then myconf+=" --with-perl-bindings=INSTALLDIRS=vendor" else diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 099a58aefbd..6e4e7e3cd1a 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Thomas Deutschmann <[email protected]> (2020-09-07) +# dev-util/nvidia-cuda-toolkit is keyworded on amd64 +app-metrics/collectd -collectd_plugins_gpu_nvidia + # Thomas Deutschmann <[email protected]> (2020-08-17) # Columnstore engine is supported on amd64 dev-db/mariadb -columnstore diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index f55e89a559d..0020c0a53bb 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,9 +17,10 @@ #--- END OF EXAMPLES --- -# Thomas Deutschmann <[email protected]> (2020-08-05) +# Thomas Deutschmann <[email protected]> (2020-09-07) # sys-cluster/slurm has no stable keywords -app-metrics/collectd collectd_plugins_slurm +# dev-util/nvidia-cuda-toolkit has no stable keywords +app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia # Joonas Niilola <[email protected]> (2020-06-21) # sys-apps/apparmor doesn't have stable keywords. diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index dac55926b80..e95a85a5d18 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Thomas Deutschmann <[email protected]> (2020-09-07) +# dev-util/nvidia-cuda-toolkit is only available on amd64 +app-metrics/collectd collectd_plugins_gpu_nvidia + # Sam James <[email protected]> (2020-07-03) # Rust is only available on some arches # Bug #728558 diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc index ef2d2d9f415..11d1b8eb96b 100644 --- a/profiles/desc/collectd_plugins.desc +++ b/profiles/desc/collectd_plugins.desc @@ -41,6 +41,7 @@ filecount - Build the filecount input plugin (counts the number of files in a di fscache - Build the fscache input plugin (collects information about the file-system based caching infrastructure for network file-systems and other slow media) gmond - Build the gmond input plugin (receives data from gmond, the client daemon of the Ganglia project) gps - Build the gps input plugin (collects number of satellites seen by a GPS receiver using sci-geosciences/gpsd) +gpu_nvidia - Build the NVIDIA GPU input plugin (collects stats from NVIDIA GPU) hddtemp - Build the hddtemp input plugin (collects the temperature of disks from hddtemp daemon) hugepages - Build the hugepages input plugin (collects the number of used and free hugepages on Linux) interface - Build the interface input plugin (collects information about the traffic, packets per second and errors of interfaces)
