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

Explore: Fixes so intervals are recalculated on run query #16510

Merged
merged 1 commit into from
Apr 11, 2019

Conversation

hugohaggmark
Copy link
Contributor

What this PR does / why we need it:
We only calculated intervals when we initialized Explore and on resize. This PR makes sure that we always recalculate intervals before running any query.

Which issue(s) this PR fixes:
Fixes: #16485

Special notes for your reviewer:

@hugohaggmark hugohaggmark self-assigned this Apr 11, 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, and also did some tests with prometheus and Elasticsearch and works as intended :)

@torkelo torkelo added this to the 6.1.4 milestone Apr 11, 2019
@hugohaggmark hugohaggmark merged commit 1341f45 into master Apr 11, 2019
@hugohaggmark hugohaggmark deleted the hugoh/bug-explore-interval-not-updated branch April 11, 2019 11:56
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 11, 2019
* grafana/master:
  Update jwt regexp to include = (grafana#16521)
  Chore: docs fixes underscore formatting (grafana#16516)
  Fix: Pass missing maxDataPoints to query in Explore (grafana#16513)
  Fix: Recalculate intervals in Explore on run queries (grafana#16510)
  devenv: add elasticsearch v6 filebeat integration (grafana#16493)
  devenv: add worldmap panel panels for elasticsearch (grafana#16313)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 12, 2019
…-srv

* grafana/master: (59 commits)
  Chore: Remove implicit anys for DashboardModel and tests (grafana#16553)
  Pushover alert, support for different sound for OK (grafana#16525)
  Chore: Lowered implicit anys limit to 6816
  CloudWatch: Fix template variable expand bug (grafana#16405)
  CloudWatch: fix color order (grafana#16408)
  Plugins: Unifying alpha state & options for all plugins  (grafana#16530)
  Revert "Build: Upgrades to go 1.12.3 (grafana#16491)" (grafana#16544)
  Annotations: Annotation list style improvements   (grafana#16541)
  QueryInspector: Now shows error responses (grafana#16514)
  Build: Upgrades to go 1.12.3 (grafana#16491)
  Build: Update master version number (grafana#16532)
  Elasticsearch: Format elasticsearch test dashboard json (grafana#16537)
  Update jwt regexp to include = (grafana#16521)
  Chore: docs fixes underscore formatting (grafana#16516)
  Fix: Pass missing maxDataPoints to query in Explore (grafana#16513)
  Fix: Recalculate intervals in Explore on run queries (grafana#16510)
  devenv: add elasticsearch v6 filebeat integration (grafana#16493)
  devenv: add worldmap panel panels for elasticsearch (grafana#16313)
  Plugins: Optionally preload some plugins during frontend app boot (grafana#15266)
  Panels: Add types for DataList and range (grafana#16500)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 14, 2019
* grafana/master: (63 commits)
  DirectInput: new alpha datasource that lets you enter data via CSV
  Plugins: expose getBackendSrv() to plugins (grafana#15268)
  DataPanel: Added built-in interval variables to scopedVars (grafana#16556)
  TestData: Add minInterval query option
  Chore: Remove implicit anys for DashboardModel and tests (grafana#16553)
  Pushover alert, support for different sound for OK (grafana#16525)
  Chore: Lowered implicit anys limit to 6816
  CloudWatch: Fix template variable expand bug (grafana#16405)
  CloudWatch: fix color order (grafana#16408)
  Plugins: Unifying alpha state & options for all plugins  (grafana#16530)
  Revert "Build: Upgrades to go 1.12.3 (grafana#16491)" (grafana#16544)
  Annotations: Annotation list style improvements   (grafana#16541)
  QueryInspector: Now shows error responses (grafana#16514)
  Build: Upgrades to go 1.12.3 (grafana#16491)
  Build: Update master version number (grafana#16532)
  Elasticsearch: Format elasticsearch test dashboard json (grafana#16537)
  Update jwt regexp to include = (grafana#16521)
  Chore: docs fixes underscore formatting (grafana#16516)
  Fix: Pass missing maxDataPoints to query in Explore (grafana#16513)
  Fix: Recalculate intervals in Explore on run queries (grafana#16510)
  ...
dprokop pushed a commit that referenced this pull request Apr 16, 2019
@dprokop dprokop mentioned this pull request Apr 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Explore: Interval not updated when time range changes
3 participants