Skip to content
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

Mixed Datasource: Fix error when one query is disabled #16409

Merged
merged 1 commit into from Apr 8, 2019
Merged

Conversation

marefr
Copy link
Member

@marefr marefr commented Apr 5, 2019

This fixes an error that was thrown when one or several queries
was disabled using the mixed datasources.

Fixes #12977

image

This fixes an error that was thrown when one or several queries
was disabled using the mixed datasources.
@marefr marefr added the type/bug label Apr 5, 2019
@marefr marefr added this to the 6.2 milestone Apr 5, 2019
@marefr marefr changed the title Mixed Dtasource: Fix error when one query is disabled Mixed Datasource: Fix error when one query is disabled Apr 5, 2019
Copy link
Member

@torkelo torkelo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@marefr marefr merged commit 4a70056 into master Apr 8, 2019
@marefr marefr deleted the 12977_fix branch April 8, 2019 09:39
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 9, 2019
* grafana/master: (27 commits)
  docs: fixes and update current version
  Docs: Updated changelog for v6.1.3
  Graph: fixed png rendering with legend to the right (grafana#16463)
  Fix: Disables auto open datasource picker on focus (grafana#16398)
  add some mock/stub guidelines to testing guideline (grafana#16466)
  Feat: Suggestion list in Explore is virtualized (grafana#16342)
  Docs: Updated roadmap issue to link to the pinned roadmap issues
  Graph: Fixed auto decimals in legend values (grafana#16455)
  Styling: Aligned heading (grafana#16456)
  add PromQL keyword for adhoc filter (grafana#16426)
  Singlestat: Use decimal override when manually specified (grafana#16451)
  Graph: follow-up graph decimals fix, grafana#16414 (grafana#16450)
  Chore: use remote cache instead of session storage (grafana#16114)
  Docs: Minor changelog tweak
  Docs: Updated changelog with v6.1.2 release issues
  datasource: fix disable query when using mixed datasource (grafana#16409)
  Graph: Fixed series legend color for hidden series (grafana#16438)
  Templating: Fixed loading React variable query editor (grafana#16439)
  Styles: Fixed left menu highlight (grafana#16431)
  Fix: remove test artefact (grafana#16411)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot read property 'datapoints' of undefined while using Mixed datasource
2 participants