[checkmk-commits] Check_MK Git: check_mk: CPU load ruleset does now accept float values

Module: check_mk Branch: master Commit: 63a9da631102ec9a2b9ed557cbaa1016b1ed4325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a9da631102ec… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Jan 17 09:49:56 2013 +0100 CPU load ruleset does now accept float values --- ChangeLog | 1 + web/plugins/wato/check_parameters.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3ae1a8..8dc1047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * LDAP: Implemnted some kind of debug logging for LDAP communication WATO: + * CPU load ruleset does now accept float values * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor 1.2.1i4: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 41326f4..d3080d5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1132,13 +1132,15 @@ checkgroups.append(( checkgroups.append(( subgroup_os, "memory", - _("Main memory usage (Linux / UNIX)"), + _("Main memory usage (Linux / UNIX / Other Devices)"), Alternative( help = _("The levels for memory usage on Linux and UNIX systems take into account the " "currently used memory (RAM or SWAP) by all processes and sets this in relation " "to the total RAM of the system. This means that the memory usage can exceed 100%. " "A usage of 200% means that the total size of all processes is twice as large as " - "the main memory, so <b>at least</b> the half of it is currently swapped out."), + "the main memory, so <b>at least</b> the half of it is currently swapped out. " + "Besides Linux and UNIX systems, these parameters are also used for memory checks " + "of other devices, like Cisco and Fortigate devices."), elements = [ Tuple( title = _("Specify levels in percentage of total RAM"), @@ -1180,10 +1182,12 @@ checkgroups.append(( "for one. The <u>load average</u> is the averaged CPU load over the last 1, " "5 or 15 minutes. The following levels will be applied on the average " "load. On Linux system the 15-minute average load is used when applying " - "those levels."), + "those levels. The configured levels are multiplied with the number of " + "CPUs, so you should configure the levels based on the value you want to " + "be warned \"per CPU\"."), elements = [ - Integer(title = _("Warning at a load of")), - Integer(title = _("Critical at a load of"))]), + Float(title = _("Warning at a load of")), + Float(title = _("Critical at a load of"))]), None, None)) checkgroups.append((