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 introduces a regex tenant resolver to allow regex in the
X-Scope-OrgID
value when the user usestenant-federation
feature.It introduces two flags,
tenant-federation.regex-matcher-enabled
andtenant-federation.user-sync-interval
.tenant-federation.regex-matcher-enabled
enables the regex resolver, which allows regex to theX-Scope-OrgID
value.tenant-federation.user-sync-interval
specifies how frequently to scan users. The scanned users are used to calculate matched tenantIDs.The regex matching rule follows the Prometheus regex matcher (
=~
), See here.For example, if there are 3 tenants, whose IDs are
user-1
,user-2
, anduser-3
. We can setX-Scope-OrgID
touser-.+
to query whole tenants.Also, we can use an existing way like setting
user-1|user-2|user-3
toX-Scope-OrgID
.Which issue(s) this PR fixes:
Fixes #6588
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]