]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/prometheus: Cast collect_timeout (scrape_interval) to float 31108/head
authorBenjeman Meekhof <bmeekhof@users.noreply.github.com>
Mon, 29 Jul 2019 14:28:40 +0000 (10:28 -0400)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 24 Oct 2019 03:27:09 +0000 (10:27 +0700)
commitff294c708323712f2fe3632d457b87a91917d12b
tree3b1d7f2658e7fcf1cfeca5ed9a4c1b00d38592ab
parentaafdd9a7ec3ee645d6e1f150651d03239d9b425a
mgr/prometheus: Cast collect_timeout (scrape_interval) to float

If set by user scrape_interval option is returned as non-float by get_localized_module_option.
Metric cache timeout comparison always returns true and data is never refreshed.

Fixes: https://tracker.ceph.com/issues/40997
Signed-off-by: Ben Meekhof <bmeekhof@umich.edu>
(cherry picked from commit 26a74a0d83e068b0bb762c4c7066b4b195187e94)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: get_localized_module_option() in master, get_localized_config() in mimic
src/pybind/mgr/prometheus/module.py