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

Allow custom data source in mixin dashboards. #1749

Merged
merged 1 commit into from
Apr 25, 2022

Conversation

jmcarp
Copy link
Contributor

@jmcarp jmcarp commented Apr 22, 2022

What this PR does

This restores a tiny change from cortex-jsonnet to allow custom datasources for compiled dashboards: grafana/cortex-jsonnet#407.

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@jmcarp jmcarp force-pushed the custom-datasource branch from c424eee to 7b3d82a Compare April 22, 2022 14:57
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thank you.

CHANGELOG.md Outdated
@@ -2,6 +2,7 @@

## Grafana Mimir - main / unreleased

* [ENHANCEMENT] Dashboards: Allow custom datasources. #1605
Copy link
Member

Choose a reason for hiding this comment

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

Please move this under "Jsonnet" section.

Copy link
Member

Choose a reason for hiding this comment

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

PR number should be 1749.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to the mixin section, since that seemed to be the place where other dashboard updates are tracked.

Copy link
Member

Choose a reason for hiding this comment

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

You're right, thank you. Can you please fix the [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX] order? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

Copy link
Member

Choose a reason for hiding this comment

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

Thank you.

@jmcarp jmcarp force-pushed the custom-datasource branch 2 times, most recently from 8a8403a to d704dd2 Compare April 22, 2022 20:19
Adapted from grafana/cortex-jsonnet#407.

Signed-off-by: Josh Carp <jm.carp@gmail.com>
@jmcarp jmcarp force-pushed the custom-datasource branch from d704dd2 to ca4c164 Compare April 25, 2022 14:22
@pstibrany pstibrany merged commit 446c321 into grafana:main Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants