Change filtering rules behavior #48
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
Filtering rules now mimic the behavior of iptables firewall rules. The last applicable rule wins.
emerkle826
approved these changes
Oct 19, 2021
Comment on lines
106
to
107
| logger.info("Metric {}", name); | ||
| logger.info(">>>>>> Applying rule {}", lastRule.get()); |
There was a problem hiding this comment.
Maybe make these DEBUG level logs. I don't have a very strong opinion here, so if you still want them to be INFO, I could be easily convinced.
There was a problem hiding this comment.
You're right, I moved them to debug level. I also enclosed the block under a if (logging.isDebugLevel()) { to avoid the additional calls when we're at INFO level.
Comment on lines
+43
to
+45
| Assert.assertFalse(FilteringRule.applyFilters("org.apache.cassandra.metrics.metric1", Arrays.asList(unaffectedByDenyRule, firstRule, secondRule, thirdRule)).isAllowRule); | ||
| Assert.assertTrue(FilteringRule.applyFilters("org.apache.cassandra.metrics.metric2", Arrays.asList(unaffectedByDenyRule, firstRule, secondRule, thirdRule)).isAllowRule); | ||
| Assert.assertTrue(FilteringRule.applyFilters("org.apache.cassandra.whatever.metric3", Arrays.asList(unaffectedByDenyRule, firstRule, secondRule, thirdRule)).isAllowRule); |
There was a problem hiding this comment.
nit: You could extract the List of rules once, and use it in each of the assert statements, as opposed to using Arrays.asList each time. But this is a test, so the efficiency is not really a big deal.
adejanovski
force-pushed
the
alex/last-filtering-rule-wins
branch
from
0219252 to
aa52a78
Compare
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 PR changes the way metrics filtering rules are applied. It mimics how firewall rules are applied by iptables, where the last rule wins.
It allows to deny a whole group of metrics and then allow only specific ones, without affecting other metric groups.
As this is a breaking change, the version number was bumped accordingly.