Commit Graph
110 Commits
Author SHA1 Message Date
Hannu Nyman 5e0af88125 collectd: re-enable nut plugin
Re-enable the nut plugin (remove BROKEN mark).
Nut itself has been patched to provide better compatible time_t.

I have not not run-tested the plugin, so it is still possible that
the fixes from upstream collectd PR 4043 are still needed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2022-09-18 18:55:03 +03:00
Hannu Nyman 7e44ef6d42 Merge pull request #19362 from dhewg/dsl
prometheus/collectd: adapt dependencies for the dsl collector
2022-09-18 10:51:00 +03:00
Hannu Nyman 9f273561f7 collectd: disable nut plugin
Temporarily disable nut plugin by marking it BROKEN.
Apparently the upstream collectd plugin is not yet compatible
with nut 2.8.0.

I tried the upstream PR 4043, but it does not help, as it
apparently requires at least one specific UPS type to be
defined/compiled.

        nut . . . . . . . . . no (required data types for
            NUT API were not detected) (dependency error)

If there is a requirement to specify some UPS data type when
compiling nut, it might be problematic for the generic OpenWrt
buildbot context.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2022-09-16 15:37:12 +03:00
Andre Heider 5e291f21ff collectd: adapt dependencies for the dsl collector
All lantiq/intel/maxlinear compatible dsl daemons now provide a common
package name, switch over.

Signed-off-by: Andre Heider <a.heider@gmail.com>
2022-09-14 09:09:05 +02:00
Tiago Gaspar fadc0db74a collectd: remove libip4tc dependency
Base collectd doesn't require libip4tc as stated in the collectd git:

* libiptc (optional)
For querying iptables counters
<http://netfilter.org/>

And libip4tc is already added as a dependency in the iptables plugin
because it needs it, so remove this dependency from the default collectd
to make it compatible with the new nftables firewall4 (by not selecting
any iptables components).

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
2022-01-26 22:34:26 +02:00
Jeroen Peelaerts 533c072ee0 collectd: Add lua and exec collectors for lantiq dsl metrics
Signed-off-by: Jeroen Peelaerts <jeroen.peelaerts@gmail.com>
2021-10-22 22:10:17 +02:00
Kevin Darbyshire-Bryant 8322059f01 collectd: sqm_collect: handle being orphaned
If the master collectd instance gets shut down in an uncontrolled
manner (crashes!) then sqm_collect scripts will be left orphaned and
will run forever.

Modify script to check if it still has a parent and if not, exit.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2021-10-02 20:37:08 +01:00
Hannu Nyman 210ff7e953 collectd: sensors plugin - depend on lm-sensors
Change the sensors plugin's dependency from libsensors
to lm-sensors, so that also the /usr/sbin/sensors executable
gets installed if the plugin is selected.

Although that is not needed for collectd itself,
the LuCI statistics app expects to find the sensors executable
if the plugin has been installed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2021-09-04 10:53:23 +03:00
Matthew Hagan 6f58e598f4 collectd-mod-cpufreq: enable for ipq807x
Tested on AX3600

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
2021-08-15 14:41:49 +03:00
John Kohl b5782a0f0d collectd-mod-ping: add support for MaxMissed
Signed-off-by: John Kohl <jtk.git@bostonpog.org>
2021-08-15 10:38:35 +03:00
Fritz D. Ansel effd304c1d collectd: enable cpufreq plugin for mediatek
tested on e8450 ubi+non-ubi

Signed-off-by: Fritz D. Ansel <fdansel@yandex.ru>
2021-08-12 09:47:21 +02:00
Tomas Lara 6bd8d29b70 collectd: enable cpufreq for rockchip target
Enable collectd-mod-cpufreq  for rockchip

Signed-off-by: Tomas Lara <tl849670@gmail.com>
2021-04-13 09:18:24 +03:00
Florian Eckert 1e2ba94064 collectd: update PKG_RELEASE
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-23 10:22:12 +01:00
Florian Eckert 6e41bf73ba collectd: upate PKG_RELEASE number
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-16 13:23:08 +01:00
Florian Eckert a4f74eb11c collectd: make compile time debug option configurable
Enables the compiler option that collectd is compiled with
debugging support. This is used at development stages to get
more messages from the collectd during development.

