Module: check_mk
Branch: master
Commit: ef29ba9309c0888723ab09ff26a2e3caf89ba283
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef29ba9309c088…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Mon Mar 13 16:53:25 2017 +0100
minor cleanup
Change-Id: Ibcbb610321270e142a5ae32a41c38d81ecf2382a
---
checks/netstat.include | 33 ++++++++++++++++++---------------
web/plugins/wato/check_parameters.py | 16 ++++++++--------
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/checks/netstat.include b/checks/netstat.include
index 1822429..a57cdad 100644
--- a/checks/netstat.include
+++ b/checks/netstat.include
@@ -53,28 +53,31 @@ def check_netstat_generic(item, params, connections):
if match:
found += 1
- # Check if found connections are within limits
- yield 0, "Found %d matching entries" % found
-
+ infotext = "Found %d matching entries" % found
+ states = [0]
if params.get("min_states"):
min_warn, min_crit = params["min_states"]
- if found <= min_crit:
- state = 2
- elif found <= min_warn:
- state = 1
+ if found < min_crit:
+ min_state = 2
+ elif found < min_warn:
+ min_state = 1
else:
- state = 0
- if state:
- yield state, "too few (warn/crit at %d/%d)" % (min_warn, min_crit)
+ min_state = 0
+ if min_state:
+ states.append(min_state)
+ infotext += " (warn/crit below %d/%d)" % (min_warn, min_crit)
if params.get("max_states"):
max_warn, max_crit = params["max_states"]
if found >= max_crit:
- state = 2
+ max_state = 2
elif found >= max_warn:
- state = 1
+ max_state = 1
else:
- state = 0
- if state:
- yield state, "too many (warn/crit at %d/%d)" % (max_warn,
max_crit)
+ max_state = 0
+ if max_state:
+ states.append(max_state)
+ infotext += " (warn/crit at %d/%d)" % (max_warn, max_crit)
+
+ yield max(states), infotext
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index dd343dd..9cedef1 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -6078,21 +6078,21 @@ register_check_parameters(
( "local_port", Integer(title = _("Local port number"),
minvalue = 1, maxvalue = 65535, )),
( "remote_ip", IPv4Address(title = _("Remote IP
address"))),
( "remote_port", Integer(title = _("Remote port number"),
minvalue = 1, maxvalue = 65535, )),
- ( "min_states",
+ ( "max_states",
Tuple(
- title = _("Minimum number of connections or listeners"),
+ title = _("Maximum number of connections or listeners"),
elements = [
- Integer(title = _("Warning if below")),
- Integer(title = _("Critical if below")),
+ Integer(title = _("Warning at")),
+ Integer(title = _("Critical at")),
],
),
),
- ( "max_states",
+ ( "min_states",
Tuple(
- title = _("Maximum number of connections or listeners"),
+ title = _("Minimum number of connections or listeners"),
elements = [
- Integer(title = _("Warning at")),
- Integer(title = _("Critical at")),
+ Integer(title = _("Warning if below")),
+ Integer(title = _("Critical if below")),
],
),
),