Commit Graph

78 Commits

Author SHA1 Message Date
Hannu Nyman
94866d76ab collectd: update to 5.12.0
Update collectd to version 5.12.0.

* Refresh patches
* Remove upstreamed patch 920-fix-ubi-data-source-type.patch
* Backport a patch from upstream to fix a missing define
  (920-backport-netlink-reg-noerror.patch)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 28747825df)
2020-09-19 19:44:55 +03:00
Florian Eckert
b60fa2de9e collectd: update PKG_RELEASE
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6d34208c57)
2020-09-19 19:42:59 +03:00
Florian Eckert
fbe7abcd57 collectd: update PKG_RELEASE
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 5afad91d36)
2020-09-19 19:42:58 +03:00
Florian Eckert
37335cf653 collectd: enable ubi plugin
Enable ubi plugin.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 46f2476875)
2020-09-19 19:40:51 +03:00
Kevin Darbyshire-Bryant
49685b6bef collectd: sqm_collect: tidy interval string handling
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit c2c91ea99e)
2020-06-07 18:33:31 +03:00
Kevin Darbyshire-Bryant
9a38e786f8 collectd: sqm_collectd: improve error handling
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 947c85bff0)
2020-06-07 18:33:05 +03:00
Kevin Darbyshire-Bryant
f89580290c collectd: Improve sqm_collectd error reporting
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a809dc6f3b)
2020-06-07 18:32:53 +03:00
Kevin Darbyshire-Bryant
8dcc144b9e collectd: sqm_collectd improve interface name filter
Increase the range of characters that get substituted by '_' so the
shell doesn't complain about illegal variable names.

Primarily done to catch '.' and '-' but who knows what funnies will
appear in i/f names.

It's a shame that busybox ash doesn't understand :alnum:

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit c8640d1f68)
2020-06-07 18:32:45 +03:00
Hannu Nyman
18128f79d2 collectd: bump PKG_RELEASE
Bump PKG_RELEASE on behalf of 38235de9c

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 03162ee920)
2020-06-07 18:29:56 +03:00
Kevin Darbyshire-Bryant
7ceb83acf1 collectd: SQM collect data from some qdiscs
Add a script that can collect data from mq (multi queue) and cake
qdiscs.

Script is reliant on collectd's 'exec' module.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 38235de9c3)
2020-06-07 18:29:47 +03:00
Florian Eckert
9f20fbba58 collectd: add syslog json plugin
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit bb666cc9ff)
2020-06-07 18:29:38 +03:00
Hannu Nyman
fb0996711e collectd: disable onewire plugin, BROKEN since 2009
Mark the onewire plugin as disabled, as the plugin
has been marked BROKEN since it was introduced in 2009 by
https://git.openwrt.org/?p=openwrt/svn-archive/packages.git;a=commitdiff;h=0de38b88d6ba8c52b8386d3059baba7dca22961f

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 286557e906)
2020-03-26 20:10:12 +02:00
Hannu Nyman
afccb8069f collectd: disable dpdk_telemetry module
Explicitly disable the new dpdk_telemetry module to fix
compilation in buildbot.
(other dpdk modules are aleady disabled)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b936fc4e0d)
2020-03-26 20:09:59 +02:00
Hannu Nyman
45dfd3b51e collectd: update to 5.11.0
* Update collectd to version 5.11.0
* Refresh patches

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

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1d11a0c892)
2020-03-26 20:09:24 +02:00
Marcin Jurkowski
b4f3e50856 collectd: add vmem uci config
Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
(cherry picked from commit 3763b238e7)
2019-12-12 22:07:29 +02:00
Hannu Nyman
a9b5f06578 collectd: update to 5.10.0
Update collectd to 5.10.0
* leave new plugins as disabled for now (procevent, sysevent)
* refresh patches. Remove unenecessary version fix

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry-picked for 19.07. PKG_RELEASE=2 as cpufreq was already backported)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:19:10 +02:00
Hannu Nyman
e33b3f8cab collectd: adjust reaction to ntp time at boot time
Adjust the reaction to a polling interval timestamp that references
to a past time.

Past timestamps can happen when ntpd adjusts router's time after network
connectivity is obtained after boot. Collectd shows warnings for each plugin
as it tries to enter new values with the same timestamp as the previous one.

This patch adjusts the next polling time to be now+2 seconds for the main
loop and for the plugin-specific read loops. That avoids the warnings, but
does not overreact in case there are shorter polling intervals or the time
gets adjusted for other reasons.

Additionally some debug statements are aded, but they are visible only
when --enable-debug configure option is used in Makefile.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry-picked for 19.07)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:15:12 +02:00
Hannu Nyman
a681b766e8 collectd: update to 5.9.2
Update collectd to 5.9.2

