diff --git a/tests/common/plugins/memory_utilization/README.md b/tests/common/plugins/memory_utilization/README.md index 73b0e8f477a..65546d857aa 100644 --- a/tests/common/plugins/memory_utilization/README.md +++ b/tests/common/plugins/memory_utilization/README.md @@ -12,7 +12,7 @@ - [Enabling and Disabling](#enabling-and-disabling) - [Configuration Examples](#configuration-examples) - [Supported Memory Monitors](#supported-memory-monitors) - - [Monit Status Monitor](#monit-status-monitor) + - [Monit Validate Monitor](#monit-validate-monitor) - [Free Memory Monitor](#free-memory-monitor) - [Docker Stats Monitor](#docker-stats-monitor) - [Top Monitor](#top-monitor) @@ -225,12 +225,12 @@ Memory utilization checking is enabled by default for all tests. To disable it: ## Supported Memory Monitors and Configuration Examples -### Monit Status Monitor +### Monit Validate Monitor Monitors system memory usage via Monit. -- **Command**: `sudo monit status` -- **Parser Function**: `parse_monit_status_output` +- **Command**: `sudo monit validate` +- **Parser Function**: `parse_monit_validate_output` - **Monitored Parameters**: - `memory_usage`: System memory utilization percentage - **Threshold Type**: Use `percentage_points` for percentage-based thresholds @@ -239,7 +239,7 @@ Example configuration: ```json { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -252,7 +252,7 @@ Example configuration: } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" } ``` @@ -414,7 +414,7 @@ Example: "Arista-7050QX": [ { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -427,7 +427,7 @@ Example: } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" } ] } diff --git a/tests/common/plugins/memory_utilization/memory_utilization.py b/tests/common/plugins/memory_utilization/memory_utilization.py index 74bce72306c..d00efcb39ec 100755 --- a/tests/common/plugins/memory_utilization/memory_utilization.py +++ b/tests/common/plugins/memory_utilization/memory_utilization.py @@ -495,12 +495,12 @@ def parse_free_output(output, memory_params): return memory_values -def parse_monit_status_output(output, memory_params): - """Parse the 'monit status' command output to extract memory usage information.""" +def parse_monit_validate_output(output, memory_params): + """Parse the 'monit validate' command output to extract memory usage information.""" memory_values = {} if not output: - logger.warning("Empty output for monit status command, returning empty values") + logger.warning("Empty output for monit validate command, returning empty values") return memory_values memory_pattern = r"memory usage\s+([\d\.]+ \w+)\s+\[(\d+\.\d+)%\]" diff --git a/tests/common/plugins/memory_utilization/memory_utilization_common.json b/tests/common/plugins/memory_utilization/memory_utilization_common.json index 8c0fa0649c7..748950e187d 100755 --- a/tests/common/plugins/memory_utilization/memory_utilization_common.json +++ b/tests/common/plugins/memory_utilization/memory_utilization_common.json @@ -2,7 +2,7 @@ "COMMON": [ { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -15,7 +15,7 @@ } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" } ] } diff --git a/tests/common/plugins/memory_utilization/memory_utilization_dependence.json b/tests/common/plugins/memory_utilization/memory_utilization_dependence.json index afb38a4b41f..d2a6e31a37e 100755 --- a/tests/common/plugins/memory_utilization/memory_utilization_dependence.json +++ b/tests/common/plugins/memory_utilization/memory_utilization_dependence.json @@ -41,7 +41,7 @@ }, { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -54,7 +54,7 @@ } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" }, { "name": "docker", @@ -203,7 +203,7 @@ "Arista-7050QX": [ { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -216,13 +216,13 @@ } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" } ], "Mellanox-SN4600C": [ { "name": "monit", - "cmd": "sudo monit status", + "cmd": "sudo monit validate", "memory_params": { "memory_usage": { "memory_increase_threshold": { @@ -235,7 +235,7 @@ } } }, - "memory_check": "parse_monit_status_output" + "memory_check": "parse_monit_validate_output" }, { "name": "docker",