Commit graph

151 commits

Author SHA1 Message Date
Alexandros Kosiaris
1ccfc02940 collectd: Fix ltq-dsl compilation errors
Per

https://github.com/openwrt/packages/pull/19396#issuecomment-1480780893

prefix ltq-dsl-app with a @ character to fix the compilation issues
witnessed in PR #19396 and #20662

Signed-off-by: Alexandros Kosiaris <akosiaris@gmail.com>
2023-03-23 12:02:07 +02:00
Christian Marangi
6e0c2b767b
treewide: bump PKG_RELEASE for libiwinfo dependant packages
Bump PKG_RELEASE for libiwinfo dependant packages.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2023-01-23 13:58:49 +01:00
Florian Eckert
fab89d120f
Merge pull request #19314 from TDT-AG/pr/2022-09-05-collectd
collectd: extend network uci plugin
2022-09-19 11:13:28 +02:00
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
Florian Eckert
4446e8fd16 collectd: extend network uci plugin
The network plugin from collectd also has the option to encrypt the
metrics when sending them to another server. Until now, this was not
possible via the UCI. This commit adds that feature.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2022-09-05 15:28:29 +02:00
Florian Eckert
3617cb311a
Merge pull request #18778 from bluebrother/collectd-dsl-fixes
collectd: Fix various issues with lantiq dsl metrics.
2022-06-24 09:29:10 +02:00
Dominik Riebeling
eb632da5bb collectd: Fix various issues with lantiq dsl metrics.
- Handle bool values correctly. We get the values as bool, but collectd
  requires a bool value to be numeric in the range [0, 1].
- Remove profile and mode values. Those are strings, which cannot be
  represented by collectd.
- Update collectd type for some values.
- Fix latn value being present twice.

Signed-off-by: Dominik Riebeling <bluebrother@posteo.de>
2022-06-22 19:02:44 +02:00
Alexandros Kosiaris
033c19acd7 collectd: Support configuration of write_http plugin
write_http plugin is already built and shipped in
collectd-mod-write_http, however it is not possible to configure it via
uci currently, instead having to rely on populating the config file manually.

Add support by adding 2 functions, process_write_http() and
process_write_http_node(). First one just enables/disables the plugin.
The second one, in the spirit of the curl plugin, adds support for
populating multiple <Node> elements under <Plugin write_http> with
support for a few parameters. Those are:

* name. The name of the <Node>. Mandatory
* URL. Mandatory
* Format. Optional.
* User. Optional.
* Password. Optional.
* Timeout. Optional.
* BufferSize. Optional.

Signed-off-by: Alexandros Kosiaris <akosiaris@gmail.com>
2022-06-21 18:30:04 +03:00
Florian Eckert
896a0f0db6 collectd: smart: add patch to check udev_enumerate_scan_devices return value
The function udev_enumarte_scan_devices returns a value less than 0 on
failure. If this is the case then we terminate the read for this smart
information.

This change was already send upstream. And could be delete in feature
collectd versions.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2022-03-17 14:11:41 +01:00
Florian Eckert
a9ea1cf6ed collectd: remove not needed fix
This was not a real fix but a workaround. It is no longer clear to me
why this was necessary. Deleting the patch restores the upstream
behaviour of the collected for the smart plugin. I have tested it and on
my system the hard disk to be monitored is recognised.

root@system ~ # cat /sys/class/block/sda/uevent
MAJOR=8
MINOR=0
DEVNAME=sda
DEVTYPE=disk

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2022-03-17 14:11:41 +01: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
9db12bbaff collectd: sqm_collect: optimise parent search
There can be only 1 parent process ID, so as soon as we find it, print
it and exit - there's no point searching any of the following lines

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2021-10-06 12:13:11 +01: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
b4e24c12a6 collectd: add percent calculation of bad block to ubi plugin
This patche adds the percent evaluation for the bad blocks.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-23 10:20:27 +01:00
Florian Eckert
4927b53333 collectd: prepare ubi plugin for percent calculation
This patche change prepares the ubi plugin to add the bad block evaluation in
percent.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-03-23 10:16:29 +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
543a2a970c collectd: fix smart disk detection
On my system the attribute DEVTYPE was not set. The plugin could not
read any data and the function call blocked forever on this function and did
not returned. By removing it, all block devices under `/sys/class/block`
were checked.

Block devices that do not support SMART were not evaluated. The
collected displays the following message.

smart plugin: checking SMART status of /dev/loop4.
smart plugin: unable to open /dev/loop4.

If you do not like this message, you could only enable device in the uci that
does support SMART.

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
Ilya Lipnitskiy
5d8d4fbbcb
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
2021-02-20 16:02:15 -08: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
213c694b75 collectd: snmp6 further improvements
Return with "-1" if parsing fails in read function.
Reduce buffersize of splitstring function.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-01-26 14:47:28 +01: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
Maxim Storchak
8ab9fd7fff collectd: expose more global parameters to uci
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2021-01-10 10:22:54 +02:00
Maxim Storchak
a5d87390f2 collectd: remove extra newlines from the generated config
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2021-01-10 10:22:54 +02:00
Maxim Storchak
fdd53a4c60 collectd: fix the wrong var name
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
d2d6220476 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>
2020-06-24 20:09:09 +02:00
Florian Eckert
50f56c2ede 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>
2020-06-24 20:09:09 +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
e7054e7e79 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>
2020-06-24 13:20:26 +02:00
Florian Eckert
a481a2006c collectd: add ubi uci and plugin info
Add uci binding for ubi plugin.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-06-24 13:20:11 +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