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.

Sign up for GitHub

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

Jump to bottom

Playlist: Fix loading dashboards by tag #16727

Merged
merged 1 commit into from Apr 24, 2019
Merged

Playlist: Fix loading dashboards by tag #16727

merged 1 commit into from Apr 24, 2019

Conversation

marefr
Copy link
Member

@marefr marefr commented Apr 23, 2019

What this PR does / why we need it:
Makes playlists based on tags working again.

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

Special notes for your reviewer:

@marefr marefr added this to the 6.1.5 milestone Apr 23, 2019
@marefr marefr requested a review from jschill April 23, 2019 14:02
@jschill
Copy link
Contributor

jschill commented Apr 24, 2019

Confirmed working. The Url returned now includes the slug (the Slug itself is still empty, but it's not related to this issue).

@marefr
Copy link
Member Author

marefr commented Apr 24, 2019

@jschill The slug is sort of legacy so decided to not include that.

@marefr marefr merged commit 7dadebb into master Apr 24, 2019
@marefr marefr deleted the 16704_fix branch April 24, 2019 08:10
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 25, 2019
@ryantxu
Merge branch 'streaming-test-data-alt' of github.com:ryantxu/grafana …
1f385ca 
…into streaming-test-data-alt

* 'streaming-test-data-alt' of github.com:ryantxu/grafana:
  PanelChrome: delay state update while other panel is in fullscreen/edit
  TestData: don't reuse unsubbed stream workers
  PanelQueryState: give code a bit of air (space)
  PanelQuery: Minor refactoring
  sqlstore: use column name in order by (grafana#16583)
  user friendly guide (grafana#16743)
  Provisioning: Interpolate env vars in provisioning files (grafana#16499)
  admin: add more stats about roles (grafana#16667)
  Feature: Migrate Legend components to grafana/ui (grafana#16468)
  playlist: fix loading dashboards by tag (grafana#16727)
  CloudWatch: Use default alias if there is no alias for metrics (grafana#16732)
  Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 25, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into transforms
c137ef3 
* grafana/master:
  GraphLegendEditor: use stats picker rather than switches (grafana#16759)
  Feature: add cron setting for the ldap settings (grafana#16673)
  Build: Disables gosec until identified performance problems (grafana#16764)
  Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761)
  elasticsearch: add 7.x version support (grafana#16646)
  Provisioning: Add API endpoint to reload provisioning configs (grafana#16579)
  Config: Show user-friendly error message instead of stack trace (grafana#16564)
  Chore: Lowered implicit anys limit to 5954
  Feature: Enable React based options editors for Datasource plugins (grafana#16748)
  sqlstore: use column name in order by (grafana#16583)
  user friendly guide (grafana#16743)
  Provisioning: Interpolate env vars in provisioning files (grafana#16499)
  admin: add more stats about roles (grafana#16667)
  Feature: Migrate Legend components to grafana/ui (grafana#16468)
  playlist: fix loading dashboards by tag (grafana#16727)
  CloudWatch: Use default alias if there is no alias for metrics (grafana#16732)
  Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 25, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into useQueryRunner-in-…
1e39108 
…MetricPanelCtrl

* grafana/master: (34 commits)
  Streaming: support streaming and a javascript test datasource (grafana#16729)
  GraphLegendEditor: use stats picker rather than switches (grafana#16759)
  Feature: add cron setting for the ldap settings (grafana#16673)
  Build: Disables gosec until identified performance problems (grafana#16764)
  Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761)
  elasticsearch: add 7.x version support (grafana#16646)
  Provisioning: Add API endpoint to reload provisioning configs (grafana#16579)
  Config: Show user-friendly error message instead of stack trace (grafana#16564)
  Chore: Lowered implicit anys limit to 5954
  Feature: Enable React based options editors for Datasource plugins (grafana#16748)
  sqlstore: use column name in order by (grafana#16583)
  user friendly guide (grafana#16743)
  Provisioning: Interpolate env vars in provisioning files (grafana#16499)
  admin: add more stats about roles (grafana#16667)
  Feature: Migrate Legend components to grafana/ui (grafana#16468)
  playlist: fix loading dashboards by tag (grafana#16727)
  CloudWatch: Use default alias if there is no alias for metrics (grafana#16732)
  Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
  Refactor: Make SelectOptionItem a generic type to enable select value typing (grafana#16718)
  docs: fix upgrade instructions
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 25, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into min-max-field
5b2305a 
* grafana/master:
  Streaming: support streaming and a javascript test datasource (grafana#16729)
  GraphLegendEditor: use stats picker rather than switches (grafana#16759)
  Feature: add cron setting for the ldap settings (grafana#16673)
  Build: Disables gosec until identified performance problems (grafana#16764)
  Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761)
  elasticsearch: add 7.x version support (grafana#16646)
  Provisioning: Add API endpoint to reload provisioning configs (grafana#16579)
  Config: Show user-friendly error message instead of stack trace (grafana#16564)
  Chore: Lowered implicit anys limit to 5954
  Feature: Enable React based options editors for Datasource plugins (grafana#16748)
  sqlstore: use column name in order by (grafana#16583)
  user friendly guide (grafana#16743)
  Provisioning: Interpolate env vars in provisioning files (grafana#16499)
  admin: add more stats about roles (grafana#16667)
  Feature: Migrate Legend components to grafana/ui (grafana#16468)
  playlist: fix loading dashboards by tag (grafana#16727)
  CloudWatch: Use default alias if there is no alias for metrics (grafana#16732)
  Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Apr 25, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into clone-reference-panel
84993c9 
* grafana/master: (31 commits)
  Streaming: support streaming and a javascript test datasource (grafana#16729)
  GraphLegendEditor: use stats picker rather than switches (grafana#16759)
  Feature: add cron setting for the ldap settings (grafana#16673)
  Build: Disables gosec until identified performance problems (grafana#16764)
  Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761)
  elasticsearch: add 7.x version support (grafana#16646)
  Provisioning: Add API endpoint to reload provisioning configs (grafana#16579)
  Config: Show user-friendly error message instead of stack trace (grafana#16564)
  Chore: Lowered implicit anys limit to 5954
  Feature: Enable React based options editors for Datasource plugins (grafana#16748)
  sqlstore: use column name in order by (grafana#16583)
  user friendly guide (grafana#16743)
  Provisioning: Interpolate env vars in provisioning files (grafana#16499)
  admin: add more stats about roles (grafana#16667)
  Feature: Migrate Legend components to grafana/ui (grafana#16468)
  playlist: fix loading dashboards by tag (grafana#16727)
  CloudWatch: Use default alias if there is no alias for metrics (grafana#16732)
  Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
  Refactor: Make SelectOptionItem a generic type to enable select value typing (grafana#16718)
  docs: fix upgrade instructions
  ...
bergquist pushed a commit to bergquist/grafana that referenced this pull request Apr 29, 2019
@marefr @bergquist
playlist: fix loading dashboards by tag (grafana#16727)
02222a7 
Fixes grafana#16704
(cherry picked from commit 7dadebb)
bergquist added a commit that referenced this pull request Apr 29, 2019
@bergquist
Merge branch 'cp_6.1.6' into v6.1.x
cf9cb45 
* cp_6.1.6:
  Revert "CloudWatch: Use default alias if there is no alias for metrics (#16732)"
  bump version to 6.1.6
  security: bump jquery version to 3.4.0
  playlist: fix loading dashboards by tag (#16727)
  CloudWatch: Use default alias if there is no alias for metrics (#16732)
  phantomjs: set web-security to true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jschill jschill jschill approved these changes

@bergquist bergquist bergquist approved these changes

Assignees
No one assigned
Labels
add to changelog type/bug
Projects
None yet
Milestone
6.1.6
Development

Successfully merging this pull request may close these issues.

Playlists based on tags stopped working
3 participants
@marefr @jschill @bergquist