]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33515 into master
authorSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 22:15:55 +0000 (16:15 -0600)
committerSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 22:15:55 +0000 (16:15 -0600)
* refs/pull/33515/head:
mgr/cephadm: replace static SSL cert
mgr/cephadm: dynamically add Grafana data sources
mgr/cephadm: provide static default configs for grafana deployment
mgr/cephadm: provision grafana
mgr/orch: add grafana hooks

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge