Commit graph

8 commits

Author SHA1 Message Date
Hannu Nyman
9af392d629 collectd: backport "Clarify config file example/placeholder" from #1736
The config file shipped with collectd dates from 2010 and
leads to error messages if luci-statistics & collectd are installed,
as it references several plugins not usually installed, or such ones
that have been renamed since then.

For most users, this file is just a placeholder during collectd installation,
as /usr/bin/stat-genconfig from /etc/init.d/luci_statistics will overwrite it.

Sanitize and shorten the placeholder config file:
* Reference actively only the default plugins installed by luci statistics.
* Match the placeholder config with the genuine config from luci statistics.

If somebody uses collectd separately from luci statistics, he will need to
edit these settings anyway.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-09-04 15:03:58 +03:00
Hannu Nyman
42f2974f3c collectd: backport the enablement of entropy plugin to for-15.05
Enable 'entropy' plugin also for collectd 5.4.2.
Works ok.

( backport of 35552db4ee )

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-09-04 15:03:58 +03:00
Michael Heimpold
f59d4a76f8 collectd: unbreak collectd-mod-modbus
I tested it successfully on a Asus WL-500gP V2, querying
a Modbus TCP server.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2015-03-13 22:41:47 +01:00
Hannu Nyman
5dfdf5374c collectd: update to 5.4.2
Update collectd, base of Luci statistics, to 5.4.2.

Patches have been refreshed.
905-fix-sigrok-upstream-patch-post-541 was removed as unnecessary.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-03-02 19:52:46 +02:00
Jo-Philipp Wich
68e57c7b49 collectd: unbreak collectd-mod-sensors
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2014-10-29 21:58:09 +01:00
Hannu Nyman
1b0bd00838 collectd: Update to 5.4.1
-update collectd to the current release 5.4.1
-fix sigrok glib check (upstream patch after 5.4.1)

Note:
Changes are required also to luci-statistics in Luci source.
Patch in http://patchwork.openwrt.org/patch/5303/

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2014-09-09 19:45:14 +03:00
Steven Barth
e373aa5868 Disable various plugins with mising dependencies
Signed-off-by: Steven Barth <steven@midlink.org>
2014-07-18 12:01:33 +02:00
Jo-Philipp Wich
56fd1eaa78 collectd: import from packages, add myself as maintainer
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2014-06-11 16:43:00 +02:00