diff --git a/node-daemon/pvcnoded.sample.yaml b/node-daemon/pvcnoded.sample.yaml index ee36ee50..0fd93981 100644 --- a/node-daemon/pvcnoded.sample.yaml +++ b/node-daemon/pvcnoded.sample.yaml @@ -152,8 +152,8 @@ pvc: log_keepalives: True # log_keepalive_cluster_details: Enable or disable node status logging during keepalive log_keepalive_cluster_details: True - # log_keepalive_storage_details: Enable or disable node storage logging during keepalive - log_keepalive_storage_details: True + # log_keepalive_plugin_details: Enable or disable node health plugin logging during keepalive + log_keepalive_plugin_details: True # console_log_lines: Number of console log lines to store in Zookeeper per VM console_log_lines: 1000 # node_log_lines: Number of node log lines to store in Zookeeper per node diff --git a/node-daemon/pvcnoded/objects/MonitoringInstance.py b/node-daemon/pvcnoded/objects/MonitoringInstance.py index db807ef1..9b9a04a6 100644 --- a/node-daemon/pvcnoded/objects/MonitoringInstance.py +++ b/node-daemon/pvcnoded/objects/MonitoringInstance.py @@ -326,10 +326,11 @@ class MonitoringInstance(object): def run_plugins(self): total_health = 100 - self.logger.out( - f"Running monitoring plugins: {', '.join([x.plugin_name for x in self.all_plugins])}", - state="t", - ) + if self.config["log_keepalive_plugin_details"]: + self.logger.out( + f"Running monitoring plugins: {', '.join([x.plugin_name for x in self.all_plugins])}", + state="t", + ) plugin_results = list() with concurrent.futures.ThreadPoolExecutor(max_workers=99) as executor: to_future_plugin_results = { @@ -340,11 +341,12 @@ class MonitoringInstance(object): plugin_results.append(future.result()) for result in sorted(plugin_results, key=lambda x: x.plugin_name): - self.logger.out( - result.message, - state="t", - prefix=f"{result.plugin_name} ({result.runtime}s)", - ) + if self.config["log_keepalive_plugin_details"]: + self.logger.out( + result.message, + state="t", + prefix=f"{result.plugin_name} ({result.runtime}s)", + ) if result is not None: total_health -= result.health_delta diff --git a/node-daemon/pvcnoded/util/config.py b/node-daemon/pvcnoded/util/config.py index 29543407..e74277a7 100644 --- a/node-daemon/pvcnoded/util/config.py +++ b/node-daemon/pvcnoded/util/config.py @@ -228,8 +228,8 @@ def get_configuration(): "log_keepalive_cluster_details": o_logging.get( "log_keepalive_cluster_details", False ), - "log_keepalive_storage_details": o_logging.get( - "log_keepalive_storage_details", False + "log_keepalive_plugin_details": o_logging.get( + "log_keepalive_plugin_details", False ), "console_log_lines": o_logging.get("console_log_lines", False), "node_log_lines": o_logging.get("node_log_lines", False),