match external labels in exemplars API #4123
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
Signed-off-by: yeya24 <yb532204897@gmail.com>
Signed-off-by: yeya24 <yb532204897@gmail.com>
yeya24
force-pushed
the
fix-exemplar-external-labels
branch
from
91220c4
to
835c740
Compare
kakkoyun
reviewed
Apr 29, 2021
yeya24
force-pushed
the
fix-exemplar-external-labels
branch
from
835c740
to
457152f
Compare
|
Thanks, @yeya24, this looks amazing. I need to muster some brainpower to review this. |
yeya24
force-pushed
the
fix-exemplar-external-labels
branch
from
457152f
to
55530c4
Compare
Signed-off-by: yeya24 <yb532204897@gmail.com>
|
I've tested this change locally and we are now seeing exemplars on our staging environment (querying via both layers of thanos querier). LGTM |
kakkoyun
approved these changes
Apr 30, 2021
| es := &exemplarsStream{ | ||
| client: exemplarsClient, | ||
| request: req, | ||
|
|
kakkoyun
pushed a commit
to kakkoyun/thanos
that referenced
this pull request
Apr 30, 2021
* match external labels in exemplars API Signed-off-by: yeya24 <yb532204897@gmail.com> * update changelog Signed-off-by: yeya24 <yb532204897@gmail.com> * fix lint Signed-off-by: yeya24 <yb532204897@gmail.com> * fix flaky tests Signed-off-by: yeya24 <yb532204897@gmail.com> * Fix changelog Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
kakkoyun
added a commit
that referenced
this pull request
Apr 30, 2021
* match external labels in exemplars API Signed-off-by: yeya24 <yb532204897@gmail.com> * update changelog Signed-off-by: yeya24 <yb532204897@gmail.com> * fix lint Signed-off-by: yeya24 <yb532204897@gmail.com> * fix flaky tests Signed-off-by: yeya24 <yb532204897@gmail.com> * Fix changelog Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> Co-authored-by: Ben Ye <yb532204897@gmail.com>
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.
Signed-off-by: yeya24 yb532204897@gmail.com
Fixes #4116
Changes
Add logic of matching external labels in the exemplars API proxy.
The matching part is a little bit complex because the input is a query, which might contain multiple vector selectors.
We need to match each vector selector separately and construct the final query after all matches are processed.
Verification
Tested locally and one unit test.
We don't have an E2E test for exemplars now so no E2E test added.