Commit Graph

100 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
aeefbbe340 collectd: remove quotation on interval this is an number
The value is a number and not a string.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit d2d6220476)
2020-09-19 19:42:59 +03:00
Florian Eckert
b0ad32a3ec collectd: move include line
Currently the init script generates a config file from uci, that has the
include line before the interval line. This means, that anything happening
in the include directory does not yet see the changed Interval.

Moving the include line before the uci generation process fix this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 50f56c2ede)
2020-09-19 19:42:58 +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
f53b79cedb collectd: fix ubi data source type
Currently the values are stored in the ubi plugin as data source type
`counter`. But this makes no sense, because the values change very slowly
and I don't want to know the rate of change. It is better to store the
value as data source type `gauge`. Then I can see the current value.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit e7054e7e79)
2020-09-19 19:42:25 +03:00
Florian Eckert
67a403bfe3 collectd: add ubi uci and plugin info
Add uci binding for ubi plugin.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a481a2006c)
2020-09-19 19:42:25 +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
e7ed367020 collectd: add reload and service trigger
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
ac29330c5b collectd: add logfile plugin definitions
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
5dd077e951 collectd: add iptables uci config
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
6884430d49 collectd: add network uci config
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
df7d418c97 collectd: add curl uci config
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
53e546854a collectd: add apcups uci config
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
eb67983518 collectd: add new memory config values
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
0f9ae62e2c collectd: add new cpu config values
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
Yousong Zhou
4d54186f17 collectd: use uname to get default Hostname
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked for 19.07)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-11-30 19:15:12 +02:00
Yousong Zhou
2bd0a56f09 collectd: log stderr output
Collectd without log type plugin loaded will write log lines to stderr.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(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
Florian Eckert
1920eb60fe collectd: move jshn.sh include to remove warning
Redmine-patch-id: 3680
If I build an image with the imagebuilder I get the following output
during image building:

../root-x86/etc/init.d/collectd: line 4: /usr/share/libubox/jshn.sh:
No such file or directory

To remove this messsage move include to the needed postion, so that the
message does not occur during image building on the host system anymore.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry-picked, modified to match 19.07)
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
30db5cc1c1 collectd: fix lua callback registration
If you want to register more than one lua plugin, you cannot start the
collectd.

You get always the error message:

"The read function "lua/(null)" is already registered. Check for
duplicates in your configuration!"

This is not what I expect and what the documenation says.
With this change it is now possible to registrate more then one lua
Script.

See https://github.com/collectd/collectd/pull/2379

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-04-25 11:13:52 +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