Mainly bug fixes:
dfb9dd09fe/ChangeLog

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry-picked for 19.07)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:15:12 +02:00
Florian Eckert
bbf35c7360 collectd: bump PKG_PACKAGE version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry-picked for 19.07)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:15:12 +02:00
Florian Eckert
c4083af7b7 collectd: enable threshold plugin
The only action the Threshold plugin takes itself is to generate and
dispatch a notification. Other plugins can register to receive
notifications and perform appropriate further actions.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry-picked for 19.07, line numbers adjusted)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:15:12 +02:00
Hannu Nyman
00803ffc91 collectd: enable cpufreq module for ipq40xx and brcm2708_bcm2709
As some ipq40xx CPUs support frequency scaling, enable building
collectd-mod-cpufreq for ipq40xx (for private builds) and
its package architecture brcm2708_bcm2709 (for buildbot)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 5e0d5c9c7f)
2019-11-30 13:01:21 +02:00
Yousong Zhou
2a64b3a440 collectd: remove the patch scaling ping_droprate from 0-1 to 0-100
Upstream project's behaviour of reporting this data source in range 0-1
is used by at least CentOS 7 collectd 5.8.1, very likely the same
behaviour is also in widely use by other distributions.

The change is important for providing consistent experience across
collectd deployments on different environments

Ref: https://github.com/collectd/collectd/pull/3244
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 2f66fa5c23)
Ref: https://github.com/openwrt/luci/issues/3308
2019-11-14 11:10:26 +00:00
Sven Roederer
3525e3e55c collectd: build RouterOS modules
This allows collectd to get data of Mikrotik devices in a improved way than via SNMP.

closes #10327

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
cherry-pick does not apply cleanly changed PKG_RELEASE number.
(cherry picked from commit 4261f45734)
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-10-22 14:45:49 +02:00
Jan Pavlinec
937b19ebb7 treewide: add PKG_CPE_ID for better cvescanner coverage
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry-picked from bf2f1a0263)
2019-09-26 19:36:27 -07:00
Hannu Nyman
aa2bbd6286 collectd: update to 5.9.0
Update collectd to version 5.9.0

* remove backported upstream patches (sensors, modbus)
* remove lua patch that has been been implemented upstream
  (See collectd PR 3144)
* refresh patches and accommodate into upstream path changes
* place the 'stations' datatype for iwinfo in alpbetically
  correct place in types.db
* add libmnl dependency to 'processes' plugin required for the
  new Linux process Delay Accounting capability.
  (Alternatively the capability & requirement might be patched away
   in Makefile.am, HAVE_LIBTASKSTATS from collectd_4ea7a572)

* new plugins (disabled): ampq1, gpu_nvidia, pcie_errors,
                          write_stackdriver, write_syslog

compile-tested: ar71xx/WNDR3700 (all plugins)
run-tested: ar71xx/WNDR3700 (selected plugins)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 08d759f14a)
2019-06-24 20:30:42 +03:00
Florian Eckert
3d15ebca31 collectd: add uci config support
Add uci config support.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-04-25 13:01:42 +02:00
Florian Eckert
d826eb27f4 collectd: update forgotten PKG_RELEASE number after last change
Update PKG_RELEASE mumber.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-04-25 12:57:54 +02:00
Florian Eckert
6382a043b0 Merge pull request #8138 from TDT-AG/pr/20190206-collectd
collectd: enable lua support
2019-04-25 12:44:31 +02:00
Florian Eckert
be86e43e22 collectd: enable lua support
This will enable the lua support for collectd.
The new package name is collectd-mod-lua

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-04-25 11:13:52 +02:00
Daniel Golle
f70364df8b collectd: backport modbus improvements
* 938897a2 Add scale and shift to modbus plugin
 * 60280b80 correcting all the wrongs
 * a00ab529 Add support for RS485 to modbus plugin

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-04-14 03:18:24 +02:00
Hannu Nyman
1f0a005722 collectd: remove lm-sensors version upper limit
Backport an upstream patch to remove the upper limit of
lm-sensors version check, so that using lm-sensors 3.5.0
will work.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-01-12 10:39:24 +02:00
Petko Bordjukov
dbdd7ead23 collectd: Introduce collectd-mod-ethstat
The ethstat plugin for collectd provides a convenient way to track a large list
of variables associated with network interfaces such as channel busy time and
many others.

A list of the available variables for a given interface may be acquired by
running ethtool -S <interface>

Signed-off-by: Petko Bordjukov <bordjukov@gmail.com>
2018-11-28 12:34:33 +02:00
Hannu Nyman
29eac13d8f collectd: update to 5.8.1
Update collectd to version 5.8.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-10-26 21:46:24 +03:00
Yousong Zhou
e38c100612 treewide: remove obsolete references to avr32
This is a long overdue followup commit to openwrt/openwrt@5d9eeab
("build: remove obsolete references to cris and avr32")

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-09-28 12:03:20 +08:00
Sebastian Kemper
b695c1150a collectd: include nls.mk for mysql plugin
libmariadb 10.2 needs to be linked in together with iconv.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-07-13 22:46:48 +02:00
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
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