Update bind plugin to support the new XML v3 API. #742
Conversation
This file contains hidden or 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
Unfortunately, this new API does not provide per-zone data
any more, thus 'Zone' options like
Zone "example.com/IN"
are ignored if API version is 3.
| if (child->type != XML_ELEMENT_NODE) | ||
| continue; | ||
|
|
||
| if (strncmp ("counter", (char *) child->name, strlen ("counter")) == 0) |
There was a problem hiding this comment.
Could you change this logic to the following to save one level of indentation?
if (strncmp ("counter", (char *) child->name, strlen ("counter")) != 0)
continue;|
@octo is this what you had in mind ? |
And minor change to bind_parse_generic_name_attr_value_list.
|
Awesome, thanks @vberger! |
|
Doesn't look like this made it into the changelog for 5.4.2. Any reason why? |
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.
This commit adds support for the new XML schema of Bind9 statistics-channels (version 3). This new schema is the default one in Bind9.9 (can be reverted to v2 with a
./configureswitch) and support for older versions has been dropped in Bind9.10.Support for versions 1 and 2 remain in the collectd plugin.
Unfortunately, this new schema does not provide per-zone data any more, thus 'Zone' options like
are ignored if schema version is 3.
Before this, a v3 schema was silently failed with only
read-function of pluginbind' failed.`.