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

fix grafana config #206

Merged
merged 5 commits into from
Dec 3, 2018
Merged

fix grafana config #206

merged 5 commits into from
Dec 3, 2018

Conversation

tennix
Copy link
Member

@tennix tennix commented Nov 30, 2018

  • mount monitor configmap to grafana container
  • upgrade grafana to 4.6.5
  • fix grafana configuration behind reverse proxy
  • make grafana deployment optional
  • add e2e test for monitor

@tennix
fix grafana config
5b96c50 
* mount monitor configmap to grafana container
* upgrade grafana to 4.6.5
* fix grafana configuration behind reverse proxy
* make grafana deployment optional
* add e2e test for monitor
@tennix
Merge branch 'master' into fix-grafana-config
3673253
@tennix
Copy link
Member Author

tennix commented Nov 30, 2018

/run-e2e-tests

@tennix
Copy link
Member Author

tennix commented Nov 30, 2018

/run-e2e-tests

@tennix
Copy link
Member Author

tennix commented Nov 30, 2018

The Grafana docker startup script run.sh was misconfigured to chown configuration directory which in Kubernetes is mounted as read only volume. See here grafana/grafana-docker#51
This was fixed about a year ago, but latest 4.6.5 docker image which was released 17 days ago still has this problem. So the configmap is not mounted and environment variables are used instead.

@tennix
Copy link
Member Author

tennix commented Nov 30, 2018

/run-e2e-tests

@tennix
Copy link
Member Author

tennix commented Dec 1, 2018

/run-e2e-tests

@tennix tennix changed the title [WIP] fix grafana config fix grafana config Dec 1, 2018
xiaojingchen
xiaojingchen approved these changes Dec 1, 2018
View reviewed changes
Copy link
Contributor

@xiaojingchen xiaojingchen left a comment

Choose a reason for hiding this comment

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

LGTM

@tennix
Copy link
Member Author

tennix commented Dec 1, 2018

/run-e2e-tests

@tennix tennix merged commit ebcb306 into pingcap:master Dec 3, 2018
@tennix tennix deleted the fix-grafana-config branch December 3, 2018 07:24
queenliuxx pushed a commit to queenliuxx/tidb-operator that referenced this pull request Dec 19, 2018
@tennix
fix grafana config (pingcap#206)
f04a731 
* fix grafana config
* mount monitor configmap to grafana container
* upgrade grafana to 4.6.5
* fix grafana configuration behind reverse proxy
* make grafana deployment optional
* add e2e test for monitor
* use env to set grafana server root_url and domain
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weekface weekface weekface approved these changes

@xiaojingchen xiaojingchen xiaojingchen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tennix @weekface @xiaojingchen