From b6fd64596f496772b5cc13108e23b58d4b1a2774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Wed, 21 Feb 2024 08:43:18 -0600 Subject: [PATCH 1/2] Change CPU Load Module --- pandora_agents/pc/Win32/pandora_agent.conf | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 216e3149e3..7c8d826289 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2023 Pandora FMS -# Version 7.0NG.775 +# Version 7.0NG.775 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software # Foundation; either version 2 of the Licence or any later version @@ -113,15 +113,20 @@ win32_monitoring_lib NT module_begin module_name CPU Load module_type generic_data -module_wmiquery SELECT LoadPercentage FROM Win32_Processor -module_wmicolumn LoadPercentage -module_description CPU Load (%) -module_min_warning 80 +module_wmiquery SELECT PercentProcessorTime FROM Win32_PerfFormattedData_PerfOS_Processor where name like '_Total' +module_wmicolumn PercentProcessorTime +module_max 100 +module_min 0 +module_description User CPU Usage (%) +module_min_warning 70 module_max_warning 90 module_min_critical 91 module_max_critical 0 +module_unit % +module_group System module_end + # Number processes module_begin module_name Number processes From bb1b8099b8cf34aca9c612e4dd13dd3bfd1f56dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Thu, 22 Feb 2024 08:10:15 -0600 Subject: [PATCH 2/2] Modify CPU Usage module --- pandora_agents/pc/Win32/pandora_agent.conf | 12 ++++-------- pandora_agents/win32/bin/pandora_agent.conf | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 7c8d826289..ffbc937875 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -113,17 +113,13 @@ win32_monitoring_lib NT module_begin module_name CPU Load module_type generic_data -module_wmiquery SELECT PercentProcessorTime FROM Win32_PerfFormattedData_PerfOS_Processor where name like '_Total' -module_wmicolumn PercentProcessorTime -module_max 100 -module_min 0 -module_description User CPU Usage (%) -module_min_warning 70 +module_wmiquery SELECT LoadPercentage FROM Win32_Processor +module_wmicolumn LoadPercentage +module_description CPU Load (%) +module_min_warning 80 module_max_warning 90 module_min_critical 91 module_max_critical 0 -module_unit % -module_group System module_end diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 2ff61033c6..cdde841254 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -157,8 +157,8 @@ ehorus_conf "C:\Program Files\ehorus_agent\ehorus_agent.conf" module_begin module_name CPU Load module_type generic_data -module_wmiquery SELECT LoadPercentage FROM Win32_Processor -module_wmicolumn LoadPercentage +module_wmiquery SELECT PercentProcessorTime FROM Win32_PerfFormattedData_PerfOS_Processor where name like '_Total' +module_wmicolumn PercentProcessorTime module_max 100 module_min 0 module_description User CPU Usage (%)