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

Datasource: Show access (Browser/Server) select on the Prometheus datasource #21833

Merged
merged 2 commits into from Feb 4, 2020

Conversation

jorgelbg
Copy link
Contributor

What this PR does / why we need it:

Since the datasource configuration of the Prometheus datasource was migrated to React on PR #20248 the access options (Browser/Server) are no longer visible/configurable.

I found that in #12757 there was a proposal of removing entirely the Browser/Direct option (for Elasticsearch) but I could see the reasoning extending to all other datasources as well. Nevertheless, I didn't find anything specifically about the removal of the options in the CHANGELOG and the documentation for the current release (v6.6.0) still mentions the Access option.

Also, the ES datasource was already migrated to React and kept the Access option as well.

Special notes for your reviewer:

If the final decision of the Grafana team is to remove the option altogether feel free to close this PR. In that case, a new PR updating the documentation should be opened.

@peterholmberg
Copy link
Contributor

I think this is a mistake from me, good catch! Could you fix the failing test so we can merge this?

@peterholmberg peterholmberg added this to In Review in Frontend Platform Backlog via automation Jan 31, 2020
@peterholmberg peterholmberg added type/bug pr/external This PR is from external contributor datasource/Prometheus and removed type/bug labels Jan 31, 2020
@jorgelbg
Copy link
Contributor Author

@peterholmberg I retriggered the CI pipeline because the test that was failing was not from the modified code (the ES datasource was the one failing). All the tests passed now 🤷‍♂.

P.S: I suspect that it could have been related to the time management on the ES datasource (with the index pattern) but couldn't reproduce it either.

@peterholmberg peterholmberg merged commit 9609963 into grafana:master Feb 4, 2020
Frontend Platform Backlog automation moved this from In Review to Done Feb 4, 2020
@marefr marefr added this to the 6.6.1 milestone Feb 4, 2020
@marefr
Copy link
Member

marefr commented Feb 4, 2020

@peterholmberg this is 6.6.1 material so have updated milestone and labels

alexanderzobnin pushed a commit that referenced this pull request Feb 5, 2020
…asource (#21833)

* Datasource: Show access (Browser/Server) select on the Prometheus datasource configuration editor

* Trigger build

(cherry picked from commit 9609963)
alexanderzobnin pushed a commit that referenced this pull request Feb 6, 2020
…asource (#21833)

* Datasource: Show access (Browser/Server) select on the Prometheus datasource configuration editor

* Trigger build

(cherry picked from commit 9609963)
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.

None yet

4 participants