Commit Graph

25 Commits

Author SHA1 Message Date
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
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
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
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 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
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
Marc Benoit b33ec70c95 utils/collectd: run with low priority
Even on a powerful platform a collectd process'
activities are sometimes affecting throoughput and
latency. This is a backgroud process, that should not
be running with default priority.
Even if it is a little deplayed, that is not a worry in
this case. The routing should be the main priority,
stats collection can wait a bit.

Tested on Netgear R7800
Signed-off-by: Marc Benoit <marcb62185@gmail.com>
Make niceness more moderate, bump version.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-07-08 10:14:35 +03:00
Jo-Philipp Wich ea01eccee0 collectd: ensure that /var/lib/collectd exists
With the conversion to procd a required mkdir has been dropped, readd it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-27 21:45:36 +02:00
Jo-Philipp Wich 8228cee3f3 collectd: stop service on shutdown
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-04-15 12:33:32 +02:00
Hannu Nyman a62ff02b8d collectd: use procd
Change collectd to use procd for startup.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-02-03 19:00:14 +02:00
Hannu Nyman 8e944a0826 collectd: Clarify config file example/placeholder
The config file shipped with collectd dates from 2010 and
leads to error messages if luci-statistics & collectd are installed,
as it references several plugins not usually installed, or such ones
that have been renamed since then.

For most users, this file is just a placeholder during collectd installation,
as /usr/bin/stat-genconfig from /etc/init.d/luci_statistics will overwrite it.

Sanitize and shorten the placeholder config file:
* Reference actively only the default plugins installed by luci statistics.
* Match the placeholder config with the genuine config from luci statistics.

If somebody uses collectd separately from luci statistics, he will need to
edit these settings anyway.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-08-30 10:51:37 +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