]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34d634b 94729ca)
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)
commita28ffa68eab02a8d341ca4a0ac609bba91675209
tree8c97f5fa2da13399e00cc9cf3409d22087fcbed3tree | snapshot
parent34d634b051a865774fb96c351e2fd6b97640e7a8commit | diff
parent94729ca7d3d90a95f012aa4790bb48452b6c3d11commit | diff
Merge PR #33515 into master

* 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>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.