-
Notifications
You must be signed in to change notification settings - Fork 11.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Elasticsearch: Fix passing of limit and datalinks to logs data frame #68554
Conversation
Backend code coverage report for PR #68554
|
Frontend code coverage report for PR #68554
|
Co-authored-by: François Massot <francois.massot@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
there's one thing though..
i wonder if it's a good idea to read frame.meta.custom
in logsModel.ts
. we are kind of making certain custom
values not-custom.
(i understand that we have been doing it before with the custom-frame-type and also with searchWords).
maybe we could just make sure the javascript-dataframe-meta is in sync with go-dataframe-meta instead.
and in the meantime, while we are waiting for that to be done,
we could have a small function in elastic/datasource.ts that transforms a "backend dataframe" to "frontend dataframe" by adjusting the location of searchWords
and limit
.
not sure.
wdyt?
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-68554-to-v10.0.x origin/v10.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x dbbbc46351d81b1c97f8dfaed25f6f0609797967
# Push it to GitHub
git push --set-upstream origin backport-68554-to-v10.0.x
git switch main
# Remove the local backport branch
git branch -D backport-68554-to-v10.0.x Then, create a pull request where the |
…ata frame (#68626) * Elasticsearch: Fix passing of limit and datalinks to logs data frame (#68554) * Elasticsearch: Fix passing of limit and datalinks to logs data frame * Update public/app/core/logsModel.ts Co-authored-by: François Massot <francois.massot@gmail.com> --------- Co-authored-by: François Massot <francois.massot@gmail.com> (cherry picked from commit dbbbc46) * Add missing comment
In this PR we are fixing processing of log response on backend by adding
limit
tometa
and also by enhancingdataFrame
with data links.Similarly as with searchWords, the dataFrames processed on backend have
searchWords
andlimit
inmeta.custom
. Therefore inlogsModel
, we need to make sure that we read at both places.Fixes #68427
How to test:
enableElasticsearchBackendQuerying
enabled and make sure that in Explore, you see limit displayed in meta.