]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #21696 from jan--f/prometheus-file_sd-consider-defaultport
authorKefu Chai <tchaikov@gmail.com>
Wed, 2 May 2018 02:00:15 +0000 (10:00 +0800)
committerGitHub <noreply@github.com>
Wed, 2 May 2018 02:00:15 +0000 (10:00 +0800)
commit7e4f7c7718fd5503fd81cf0356e909c7f3df0ab2
tree51d21d8b86879909db76390f87ff16f7ce4665bb
parent932b93ea1609b6bfa0ba742bcc9a68a56c41a42b
parentc7456a4ecfde42580f615042a35a6ed298c5171e
Merge pull request #21696 from jan--f/prometheus-file_sd-consider-defaultport

pybing/mgr/prometheus: return default port if config-key get returns …

Reveiwed-by: John Spray <john.spray@redhat.com>
src/pybind/mgr/prometheus/module.py