Commit Graph

47 Commits

Author SHA1 Message Date
Sebastian Kemper 511868f004 collectd: enable mysql plugin
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-04-29 10:25:11 +02:00
Daniel Golle 59ec4cc5d7 collectd: modbus: backport support for little-endian values
Support for little-endian word-order of 32-bit fields was added
upstream recently. Import the corresponding PR
https://github.com/collectd/collectd/pull/2660
into a local patch and bump package release.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-02-28 12:51:28 +01:00
Hannu Nyman f893929455 collectd: enable MQTT plugin
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-02-15 09:27:02 +02:00
Jonathan McDowell 4ba4d8232d utils/collectd: Re-add option to enable encrypted network output
The collectd network plugin has the ability to sign and/or encrypt its
traffic, allowing secure interaction with other collectd instances. This
had been disabled due to issues with the collectd build system.
Fix up the configure parameters to work correctly and re-add the option.

Signed-off-by: Jonathan McDowell <noodles@earth.li>
2018-01-17 22:03:32 +00:00
Thomas Huehn 55e530747f collectd: upgrade package collectd to version 5.8.0
This patch upgrades the collectd package from 5.7.2 to 5.8.2.
All openwrt patches got either updated or deleted in case they
are already included into upstream collectd.
The new collectd 5.8.0 package compiles and got tested on current
lede trunk with latest luci on an PCengines APU. All default plugins
(enabled via Openwrt  Makefile) - so also iwinfo - are running fine
with the new version.

Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>

Amended with the following changes:

* preserve git file history by avoiding unnecessary patch renames
* mark new plugins introduced with 5.8 branch as disabled

Compile tested all plugins with ipq806x

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-12-06 10:44:11 +02:00
Hannu Nyman 63a45e6de3 collectd: uptime plugin: apply fix from upstream
Uptime plugin fails to adjust for system time changes after boot.
As Openwrt/LEDE routers usually do not have a RTC, the system time
gets adjusted with NTP possibly after collectd has already started.
But collectd continues to use the initial time set by 'sysfixtime',
which can lead to incorrect uptime calculations.

Apply a proposed fix from upstream that uses /proc/uptime
Reference to https://github.com/collectd/collectd/pull/2034

Fixes #4819

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-09-15 00:18:34 +03:00
Hannu Nyman afeb8d0caa collectd: update to 5.7.2
* update collectd to 5.7.2
* drop backported upstream patch that is now in release
* refresh patches

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-06-10 22:12:52 +03:00
Hannu Nyman b3ed64c441 collectd: build cpufreq also for armvirt target
Enable collectd-mod-cpufreq also for armvirt to make it
available for ipq806x devices in LEDE buildbot snapshots.

LEDE phase2 buildbot for arm_cortex-a15_neon-vfpv4 that is
the package arch for ipq806x, uses armvirt SDK instead of
ipq806x SDK.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-04-28 19:07:27 +03:00
Hannu Nyman b7ae80dc69 collectd: upstream fix for vulnerability in network plugin
Import an upstream fix for a DDoS vulnerability in the
network plugin: CVE-2017-7401

Refresh patches.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-04-20 18:52:08 +03:00
Hannu Nyman f213e6dd2d collectd: disable plugin for the depracated madwifi driver
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-03-01 09:54:23 +02:00
Miroslav Lichvar e4bf8b7c32 collectd: package chrony and match plugins
Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
2017-02-23 10:53:14 +01:00
Hannu Nyman ca4706eedc collectd: disable libyajl detection
Disable also detection for libyajl that buildbot picked up.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-06 19:20:15 +02:00
Hannu Nyman d1441d0424 collectd: avoid libcap dependency
Buildbot revealed that Collectd 5.7.1 uses libcap to evaluate system
capabilities and display advice on some plugins (dns, iptables, exec,
ping, ceph, turbostat).

