@grafana/runtime: Add cancellation of queries to DataSourceWithBackend #22818
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
ryantxu
reviewed
Mar 16, 2020
| .then((rsp: any) => { | ||
| return this.toDataQueryResponse(rsp); | ||
| return this.toDataQueryResponse(rsp?.data); |
There was a problem hiding this comment.
Because the datasourceRequest returns a different response object than when using post. It returns
grafana/public/app/types/events.ts
Lines 45 to 55 in 2fac834
ryantxu
reviewed
Mar 16, 2020
| const orgId = config.bootData.user.orgId; | ||
| const queries = targets.map(q => { | ||
| if (q.datasource === ExpressionDatasourceID) { | ||
| expressionCount++; |
There was a problem hiding this comment.
Is this hack not needed anymore? If not where are the backend changes that go with it?
There was a problem hiding this comment.
Doesn't look like it. The expressionCount was provided in body on root level but the grafana backend didn't receive that at all.
bergquist
added a commit
that referenced
this pull request
Mar 18, 2020
* master: (113 commits) AlertNotifications: Translate notifications IDs to UIDs in Rule builder (#19882) CircleCI: Don't build Storybook on PR (#22865) Graphite: Rollup Indicator (#22738) Plugins: Return jsondetails as an json object instead of raw json on datasource healthchecks. (#22859) Backend plugins: Exclude plugin metrics in Grafana's metrics endpoint (#22857) Graphite: Fixed issue with query editor and next select metric now showing after selecting metric node (#22856) Webpack: Fix webpack for enterprise (#22863) Metrics: Storybook documented components (#22854) Search: Improve tags layout , #22804 (#22830) Stackdriver: Fix GCE auth bug when creating new data source (#22836) @grafana/runtime: Add cancellation of queries to DataSourceWithBackend (#22818) Rich history: Test coverage (#22852) Chore: Support Volta in package.json (#22849) CircleCI: Skip enterprise builds for forked PRs (#22851) Toolkit: docker image for plugin CI process (#22790) Revert "Explore: Add test coverage for Rich history (#22722)" (#22850) Datasource config was not mapped for datasource healthcheck (#22848) upgrades plugin sdk to 0.30.0 (#22846) Explore: Add test coverage for Rich history (#22722) Rich History: UX adjustments and fixes (#22729) ...
Merged
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.
What this PR does / why we need it:
Uses the cancellation of queries from #22643 and closing that PR for now.