Fix #871: Adjust aggregator-rules input_pattern match greediness #872
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
… greediness to support numeric matching after captured field
|
@deniszh It seems that pyhash does not support py27 anymore which results in failing travis builds. We should drop py27-pyhash or pin pyhash to some older version. |
|
@piotr1212 : I'm voting for drop, but pinning also OK for me. @hessu : thanks for fix, LGTM! |
piotr1212
approved these changes
Jan 15, 2020
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.
... to support numeric matching after captured field. Fixes bug #871 .
Before, an input regexp of "collectd.mycluster-<location>\d+.app.requests" in aggregation-rules.conf, with a hostname of "mycluster-paris105" would capture "paris10" as the location, instead of paris. With a large cluster this would create a whole lot of aggregates, one per 10 nodes.
This patch makes the <location> match not greedy, letting the user-supplied \d+ side to be greedy and eat the 105 away fully, leaving "paris" as the location.