Disable the check in configure.ac in order to avoid a dependency
for libcap. (It is not that big, only 6 kB .ipk, but still avoid that.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-06 16:40:43 +02:00
Hannu Nyman 616520a76e collectd: remove encryption feature from network plugin
Remove the encryption functionality from the network plugin.
It is a non-core functionality and causes a need for additional
dependency on the main program when enabled in 5.7.1.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-06 11:32:38 +02:00
Hannu Nyman a3b019fce5 collectd: fix 5.7.1 compilation with encrypted network
The encrypted network feature seems to have changed between 5.5.3 and 5.7.1.
Adjust Makefile to enable compilation with that feature.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-06 11:32:38 +02:00
Hannu Nyman 2fc5a82b48 collectd: update to 5.7.1
Update collectd to version 5.7.1

* replace 003-remove-werror.patch with configure option
* remove 200-fix-git-describe-error.patch that is now unnecessary
* reformat other patches due to whitespace changes
* add new plugins to the list as disabled

* correct download & homepage links
* add myself as the second maintainer

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-02-06 11:32:38 +02:00
Daniel Dickinson a23c4e85c5 net/nut: Build optional separate packages and ucify
With a LuCI app (of which I have one written) ucification makes
sense (and is in fact needed), so ucify the initscripts.

Also, rather than making selection of things to include an image
a matter of selecting compile-time config options, make optional
things into seperate packages that are built in default builds,
and leave selection of what to include or not up to the user
(e.g. using ImageBuilder, or adding packages via opkg).

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
2017-01-11 18:53:58 -05:00
Hannu Nyman ea44014936 collectd: update to 5.5.3
Update collectd to 5.5.3

Release notes at https://github.com/collectd/collectd/releases/tag/collectd-5.5.3

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-12-22 17:25:05 +02:00
Hannu Nyman 450101bea2 collectd: enable cpufreq plugin also for ipq806x
Enable cpufreq plugin also for ipq806x,
as IPQ8065 supports CPU frequency scaling.

Run-tested with Netgear R7800.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-11-10 16:04:02 +02:00
Chris Blake 32b7bce818 utils/collectd: Add cpufreq module
This change enables building of the built-in cpufreq module within Collectd, which is very useful on x86 and mvebu targets that support CPU frequency scaling. Note that luci-app-statistics currently does not have support for rendering this.

Signed-off-by: Chris Blake <chrisrblake93 at gmail.com>
2016-10-11 02:05:13 -05:00
Hannu Nyman cac355eae1 collectd: Enable tail_csv plugin
Enable tail_csv plugin that "follows" (tails) and parses CSV files.
Compile-tested with ar71xx.
This closes #3083

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-22 17:54:10 +03:00
Hannu Nyman 5148a67262 collectd: bump version to 5.5.2
* Bump collectd version to 5.5.2.
* Refresh patches.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-08-14 12:10:26 +03:00
Jo-Philipp Wich 9843f170d7 treewide: replace my defunct email address
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-06-07 12:00:59 +02:00
Daniel Dickinson 817fba835c utils/collectd: Disable libudev linking
At least when building with OpenWrt SDK, if libudev is present
(even if not actually used by the system), then at least the
disk plugin attempts to link against udev, which results in
packages failure due to lack of dependencies, and it's not
desirable to add a dependency on udev just because udev
was built for the SDK, so we disable libudev support
explicity.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>

Conflicts:
	utils/collectd/Makefile
2016-05-15 20:38:20 -04:00
Jo-Philipp Wich ea01eccee0 collectd: ensure that /var/lib/collectd exists
With the conversion to procd a required mkdir has been dropped, readd it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-27 21:45:36 +02:00
Jo-Philipp Wich 8228cee3f3 collectd: stop service on shutdown
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-15 12:33:32 +02:00
Daniel Dickinson ad7147839c utils/collectd: Add option to enable encrypted network output
The network plugin has the option of encrypting traffic; add a
config option to allow enabling encrypting network plugin traffic.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>

Conflicts:
	utils/collectd/Makefile
2016-03-13 09:46:31 -04:00
Hannu Nyman a62ff02b8d collectd: use procd
Change collectd to use procd for startup.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-03 19:00:14 +02:00
Hannu Nyman 11d3b98950 collectd: Update to 5.5.1
Update collectd, the backbone of Luci statistics, to 5.5.1

Refresh patches. Main changes:
 - Remove 500-upstream-parallel-build-fix.patch (implemented upstream)
 - Add 600-fix-libmodbus-detection.patch to revert an upstream change
   that broke libmodbus detection in collectd's configure script

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-03 18:59:37 +02:00
Daniel Dickinson 4fc1ad88f7 utils/collectd: Really prevent perl bindings
--with-perl-bindings= is insufficient, --without-perl-bindings is required
to actually prevent perl bindings when perl has been built for the target.

Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
2016-01-11 03:57:44 -05:00
David Woodhouse 69e92a9bef collectd: enable nut plugin
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2015-11-22 12:42:51 +00:00
Oliver Middleton 1df252e4c8 collectd: add $(INSTALL_DIR) $(1)/etc/collectd/conf.d
/etc/collectd/conf.d is referenced in the default config so should be installed to prevent the following in syslog every boot:
Fri Oct  9 02:09:38 2015 user.emerg : configfile: stat (/etc/collectd/conf.d) failed: No such file or directory

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
2015-10-28 01:35:20 +00:00
Hannu Nyman 91041ead33 collectd: Delay first data read cycle by 1s
Some collectd plugins launch third-party plugins that have variation in
initialisation time (like libpcap). Recently (since kernel bump to 4.1)
the DNS plugin has been causing collectd to crash semi-randomly at startup
on MIPS based WNDR3700.

Debugging led to realisation that the DNS plugin seems to require at least
0.1s time to start, before the first data reading attempt starts.

By default, the first data read cycle starts immediately, while apaprently
some of the plugins may still be asyncronously initialising. To make things
safe, this patch adds 1 second delay before the first data read cycle.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-10-07 12:51:33 +03:00
Hannu Nyman e2699e23f6 collectd: backport parallel build fix from upstream
Backport a fix for parallel build from upstream,
where it has been commited to both trunk and 5.5 branch.

https://github.com/collectd/collectd/issues/1146
780e6a7602

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-10-02 20:31:42 +03:00
Tim Harvey a8c37348b2 collectd: disable perl bindings from dev host
if a user's env has PERL_MM_OPT defined collect will fail to build. Adding
--with-perl-bindings="" will override this env var.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
2015-10-01 20:39:03 +02:00
Kevin Darbyshire-Bryant a79e1d9369 collectd: netlink module remove ip package dependency
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2015-09-21 15:48:43 +01:00
Kevin Darbyshire-Bryant c7277c42ec collectd: netlink module re-enabled
Collectd netlink module re-enabled and libnl library dependency
satisfied with mini libmnl.

$(eval $(call BuildPlugin,netlink,netlink
input,netlink,+PACKAGE_collectd-mod-netlink:ip
+PACKAGE_collectd-mod-netlink:libmnl))

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2015-09-21 10:59:42 +01:00
Hannu Nyman 8e944a0826 collectd: Clarify config file example/placeholder
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-08-30 10:51:37 +03:00
Hannu Nyman 35552db4ee collectd: Enable entropy plugin
Enable the entropy plugin that monitors the available entropy in a Linux system.

Works ok and has no library dependencies. Tested on ar71xx/WNDR3700.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-26 21:35:35 +03:00
Hannu Nyman d91cd622c0 collectd: interface plugin: revert to Linux defaults from BSD-like operations
Change the interface plugin to operate with collectd's default way for Linux
instead of trying to use BSD functionality with patches.

Openwrt's collectd Makefile has set "enable-getifaddrs" option since r7980
(in 2007, no explanations given for the reasons to add that config option),
causing the addition of 110-net-device-stats.patch in 2010 to fix things,
and then later (with 5.4.1 upgrade in 2014) 150-fix-interface-af-link
to undo BSD-specific changes in collectd code meant for only BSD systems
(as AF_LINK does not exist in Linux).

Revert to collectd's intended way in Linux by removing the config option
and deleting the two corresponding patches.

The same data fieds should be provided, so there is no visbile change to users.

References:
===========

Collectd changes introducing/explaining the option and later breaking things:
http://git.verplant.org/?p=collectd.git;a=commit;h=a05e34a0d4fdb2c15db8226689268a27f6f7163d
http://git.verplant.org/?p=collectd.git;a=commit;h=14740db4b415655abc58307352e406442f9933a0
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc

Openwrt:
intro at r7980: https://dev.openwrt.org/changeset/7980
fix1 due to kernel 2.6.36 at r23467: https://dev.openwrt.org/changeset/23467
fix2 due to collectd 5.4.1: https://github.com/openwrt/packages/pull/298

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-19 00:34:03 +03:00
Hannu Nyman 106fd6a3a2 collectd: update to 5.5.0
Update collectd, base of Luci statistics, to 5.5.0.

Patches have been refreshed.
write-graphite plugin is now enabled. (see #1351)

I have compile-tested all plugins with ar71xx,
and real-life tested the following plugins:
Conntrack, Processor (CPU), DNS, Interfaces, Wireless, System Load,
Memory, Ping, Uptime

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-07-16 15:15:22 +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