Introduce a regex tenant resolver #6713
Open
Conversation
This file contains hidden or 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
SungJin1212
force-pushed
the
Support-regex-to-tenant-federation
branch
8 times, most recently
from
1b8963e to
e6a4222
Compare
|
@CharlieTLe |
SungJin1212
force-pushed
the
Support-regex-to-tenant-federation
branch
from
e6a4222 to
63f97d2
Compare
yeya24
reviewed
Apr 24, 2025
| // because if the # of matched tenantIDs is only one, `X-Scope-OrgID` header is | ||
| // set to input regex. | ||
| byPassForSingleQuerier = false | ||
| tenant.WithDefaultResolver(tenantfederation.NewRegexResolver(prometheus.DefaultRegisterer, t.Cfg.TenantFederation.UserSyncInterval, util_log.Logger, t.Distributor.AllUserStats)) |
There was a problem hiding this comment.
I wonder if there is a better way to gather all users. Calling t.Distributor.AllUserStats seems a bit expensive just to get user IDs.
And it cannot cover users that don't ingest anymore but maybe their data still present on long term storage.
There was a problem hiding this comment.
And it cannot cover users that don't ingest anymore but maybe their data still present on long term storage.
Thanks for catching.
How about utilizing the userScanner?
There was a problem hiding this comment.
Calling t.Distributor.AllUserStats seems a bit expensive just to get user IDs.
Do you have any good ideas?
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
SungJin1212
force-pushed
the
Support-regex-to-tenant-federation
branch
from
63f97d2 to
605f91a
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 introduces a regex tenant resolver to allow regex in the
X-Scope-OrgIDvalue when the user usestenant-federationfeature.It introduces two flags,
tenant-federation.regex-matcher-enabledandtenant-federation.user-sync-interval.tenant-federation.regex-matcher-enabledenables the regex resolver, which allows regex to theX-Scope-OrgIDvalue.tenant-federation.user-sync-intervalspecifies 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-OrgIDtouser-.+to query whole tenants.Also, we can use an existing way like setting
user-1|user-2|user-3toX-Scope-OrgID.Which issue(s) this PR fixes:
Fixes #6588
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]