This option is default disabled.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-16 13:23:08 +01:00
Florian Eckert 416ba35d50 collectd: fix COLLECTD_PLUGINS_SELECTED end of line
This removes the trailing back slash. This is not needed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-16 13:23:08 +01:00
Florian Eckert 092902a87e collectd: enable collectd-mod-smart
Switching on compilation for collectd smart plugin.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-16 13:23:08 +01:00
Nick Hainke 93ff4cc743 collectd: add plugin to compare ipv4,ipv6 stats
Add "ipstatistics"-plugin. This plugin parses "/proc/net/netstat" and
"/proc/net/snmp6" to get the overall ipv4 and ipv6 usage.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-02-04 09:26:49 +02:00
Nick Hainke 922e5b1a8b collectd: fix snmp6 not showing all interfaces
Getifaddrs() is not working all the time (e.g. wireguard interfaces).
Instead we use if_nameindex() syscall as suggested in:
 https://stackoverflow.com/a/45796495/8474618

Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-01-25 21:23:40 +01:00
Nick Hainke 014551314e collectd: fix snmp6 collector
We scraped multiple times the same interface in one run.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-01-11 15:16:43 +02:00
Maxim Storchak 4a728c9792 collectd: bump PKG_RELEASE
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2021-01-10 10:22:54 +02:00
Maxim Storchak 0412c27fda collectd: enable swap plugin
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2021-01-10 10:22:54 +02:00
Nick Hainke 3c55d11aef collectd: add snmp6 interface
Add collectd plugin allowing to collect IPv6 interface statistics.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-01-09 10:12:20 +02:00
Nick Hainke 7f99516ce5 collectd: add dhcpleases plugin
Count the current dhcpleases. Currently, we use a bash script
that does the same job (Freifunk Berlin). We want to use native
collectd plugin for that.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2020-12-12 14:59:49 +01:00
Hannu Nyman 28747825df 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>
2020-09-07 18:01:21 +03:00
Florian Eckert 6d34208c57 collectd: update PKG_RELEASE
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-06-24 20:10:07 +02:00
Florian Eckert 5afad91d36 collectd: update PKG_RELEASE
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-06-24 13:20:59 +02:00
Florian Eckert 46f2476875 collectd: enable ubi plugin
Enable ubi plugin.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-06-24 13:19:57 +02:00
Kevin Darbyshire-Bryant c2c91ea99e collectd: sqm_collect: tidy interval string handling
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-05-25 22:37:17 +01:00
Kevin Darbyshire-Bryant 947c85bff0 collectd: sqm_collectd: improve error handling
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-05-25 12:39:53 +01:00
Kevin Darbyshire-Bryant a809dc6f3b collectd: Improve sqm_collectd error reporting
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-05-17 16:17:07 +01:00
Kevin Darbyshire-Bryant c8640d1f68 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>
2020-05-07 10:48:45 +01:00
Hannu Nyman 03162ee920 collectd: bump PKG_RELEASE
Bump PKG_RELEASE on behalf of 38235de9c

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-05-05 16:52:48 +03:00
Kevin Darbyshire-Bryant 38235de9c3 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>
2020-05-05 12:00:56 +01:00
Florian Eckert bb666cc9ff collectd: add syslog json plugin
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-05-04 14:51:14 +02:00
Hannu Nyman 18cf4a15ca Revert "collectd: disable nut plugin temporarily"
This reverts commit 97dbc515e5.

libgd has been been fixed to provide correct pkgconfig info,
so that nut again compiles in buildbot. Thus the nut plugin
can be re-enabled in collectd.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-04-05 18:14:22 +03:00
Hannu Nyman 97dbc515e5 collectd: disable nut plugin temporarily
Disable nut plugin for now, as nut is currently
failing to build in buildbot (maybe due to libgd),
and the nut plugin prevents compiling collectd itself.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2020-04-04 18:12:11 +03:00
Hannu Nyman 286557e906 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>
2020-03-26 18:48:52 +02:00
Hannu Nyman b936fc4e0d 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>
2020-03-23 07:58:25 +02:00
Hannu Nyman 1d11a0c892 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>
2020-03-22 22:48:31 +02:00
Kevin Darbyshire-Bryant d5717f3930 collectd: adjust dependecies for iptables bump
iptables 1.8.4 drops support for a combined libiptc, providing split
libip4tc & libip6tc instead.  Adjust collectd dependencies in advance of
iptables bump from 1.8.3 to 1.8.4

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-15 15:48:27 +00:00
Adrian Schmutzler 22d7aa0bf4 collectd: apply brcm2708 target rename to bcm27xx to dependencies
Since the brcm2708 target has been renamed to bcm27xx in openwrt
repo, update the dependency to the target in this package.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-02-11 14:02:57 +01:00
Marcin Jurkowski 3763b238e7 collectd: add vmem uci config
Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
2019-12-11 00:22:47 +01:00
Hannu Nyman 5e0d5c9c7f 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>
2019-11-23 20:47:18 +02:00
Hannu Nyman 4cdc7d1cec 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>
2019-11-16 14:46:05 +02:00
Hannu Nyman b295c9cff2 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>
2019-11-03 17:54:22 +02:00
Hannu Nyman 213969e6e4 collectd: update to 5.9.2
Update collectd to 5.9.2

Mainly bug fixes:
https://github.com/collectd/collectd/blob/dfb9dd09fe3a6864c8cf85eb92e826c289e6d6d2/ChangeLog

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-10-09 20:56:21 +03:00
Florian Eckert b84edbe2c7 collectd: bump PKG_PACKAGE version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2019-09-20 16:12:26 +02:00
Rosen Penev ea350a3b4c Merge pull request #10018 from ja-pa/treewide-cpe-id
treewide: add PKG_CPE_ID for better cvescanner coverage
2019-09-17 13:35:49 -07:00
Jan Pavlinec 299e5b0a9b treewide: add PKG_CPE_ID for better cvescanner coverage
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-17 12:40:26 +02:00