New commit detected on ManageIQ/manageiq-providers-kubernetes/gaprindashvili: https://github.com/ManageIQ/manageiq-providers-kubernetes/commit/767ed8106f6808a2d83175b9773f191a86893cbd commit 767ed8106f6808a2d83175b9773f191a86893cbd Author: Mooli Tayer <mtayer> AuthorDate: Thu Dec 14 14:00:16 2017 +0200 Commit: Satoe Imaishi <simaishi> CommitDate: Mon Dec 18 09:45:48 2017 -0500 Merge pull request #187 from yaacov/metric-capture-interval-60s Make capture interval a multiple of 30s (cherry picked from commit 9be0e668b23e822aeaf3eef960fcb3a0f1fa04cb) https://bugzilla.redhat.com/show_bug.cgi?id=1527094 .../container_manager/metrics_capture.rb | 5 +- .../metrics_capture/capture_context_mixin.rb | 29 +++++++--- .../metrics_capture/hawkular_capture_context.rb | 2 +- .../metrics_capture/prometheus_capture_context.rb | 3 +- .../prometheus_capture_context_spec.rb | 3 +- .../container_manager/metrics_capture_spec.rb | 66 +++++++++++----------- 6 files changed, 62 insertions(+), 46 deletions(-)
backported upstream: https://github.com/ManageIQ/manageiq-providers-kubernetes/pull/187