1 |
commit: 1ddc0ca8fd3e557a2a7b64f960839700d209b43a |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Wed Mar 30 20:28:49 2011 +0000 |
4 |
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 30 20:28:49 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1ddc0ca8 |
7 |
|
8 |
[app-admin/collectd] Added support for sys-power/nut |
9 |
|
10 |
(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE) |
11 |
|
12 |
--- |
13 |
app-admin/collectd/ChangeLog | 4 +++ |
14 |
app-admin/collectd/Manifest | 32 ++++++++++++++-------------- |
15 |
app-admin/collectd/collectd-4.10.3.ebuild | 5 ++- |
16 |
app-admin/collectd/metadata.xml | 1 + |
17 |
4 files changed, 24 insertions(+), 18 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog |
20 |
index 8544f0f..a3b0a9f 100644 |
21 |
--- a/app-admin/collectd/ChangeLog |
22 |
+++ b/app-admin/collectd/ChangeLog |
23 |
@@ -3,6 +3,10 @@ |
24 |
# $Header: $ |
25 |
|
26 |
30 Mar 2011; Andreas K. Huettel <dilfridge@g.o> |
27 |
+ collectd-4.10.3.ebuild, metadata.xml: |
28 |
+ Added support for sys-power/nut |
29 |
+ |
30 |
+ 30 Mar 2011; Andreas K. Huettel <dilfridge@g.o> |
31 |
collectd-4.10.3.ebuild: |
32 |
Works now, thanks to octo and bonbons on #collectd for the help! |
33 |
|
34 |
|
35 |
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest |
36 |
index b2ef1c6..2349048 100644 |
37 |
--- a/app-admin/collectd/Manifest |
38 |
+++ b/app-admin/collectd/Manifest |
39 |
@@ -16,24 +16,24 @@ EBUILD collectd-4.10.2-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4e2f64885 |
40 |
EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb |
41 |
EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814 |
42 |
EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d529f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbebcefa18d510466047055d1578d760245a2b5e69632db786cb350c357 |
43 |
-EBUILD collectd-4.10.3.ebuild 11340 RMD160 fec4ebcdfb521099d0f6ec6b5d745bd2ed1498e7 SHA1 548493661b434667a19de6a0fbe1103681238ca1 SHA256 7d9800456083a8e383057b32ec8b84a081a53956d9328e348635fc0f7e09de5c |
44 |
-MISC ChangeLog 5818 RMD160 cbf37eb1b802a6f6da79e023aa5d3ee3b276a8f3 SHA1 0bd7d92b39831c31e2b701db2d351b65775e0eeb SHA256 54b8bbbc4fbf1d3bddeb402f88610172a7e4ca3dcf2aed7fbe6c93fa30661285 |
45 |
-MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4e59f96530a8ab9471ab8620efee506076ef4e546eb88 |
46 |
+EBUILD collectd-4.10.3.ebuild 11383 RMD160 d1ca4225cd5ebe4d4726eff46dac18b0d3f02535 SHA1 8caf55275c051ef6cb095ae1608ffca6d4cf2c98 SHA256 2eabc4f40e56e746f81ff1050a15f2f6a01475a30374969c438c27e36b7ce898 |
47 |
+MISC ChangeLog 5950 RMD160 3ea07fbce63980876ee7a8a68997784bd0138333 SHA1 73da294e1887c2826476eafbb8587d8b32265923 SHA256 883129fc7a98c684492fd8629273c8ec44187d631afaf094841d0744d3b1dad9 |
48 |
+MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc |
49 |
MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f4786ae985fa7b9bac7706d34f359c6d4518ac6b956f |
50 |
-----BEGIN PGP SIGNATURE----- |
51 |
Version: GnuPG v2.0.17 (GNU/Linux) |
52 |
|
53 |
-iQIcBAEBCgAGBQJNk40/AAoJENwGBM22xffe2msQAJ6vgfTdNuFUdibjY3dx4DUo |
54 |
-pKC1iYvyjvQwOw02nc2VBQHrsiIwsFQJgWfN2NK/AOPRCRqayAY8etfsYsc/ESy1 |
55 |
-ccUv3Bqb1785sTFf6RczxaBnpVvKNp1twOEp2BOY/uoLwRKLbZfuU5+shJM4jD/B |
56 |
-csEXylQvq1/suFqgx+kfuVB4KzaGREKwZYdKd9dHVcJJxpvJDMwbyEPT5+cKyGgV |
57 |
-kgyB9tjwWvRbhu1B4J5Qb4l1hWrXVc8MY2l/J5vurbRAD3vrT1h2jkV1cBKAwbN1 |
58 |
-csjYYw99YA5qpGTtF6ZHe+z/FQz6bVW/117rm+rHuyIYfl7uNurbSKbELGJX/+Sv |
59 |
-E9qtXz8rztVgUnu+qWFNc+VUOogbzy9xINZi0GOuEcL9U34K6WAoIe4ECcHL/CEU |
60 |
-uwplNYDS0g/n1RPn65Sup5lYph95KM+jG7LUMwkvSKk5uJXtzFcjLZ9Q9XkkwvME |
61 |
-GSsGazdEGBNL3DTnEKvwUbfQjv9G42eAdFTsBLOPOFyLAgetvzBoEjWxuTgGKsHf |
62 |
-jY5MLeACxix9GQQct1L3osm/O8K43DLtMkwyn9AcI9EiePELFOydI2h82elugL8g |
63 |
-iOVa+ArF6I+f57Rsc5kCxWMJfpuQFbrJp8AiofHd6HPOwA44ThCTbmVe08CT8TLS |
64 |
-hqtiW4bAPIypPaoGFBxZ |
65 |
-=mCVN |
66 |
+iQIcBAEBCgAGBQJNk5KBAAoJENwGBM22xffeZsoQAKfgGm1UP/JiQcXVAUipOo0M |
67 |
+6m88aYvwBHwbDyaFOYoDzuidgypLcxSktso/LlV9sv6dWX8sATqGYykiRgoaWHGU |
68 |
+4ov04Rm+F7eXo/bu30lSreGzcgbK48RGcWGnu4GIyBJtqdCquDJd9MwA6WYrmthS |
69 |
+qxGaMAkj0PezdbI04ckw317l2MrLnUnKH1mVwSHwkOCq8V4xJHXBPJBQzW6qaZgf |
70 |
+rR1B4ZbeAgV7Xuv9HRWdqcKoxEKCsKRdigNqng4CRjuiIUfIgHP/kBuIrfAS7NCF |
71 |
+FxSc/goKuHQFB9vu3QXD0PWveY31dXQhDCTSniwjTgMYncPuNjpUJ2T92To7IFFG |
72 |
+ZXYlEwMjJSdLz8GHkkn8srMFPcbXGUVOM5IjefjLR0wKszbM82R8IGVa23quDXjU |
73 |
+acj1N7kfheXokHoXayc0b9iTu8nYqXsAgEC4ISFw8ykwJL4S1Chf7CWefw2dh33U |
74 |
+r22fcAJfB3msRxJXpzaOEtJJufk2ugf7K4sf1E+7+RQWnLWetXhSeG9d/JBpzXC+ |
75 |
+24yqsXGjlruSMYljrRVhh2ivif8A5kWdXH8fXbNaAz80BXQwAEWPU0q6rstKc2Ve |
76 |
+cw4bRzpJSnyFfcUYnEhPsUSfYS4a4v6USBWDR2ooJ1jH0IX6IK2kMOwUUrWNoilB |
77 |
+W+yKO2vjc84KDpYCfPOU |
78 |
+=17IF |
79 |
-----END PGP SIGNATURE----- |
80 |
|
81 |
diff --git a/app-admin/collectd/collectd-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3.ebuild |
82 |
index 1503f40..4937f53 100644 |
83 |
--- a/app-admin/collectd/collectd-4.10.3.ebuild |
84 |
+++ b/app-admin/collectd/collectd-4.10.3.ebuild |
85 |
@@ -21,13 +21,13 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin" |
86 |
COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms" |
87 |
|
88 |
# Plugins that still need some work |
89 |
-COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc nut modbus" |
90 |
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus" |
91 |
|
92 |
# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS |
93 |
COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch |
94 |
cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy exec filecount fscache gmond |
95 |
hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec |
96 |
- memcached memory multimeter mysql netlink network nfs nginx ntpd olsrd |
97 |
+ memcached memory multimeter mysql netlink network nfs nginx ntpd nut olsrd |
98 |
onewire openvpn perl ping postgresql powerdns processes protocols python |
99 |
rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal |
100 |
tokyotyrant uptime users vmem vserver wireless csv exec logfile network |
101 |
@@ -67,6 +67,7 @@ COMMON_DEPEND=" |
102 |
collectd_plugins_nginx? ( net-misc/curl ) |
103 |
collectd_plugins_notify_desktop? ( x11-libs/libnotify ) |
104 |
collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) |
105 |
+ collectd_plugins_nut? ( sys-power/nut ) |
106 |
collectd_plugins_onewire? ( sys-fs/owfs ) |
107 |
collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) |
108 |
collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) |
109 |
|
110 |
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml |
111 |
index 5188889..401f206 100644 |
112 |
--- a/app-admin/collectd/metadata.xml |
113 |
+++ b/app-admin/collectd/metadata.xml |
114 |
@@ -58,6 +58,7 @@ |
115 |
<flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag> |
116 |
<flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag> |
117 |
<flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> |
118 |
+ <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> |
119 |
<flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag> |
120 |
<flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag> |
121 |
<flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> |