LOG-2864: Compatibility with ES default output #1587
Merged
+349
−38
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
|
/retest |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcantrill, xperimental The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
xperimental
force-pushed
the
lokistack-default-compatibility
branch
from
e98fb6d
to
638bd29
Compare
|
/retest |
1 similar comment
|
/retest |
|
@xperimental: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
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.
Description
Currently the LokiStack integration always creates two outputs, one for each of the log streams that is forwarded by default (
applicationandinfrastructure). While these outputs are calleddefaultanddefault-infra, they do not behave like thedefaultoutput that is available when using the ElasticSearch log storage.This PR changes the behaviour of the
defaultoutput reference when using LokiStack, so that it is internally split into different outputs depending on the log stream forwarded into it. This should ensure that an input is always forwarded into the correct tenant, thus enforcing the correct authorization. Additionally this enables the use of customClusterLogForwarderconfigurations that were usable with the ElasticSearch log storage, for example to forwardauditlogs into the LokiStack log store.Known limitations:
ClusterRoleassigned to thelogcollectorcurrently always has write access to all tenants not just the ones it needs for the current configuration./cc @cahartma
/assign @jcantrill
Links