| 1 |
commit: ba9f44cddffb2ae8c4a5f759817499a511449966 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 7 00:45:48 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 7 00:46:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9f44cd |
| 7 |
|
| 8 |
app-metrics/collectd: add gpu_nvidia plugin |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/740106 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
app-metrics/collectd/collectd-5.12.0.ebuild | 11 +++++++++-- |
| 15 |
profiles/arch/amd64/package.use.mask | 4 ++++ |
| 16 |
profiles/arch/amd64/package.use.stable.mask | 5 +++-- |
| 17 |
profiles/arch/base/package.use.mask | 4 ++++ |
| 18 |
profiles/desc/collectd_plugins.desc | 1 + |
| 19 |
5 files changed, 21 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-metrics/collectd/collectd-5.12.0.ebuild b/app-metrics/collectd/collectd-5.12.0.ebuild |
| 22 |
index e3d3fc157a4..b4afd4d953e 100644 |
| 23 |
--- a/app-metrics/collectd/collectd-5.12.0.ebuild |
| 24 |
+++ b/app-metrics/collectd/collectd-5.12.0.ebuild |
| 25 |
@@ -52,8 +52,8 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind |
| 26 |
buddyinfo capabilities ceph cgroups check_uptime chrony connectivity |
| 27 |
conntrack contextswitch cpu cpufreq cpusleep csv curl curl_json |
| 28 |
curl_xml dbi df disk dns drbd email entropy ethstat exec fhcount |
| 29 |
- filecount fscache gmond gps hddtemp hugepages interface ipc ipmi |
| 30 |
- iptables ipvs irq java lua load logfile logparser log_logstash |
| 31 |
+ filecount fscache gmond gps gpu_nvidia hddtemp hugepages interface ipc |
| 32 |
+ ipmi iptables ipvs irq java lua load logfile logparser log_logstash |
| 33 |
madwifi match_empty_counter match_hashed match_regex match_timediff |
| 34 |
match_value mbmon mcelog md memcachec memcached memory modbus mqtt |
| 35 |
multimeter mysql netlink network network nfs nginx notify_desktop |
| 36 |
@@ -101,6 +101,7 @@ COMMON_DEPEND=" |
| 37 |
collectd_plugins_dns? ( net-libs/libpcap ) |
| 38 |
collectd_plugins_gmond? ( sys-cluster/ganglia ) |
| 39 |
collectd_plugins_gps? ( sci-geosciences/gpsd:= ) |
| 40 |
+ collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) |
| 41 |
collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) |
| 42 |
collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) |
| 43 |
collectd_plugins_log_logstash? ( dev-libs/yajl:= ) |
| 44 |
@@ -413,6 +414,12 @@ src_configure() { |
| 45 |
use collectd_plugins_smart || myconf+=" --with-libatasmart=no" |
| 46 |
use collectd_plugins_gps || myconf+=" --with-libgps=no" |
| 47 |
|
| 48 |
+ if use collectd_plugins_gpu_nvidia; then |
| 49 |
+ myconf+=" --with-cuda=${EPREFIX}/opt/cuda" |
| 50 |
+ else |
| 51 |
+ myconf+=" --with-cuda=no" |
| 52 |
+ fi |
| 53 |
+ |
| 54 |
if use perl; then |
| 55 |
myconf+=" --with-perl-bindings=INSTALLDIRS=vendor" |
| 56 |
else |
| 57 |
|
| 58 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
| 59 |
index 099a58aefbd..6e4e7e3cd1a 100644 |
| 60 |
--- a/profiles/arch/amd64/package.use.mask |
| 61 |
+++ b/profiles/arch/amd64/package.use.mask |
| 62 |
@@ -17,6 +17,10 @@ |
| 63 |
|
| 64 |
#--- END OF EXAMPLES --- |
| 65 |
|
| 66 |
+# Thomas Deutschmann <whissi@g.o> (2020-09-07) |
| 67 |
+# dev-util/nvidia-cuda-toolkit is keyworded on amd64 |
| 68 |
+app-metrics/collectd -collectd_plugins_gpu_nvidia |
| 69 |
+ |
| 70 |
# Thomas Deutschmann <whissi@g.o> (2020-08-17) |
| 71 |
# Columnstore engine is supported on amd64 |
| 72 |
dev-db/mariadb -columnstore |
| 73 |
|
| 74 |
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask |
| 75 |
index f55e89a559d..0020c0a53bb 100644 |
| 76 |
--- a/profiles/arch/amd64/package.use.stable.mask |
| 77 |
+++ b/profiles/arch/amd64/package.use.stable.mask |
| 78 |
@@ -17,9 +17,10 @@ |
| 79 |
|
| 80 |
#--- END OF EXAMPLES --- |
| 81 |
|
| 82 |
-# Thomas Deutschmann <whissi@g.o> (2020-08-05) |
| 83 |
+# Thomas Deutschmann <whissi@g.o> (2020-09-07) |
| 84 |
# sys-cluster/slurm has no stable keywords |
| 85 |
-app-metrics/collectd collectd_plugins_slurm |
| 86 |
+# dev-util/nvidia-cuda-toolkit has no stable keywords |
| 87 |
+app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia |
| 88 |
|
| 89 |
# Joonas Niilola <juippis@g.o> (2020-06-21) |
| 90 |
# sys-apps/apparmor doesn't have stable keywords. |
| 91 |
|
| 92 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
| 93 |
index dac55926b80..e95a85a5d18 100644 |
| 94 |
--- a/profiles/arch/base/package.use.mask |
| 95 |
+++ b/profiles/arch/base/package.use.mask |
| 96 |
@@ -1,6 +1,10 @@ |
| 97 |
# Copyright 1999-2020 Gentoo Authors |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
+# Thomas Deutschmann <whissi@g.o> (2020-09-07) |
| 101 |
+# dev-util/nvidia-cuda-toolkit is only available on amd64 |
| 102 |
+app-metrics/collectd collectd_plugins_gpu_nvidia |
| 103 |
+ |
| 104 |
# Sam James <sam@g.o> (2020-07-03) |
| 105 |
# Rust is only available on some arches |
| 106 |
# Bug #728558 |
| 107 |
|
| 108 |
diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc |
| 109 |
index ef2d2d9f415..11d1b8eb96b 100644 |
| 110 |
--- a/profiles/desc/collectd_plugins.desc |
| 111 |
+++ b/profiles/desc/collectd_plugins.desc |
| 112 |
@@ -41,6 +41,7 @@ filecount - Build the filecount input plugin (counts the number of files in a di |
| 113 |
fscache - Build the fscache input plugin (collects information about the file-system based caching infrastructure for network file-systems and other slow media) |
| 114 |
gmond - Build the gmond input plugin (receives data from gmond, the client daemon of the Ganglia project) |
| 115 |
gps - Build the gps input plugin (collects number of satellites seen by a GPS receiver using sci-geosciences/gpsd) |
| 116 |
+gpu_nvidia - Build the NVIDIA GPU input plugin (collects stats from NVIDIA GPU) |
| 117 |
hddtemp - Build the hddtemp input plugin (collects the temperature of disks from hddtemp daemon) |
| 118 |
hugepages - Build the hugepages input plugin (collects the number of used and free hugepages on Linux) |
| 119 |
interface - Build the interface input plugin (collects information about the traffic, packets per second and errors of interfaces) |
Archives