From 8af0ffe9e1cdb69a0fc9e2556fa0fbd1ccb6e43c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 18 Aug 2018 07:42:14 -0500 Subject: [PATCH] mgr/devicehealth: leave health monitoring off by default For now at least.. unless all of the tests have been adjusted accordingly to expect a device_health_metrics pool. Signed-off-by: Sage Weil --- src/pybind/mgr/devicehealth/module.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py index ac7fa7a0ed2f7..f5e4522f9b85b 100644 --- a/src/pybind/mgr/devicehealth/module.py +++ b/src/pybind/mgr/devicehealth/module.py @@ -14,7 +14,7 @@ from six import iteritems TIME_FORMAT = '%Y%m%d-%H%M%S' DEFAULTS = { - 'enable_monitoring': str(True), + 'enable_monitoring': str(False), 'scrape_frequency': str(86400), 'retention_period': str(86400 * 14), 'pool_name': 'device_health_metrics', @@ -160,10 +160,9 @@ class Module(MgrModule): assert before != after def refresh_config(self): - self.enable_monitoring = self.get_config('enable_monitoring', - '') is not '' or 'false' for opt, value in iteritems(DEFAULTS): setattr(self, opt, self.get_config(opt) or value) + self.log.debug(' %s = %s', opt, getattr(self, opt)) def serve(self): self.log.info("Starting") @@ -180,7 +179,7 @@ class Module(MgrModule): while self.run: self.refresh_config() - if self.enable_monitoring: + if self.enable_monitoring == 'true' or self.enable_monitoring == 'True': self.log.debug('Running') self.check_health() -- 2.39.5