Module: check_mk Branch: master Commit: 6b28c84279cd5a747fae22adea7c22345df4446f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b28c84279cd5a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jun 9 13:37:05 2015 +0200 LVM rule is now simplified --- web/plugins/wato/check_parameters.py | 36 ++-------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2803fe5..d29d2c1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2617,7 +2617,7 @@ register_check_parameters( elements = [ get_free_used_dynamic_valuespec("used", "volume group"), Transform( - get_free_used_dynamic_valuespec("free", "filesystem", default_value = (20.0, 10.0)), + get_free_used_dynamic_valuespec("free", "volume group", default_value = (20.0, 10.0)), title = _("Levels for free space"), allow_empty = False, forth = transform_filesystem_free, @@ -2626,48 +2626,16 @@ register_check_parameters( ] ) ), - # Beware: this is a nasty hack that helps us to detect new-style paramters. - # Something hat has todo with float/int conversion and has not been documented - # by the one who implemented this. - ( "flex_levels", - FixedValue( - None, - totext = "", - title = "", - )), ( "show_levels", DropdownChoice( title = _("Display warn/crit levels in check output..."), choices = [ ( "onproblem", _("Only if the status is non-OK")), - ( "onmagic", _("If the status is non-OK or a magic factor is set")), ( "always", _("Always") ), ], - default_value = "onmagic", + default_value = "onproblem", )), - ( "magic", - Float( - title = _("Magic factor (automatic level adaptation for large volume groups)"), - default_value = 0.8, - minvalue = 0.1, - maxvalue = 1.0)), - ( "magic_normsize", - Integer( - title = _("Reference size for magic factor"), - default_value = 20, - minvalue = 1, - unit = _("GB"))), - ( "levels_low", - Tuple( - title = _("Minimum levels if using magic factor"), - help = _("The levels will never fall below these values, when using " - "the magic factor and the volume group is very small."), - elements = [ - Percentage(title = _("Warning at"), unit = _("% usage"), allow_int = True, default_value=50), - Percentage(title = _("Critical at"), unit = _("% usage"), allow_int = True, default_value=60)])), - ], - hidden_keys = ["flex_levels"], ), TextAscii( title = _("Volume Group"),