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

Fix: Update the revision of kubernetes-grafana. #2263

Merged
merged 1 commit into from Jan 7, 2019
Merged

Fix: Update the revision of kubernetes-grafana. #2263

merged 1 commit into from Jan 7, 2019

Conversation

@lentil1016
Copy link
Contributor

@lentil1016 lentil1016 commented Jan 6, 2019

What this pull request do

Hi, in brancz/kubernetes-grafana the url of prometheus datasource is used to be http://prometheus-k8s.monitoring.svc:9090 by default. And kube-prometheus use this value without override it, which caused grafana not be able to access prometheus when _config.namepsace is solved to some value other than monitoring, like kube-system.

This PR override the url of prometheus datasource config in brancz/kubernetes-grafana with 'http://prometheus-k8s.' + $._config.namespace + '.svc:9090'

@metalmatze
Copy link
Member

@metalmatze metalmatze commented Jan 7, 2019

With brancz/kubernetes-grafana#56 being merged, we don't need to explicitly set this here now. Instead we need to update the revision for the kubernetes-grafana dependency. Then the change in kubernetes-grafana should take the correct namespace into account.

@lentil1016
Copy link
Contributor Author

@lentil1016 lentil1016 commented Jan 7, 2019

Cool, I'll close this PR for it's not necessary anymore. Or maybe just recommit here to update the revision.

@lentil1016 lentil1016 closed this Jan 7, 2019
@lentil1016 lentil1016 reopened this Jan 7, 2019
@metalmatze
Copy link
Member

@metalmatze metalmatze commented Jan 7, 2019

I was about to push the same. 😄 But I guess you already have done the same 🤷‍♂️
I can confirm that it works now. Changing the namespace to kube-system in contrib/kube-prometheus/example.jsonnet and then generating the manifests folder with ./build.sh results in an updated datasource with the correct URL 👍
We can merge this, when Travis is green.

Thanks

@lentil1016
Copy link
Contributor Author

@lentil1016 lentil1016 commented Jan 7, 2019

Good to go. ; )

@lentil1016 lentil1016 changed the title Fix: Override the url of Prometheus datasource. Fix: Update the revision of kubernetes-grafana. Jan 7, 2019
@metalmatze metalmatze merged commit 32c6e86 into prometheus-operator:master Jan 7, 2019
1 check passed
@lentil1016 lentil1016 deleted the patch-1 branch Jan 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants