Module: check_mk Branch: master Commit: a261bd401f573376fa6ca1d14e003ba7114ab032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a261bd401f5733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 10 16:00:42 2015 +0200 pfsense_counter: minor code cleanup --- checks/pfsense_counter | 32 ++++++-------- web/plugins/wato/check_parameters.py | 79 ++++++++++++++++------------------ 2 files changed, 52 insertions(+), 59 deletions(-) diff --git a/checks/pfsense_counter b/checks/pfsense_counter index 3b0edce..6928ee0 100644 --- a/checks/pfsense_counter +++ b/checks/pfsense_counter @@ -47,16 +47,14 @@ def inventory_pfsense_counter(parsed): def check_pfsense_counter(_no_item, params, parsed): namestoinfo = { - "matched" : "Packets that matched a rule:", - "badoffset" : "Packets with bad offset:", - "fragment" : "Fragmented packets:", - "short" : "Short packets:", - "normalized" : "Normalized packets:", - "memdrop" : "Packets dropped due to memory limitations:", + "matched" : "Packets that matched a rule", + "badoffset" : "Packets with bad offset", + "fragment" : "Fragmented packets", + "short" : "Short packets", + "normalized" : "Normalized packets", + "memdrop" : "Packets dropped due to memory limitations", } - rate = {} - avgrate = {} this_time = time.time() if params.get("average"): @@ -66,20 +64,18 @@ def check_pfsense_counter(_no_item, params, parsed): backlog_minutes = None for what in parsed: - rate[what] = get_rate("pfsense_counter-%s" % what, this_time, parsed[what]) - perfrate = ("fw_packets_" + what, rate[what]) + rate = get_rate("pfsense_counter-%s" % what, this_time, parsed[what]) + perfrate = ("fw_packets_" + what, rate) if backlog_minutes: - avgrate[what] = get_average("pfsense_counter-%srate" % what, this_time, - rate[what], backlog_minutes) - check_against = avgrate[what] - perfavg = ("fw_avg_packets_" + what, avgrate[what]) - infotext = "%s %.2f" % (namestoinfo[what], avgrate[what]) + avgrate = get_average("pfsense_counter-%srate" % what, this_time, + rate, backlog_minutes) + check_against = avgrate + perfavg = ("fw_avg_packets_" + what, avgrate) else: perfavg = None - check_against = rate[what] - infotext = "%s %.2f" % (namestoinfo[what], rate[what]) - infotext = "%s %.2f pkts/s" % (namestoinfo[what], check_against + check_against = rate + infotext = "%s: %.2f pkts/s" % (namestoinfo[what], check_against) status = 0 if params.get(what): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4990e6c..e664d60 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -340,48 +340,45 @@ register_check_parameters( default_value = 15, label = _("Compute average over last "), )), - ("matched", Tuple( - title = _("Levels for rate of packets that matched a rule"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], + ( "fragment", + Tuple( + title = _("Levels for rate of fragmented packets"), + elements = [ + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 200.0), + ], + )), + ( "normalized", + Tuple( + title = _("Levels for rate of normalized packets"), + elements = [ + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 10.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 50.0), + ], + )), + ( "badoffset", + Tuple( + title = _("Levels for rate of packets with bad offset"), + elements = [ + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.1), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + ], + )), + ( "short", + Tuple( + title = _("Levels for rate of short packets"), + elements = [ + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.1), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + ], + )), + ( "memdrop", Tuple( + title = _("Levels for rate of packets dropped due to memory limitations"), + elements = [ + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.001), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + ], )), - ("badoffset", Tuple( - title = _("Levels for rate of packets with bad offset"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], - )), - ("fragment", Tuple( - title = _("Levels for rate of fragmented packets"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], - )), - ("short", Tuple( - title = _("Levels for rate of short packets"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], - )), - ("normalized", Tuple( - title = _("Levels for rate of normalized packets"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], - )), - ("memdrop", Tuple( - title = _("Levels for rate of packets dropped due to memory limitations"), - elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 85.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 90.0), - ], - )), ], ), None,