Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: mgr/prometheus: Cast collect_timeout (scrape_interval) to float #31108

Merged
merged 1 commit into from Nov 4, 2019

Conversation

@k0ste
Copy link
Contributor

k0ste commented Oct 24, 2019

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 26a74a0)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: get_localized_module_option() in master, get_localized_config() in mimic
@tchaikov tchaikov added this to the mimic milestone Oct 24, 2019
@smithfarm smithfarm added the mgr label Oct 24, 2019
@smithfarm smithfarm requested a review from jan--f Oct 24, 2019
@jan--f
jan--f approved these changes Oct 28, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 31, 2019

@yuriw yuriw merged commit d922bcc into ceph:mimic Nov 4, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.