Update log4j configuration to current master #70
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
Specific revision is 0d3cebe812080ea153d124b313fb2c184c7df75b.
pquentin
commented
Oct 28, 2021
Comment on lines
-64
to
-72
| {% if verbose_imc_logging_enabled is defined and verbose_imc_logging_enabled %} | ||
| logger.verbose_imc.name = org.elasticsearch.indices.IndexingMemoryController | ||
| logger.verbose_imc.level = debug | ||
| # don't spam console | ||
| # logger.verbose_imc.appenderRef.console.ref = console | ||
| logger.verbose_imc.appenderRef.rolling.ref = rolling | ||
| logger.verbose_imc.appenderRef.rolling_old.ref = rolling_old | ||
| logger.verbose_imc.additivity = false | ||
| {%- endif %} |
There was a problem hiding this comment.
This block is why we have this file in the first place. However, verbose_imc_logging_enabled is no longer a thing.
pquentin
commented
Oct 28, 2021
| appender.deprecation_rolling.layout.type = ECSJsonLayout | ||
| # Intentionally follows a different pattern to above | ||
| appender.deprecation_rolling.layout.dataset = deprecation.elasticsearch | ||
| appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter |
There was a problem hiding this comment.
This is the line that should save us from any future deprecation spam
In general there is no need for dedicated PR for backports and you can push straight to the branch. Also, the procedure looks fine to me. |
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 is a stopgap until elastic/rally#1371 is implemented.
If merged, I'll backport this pull request to the following rally-teams branches:
I don't intend to open pull request for backports (should I?), so please review the procedure below.
For each branch:
However, the main Elasticsearch repo does not have a branch named
7. Based on my understanding of https://esrally.readthedocs.io/en/stable/track.html#track-repositories-branch-logic, the7branch could be picked up if we test7.0, so I'll use the config file from the7.0Elasticsearch branch.