collectd: Update to 5.4.1 #298
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-update collectd to the current release 5.4.1 -fix sigrok glib check (upstream patch after 5.4.1) Note: Changes are required also to luci-statistics in Luci source. Patch in http://patchwork.openwrt.org/patch/5303/ Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
hnyman
added a commit
to hnyman/packages
that referenced
this pull request
Aug 18, 2015
…erations Change the interface plugin to operate with collectd's default way for Linux instead of trying to use BSD functionality with patches. Openwrt's collectd Makefile has set "enable-getifaddrs" option since r7980 (in 2007, no explanations given for the reasons to add that config option), causing the addition of 110-net-device-stats.patch in 2010 to fix things, and then later (with 5.4.1 upgrade in 2014) 150-fix-interface-af-link to undo BSD-specific changes in collectd code meant for only BSD systems (as AF_LINK does not exist in Linux). Revert to collectd's intended way in Linux by removing the config option and deleting the two corresponding patches. The same data fieds should be provided, so there is no visbile change to users. References: =========== Collectd changes introducing/explaining the option and later breaking things: http://git.verplant.org/?p=collectd.git;a=commit;h=a05e34a0d4fdb2c15db8226689268a27f6f7163d http://git.verplant.org/?p=collectd.git;a=commit;h=14740db4b415655abc58307352e406442f9933a0 http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc Openwrt: intro at r7980: https://dev.openwrt.org/changeset/7980 fix1 due to kernel 2.6.36 at r23467: https://dev.openwrt.org/changeset/23467 fix2 due to collectd 5.4.1: openwrt#298 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
champtar
pushed a commit
to champtar/packages
that referenced
this pull request
Jul 7, 2019
Rework 464xlat
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-update collectd to the current release 5.4.1
-fix sigrok glib check (upstream patch after 5.4.1)
Note:
Changes are required also to luci-statistics in Luci source.
Patch in http://patchwork.openwrt.org/patch/5303/
Signed-off-by: Hannu Nyman hannu.nyman@iki.fi
Additional notes:
Collectd, the backbone of Luci statistics module, has been updated already to 5.4.1, while Openwrt is still with 4.10.8.
5.0-5.4 branches have been released in 2011-2013 and the last Collectd release in January 2014 only contained 5.4.1. 4.10.x is being "phased out" and new commits have been made only rarely. No 4.10.x release for ages.
My ar71xx/wndr3700 build has been using 5.4.1 since March (and used 5.3.1 long before that).
I have compile-tested (with ar71xx) all collectd modules, and I have verified the real-life functionality of the following plugins: Conntrack, CPU/Processor, DNS, Interfaces, Memory, Ping, Processes, TCP Connections, System Load, Uptime, Wireless.
The version bump requires changes both to "collectd" in the packages feed and to "luci-statistics" in the luci feed, as some of the data items have changed name or file structure.
Collectd:
Explanation of main changes in the patches for collectd in packages feed:
Patches to be removed:
removed upstream.
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=d5b09f2bb673ac9396da52b85bcbd16c98b3d633
Changed patches:
New patches:
http://git.verplant.org/?p=collectd.git;a=commit;h=e58f85bb68b4c45130bb6fdf40b51db95d2b71e5
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc
Luci:
Data presentation in luci-statistics requires three changes in the Luci sources:
-conntrack result data has changed name from "entropy" to "value".
-ping result data has changed name from "ping" to "value".
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=77a6905147798210ec17173bd5e4410adcc3a112
-interface plugin has changed rrd data file structure so that the plugin
instances (=interfaces) have separate data files. Luci needs to draw the
graph for each plugin instance, not for each data instance.
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=cc3640ba512862cd5745446f1f1a997dd4344454
Patch for Luci has been submitted in May 2014 and can be found at http://patchwork.openwrt.org/patch/5303/
Applying this pull request requires somebody like @jow with write access also to Luci code.