Commit Graph

12 Commits

Author SHA1 Message Date
Hannu Nyman fa3a118de8 collectd: uptime plugin: apply fix from upstream
Backport from master the fix for uptime plugin.
Adjust it for 5.5.3

  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

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-09-15 19:10:37 +03:00
Hannu Nyman 938db71418 collectd: upstream fix for vulnerabity in network plugin
Backport an upstream fix for a DDoS vulnerability in the
network plugin: CVE-2017-7401

The patch has been adapted from the fix for 5.6 branch,
as 5.5 is already EoL in practice.

Run-tested with R7800/ipq806x.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-04-19 12:20:53 +03: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 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
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
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
https://github.com/collectd/collectd/commit/780e6a76021a240e95007a04b723d827120afa95

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-10-02 20:31:42 +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
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
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
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