| 1 |
commit: 9620716ff31fa14f47c7195eaae84311815d6494 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 30 11:58:16 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 30 14:10:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9620716f |
| 7 |
|
| 8 |
app-metrics/collectd: add slurm plugin |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
app-metrics/collectd/collectd-5.11.0.ebuild | 9 +++++---- |
| 14 |
profiles/arch/amd64/package.use.mask | 4 ++++ |
| 15 |
profiles/arch/base/package.use.mask | 4 ++++ |
| 16 |
profiles/arch/x86/package.use.mask | 4 ++++ |
| 17 |
profiles/desc/collectd_plugins.desc | 1 + |
| 18 |
5 files changed, 18 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-metrics/collectd/collectd-5.11.0.ebuild b/app-metrics/collectd/collectd-5.11.0.ebuild |
| 21 |
index 9b6e85c0ec7..06b81f9ad03 100644 |
| 22 |
--- a/app-metrics/collectd/collectd-5.11.0.ebuild |
| 23 |
+++ b/app-metrics/collectd/collectd-5.11.0.ebuild |
| 24 |
@@ -37,6 +37,7 @@ IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux |
| 25 |
# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110) |
| 26 |
# pf: Requires BSD packet filter |
| 27 |
# pinba: Requires MySQL Pinba engine (http://pinba.org/) |
| 28 |
+# redfish: Requires libredfish |
| 29 |
# tape: Requires libkstat (Solaris only) |
| 30 |
# tokyotyrant: Requires tokyotyrant |
| 31 |
# write_riemann: Requires riemann-c-client |
| 32 |
@@ -44,7 +45,7 @@ IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux |
| 33 |
# zone: Solaris only... |
| 34 |
COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer |
| 35 |
dpdkevents dpdkstat dpdk_telemetry grpc intel_pmu intel_rdt lpar |
| 36 |
- mic netapp pf pinba tape tokyotyrant write_riemann xmms zone" |
| 37 |
+ mic netapp pf pinba redfish tape tokyotyrant write_riemann xmms zone" |
| 38 |
|
| 39 |
# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS |
| 40 |
COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind |
| 41 |
@@ -58,8 +59,8 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind |
| 42 |
network network nfs nginx notify_desktop notify_email notify_nagios |
| 43 |
ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events |
| 44 |
ovs_stats perl ping postgresql powerdns processes protocols python |
| 45 |
- python redis routeros rrdcached rrdtool sensors serial sigrok smart |
| 46 |
- snmp snmp_agent statsd swap sysevent syslog table tail tail_csv |
| 47 |
+ python redis routeros rrdcached rrdtool sensors serial sigrok slurm |
| 48 |
+ smart snmp snmp_agent statsd swap sysevent syslog table tail tail_csv |
| 49 |
target_notification target_replace target_scale target_set tcpconns |
| 50 |
teamspeak2 ted thermal threshold turbostat unixsock |
| 51 |
uptime users uuid varnish virt vmem vserver wireless write_graphite |
| 52 |
@@ -124,7 +125,7 @@ COMMON_DEPEND=" |
| 53 |
collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) |
| 54 |
collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) |
| 55 |
collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) |
| 56 |
- collectd_plugins_smart? ( dev-libs/libatasmart ) |
| 57 |
+ collectd_plugins_slurm? ( sys-cluster/slurm ) |
| 58 |
collectd_plugins_snmp? ( net-analyzer/net-snmp ) |
| 59 |
collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) |
| 60 |
collectd_plugins_sysevent? ( dev-libs/yajl:= ) |
| 61 |
|
| 62 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
| 63 |
index 844b2b43071..0555bad5aaa 100644 |
| 64 |
--- a/profiles/arch/amd64/package.use.mask |
| 65 |
+++ b/profiles/arch/amd64/package.use.mask |
| 66 |
@@ -17,6 +17,10 @@ |
| 67 |
|
| 68 |
#--- END OF EXAMPLES --- |
| 69 |
|
| 70 |
+# Thomas Deutschmann <whissi@g.o> (2020-04-30) |
| 71 |
+# sys-cluster/slurm is keyworded on amd64 |
| 72 |
+app-metrics/collectd -collectd_plugins_slurm |
| 73 |
+ |
| 74 |
# Georgy Yakovlev <gyakovlev@g.o (2020-04-26) |
| 75 |
# static-pie works on amd64, #719444 |
| 76 |
sys-libs/glibc -static-pie |
| 77 |
|
| 78 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
| 79 |
index 281b7ebbb18..c9b37b2a795 100644 |
| 80 |
--- a/profiles/arch/base/package.use.mask |
| 81 |
+++ b/profiles/arch/base/package.use.mask |
| 82 |
@@ -1,6 +1,10 @@ |
| 83 |
# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
+# Thomas Deutschmann <whissi@g.o> (2020-04-30) |
| 87 |
+# Dependency is only keyworded on amd64 and x86 |
| 88 |
+app-metrics/collectd collectd_plugins_slurm |
| 89 |
+ |
| 90 |
# Georgy Yakovlev <gyakovlev@g.o> (2020-04-26) |
| 91 |
# static-pie is not implemented on all arches, #719444 |
| 92 |
# https://sourceware.org/glibc/wiki/PortStatus |
| 93 |
|
| 94 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
| 95 |
index b9f6b333ae7..caea569f2bf 100644 |
| 96 |
--- a/profiles/arch/x86/package.use.mask |
| 97 |
+++ b/profiles/arch/x86/package.use.mask |
| 98 |
@@ -1,6 +1,10 @@ |
| 99 |
# Copyright 1999-2020 Gentoo Authors |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
|
| 102 |
+# Thomas Deutschmann <whissi@g.o> (2020-04-30) |
| 103 |
+# sys-cluster/slurm is keyworded on x86 |
| 104 |
+app-metrics/collectd -collectd_plugins_slurm |
| 105 |
+ |
| 106 |
# Georgy Yakovlev <gyakovlev@g.o (2020-04-26) |
| 107 |
# static-pie works on x86, #719444 |
| 108 |
sys-libs/glibc -static-pie |
| 109 |
|
| 110 |
diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc |
| 111 |
index e997f46d1aa..6b779a43a16 100644 |
| 112 |
--- a/profiles/desc/collectd_plugins.desc |
| 113 |
+++ b/profiles/desc/collectd_plugins.desc |
| 114 |
@@ -101,6 +101,7 @@ rrdtool - Build the rrdtool output plugin (writes values to RRD-files) |
| 115 |
sensors - Build the sensors input plugin (reads hardware sensors from lm-sensors) |
| 116 |
serial - Build the serial input plugin (collects the traffic on serial interfaces) |
| 117 |
sigrok - Build the sigrok input plugin (reads measurements from any supported hardware from sigrok project) |
| 118 |
+slurm - Build the slurm input plugin (collects metrics from the SLURM workload manager) |
| 119 |
smart - Build the S.M.A.R.T input plugin (collects S.M.A.R.T statistics from disk drives) |
| 120 |
snmp - Build the snmp input plugin (reads values from network devices using SNMP) |
| 121 |
snmp_agent - Build an input plugin which implements an SNMP AgentX subagent that receives and handles queries from SNMP master agent and returns configured metrics |
Archives