From: Benjeman Meekhof Date: Mon, 29 Jul 2019 14:28:40 +0000 (-0400) Subject: mgr/prometheus: Cast collect_timeout (scrape_interval) to float X-Git-Tag: v13.2.7~15^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff294c708323712f2fe3632d457b87a91917d12b;p=ceph.git 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 (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 --- diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index f27b223508bd8..3a398e0b0c800 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -721,7 +721,8 @@ class Module(MgrModule): raise cherrypy.HTTPError(503, 'No MON connection') # Make the cache timeout for collecting configurable - self.collect_timeout = self.get_localized_config('scrape_interval', 5.0) + self.collect_timeout = float(self.get_localized_config( + 'scrape_interval', 5.0)) server_addr = self.get_localized_config('server_addr', DEFAULT_ADDR) server_port = self.get_localized_config('server_port', DEFAULT_PORT)