Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: FIX Do not allow spaces in host names in event simulator

by Mathias Kettner

Module: check_mk Branch: master Commit: 96c0a62c4d372bcd6432527227110fe4cb28043d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96c0a62c4d372b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 11:25:46 2014 +0100 FIX Do not allow spaces in host names in event simulator Spaces are not allowed because that breaks the syslog message format. --- .werks/680 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/680 b/.werks/680 new file mode 100644 index 0000000..290446b --- /dev/null +++ b/.werks/680 @@ -0,0 +1,9 @@ +Title: Do not allow spaces in host names in event simulator +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390559112 + +Spaces are not allowed because that breaks the syslog message format. diff --git a/ChangeLog b/ChangeLog index 4e991f8..24ba9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -242,6 +242,7 @@ * 0384 FIX: Trying to prevent problem when restarting mkeventd... * 0427 FIX: Fixed exception when handling connections from event unix socket... * 0679 FIX: Allow non-Ascii characters in generated events + * 0680 FIX: Do not allow spaces in host names in event simulator... Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index ce555ab..5aae1a3 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -680,7 +680,10 @@ vs_mkeventd_event = Dictionary( size = 40, default_value = _("myhost089"), allow_empty = True, - attrencode = True) + attrencode = True, + regex = "^\\S*$", + regex_error = _("The host name may not contain spaces."), + ) ), ( "priority", DropdownChoice(

10 years, 5 months

Check_MK Git: check_mk: Remove obsolete comment

by Mathias Kettner

Module: check_mk Branch: master Commit: e6591cd45ab1725b9ffa77a36e3b22b415f03736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6591cd45ab172… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:53:30 2014 +0100 Remove obsolete comment --- mkeventd/web/htdocs/mkeventd.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index e82258d..8e056f5 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -161,7 +161,6 @@ def query(query): timeout = 10 sock.settimeout(timeout) - # TODO: Pfad nicht auf OMD hart kodieren sock.connect(socket_path) sock.send(query)

10 years, 5 months

Check_MK Git: check_mk: FIX Allow non-Ascii characters in generated events

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c89d6f28e2b79781a0c4da159ff48252e7f0c5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c89d6f28e2b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:52:21 2014 +0100 FIX Allow non-Ascii characters in generated events --- .werks/679 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/679 b/.werks/679 new file mode 100644 index 0000000..407730a --- /dev/null +++ b/.werks/679 @@ -0,0 +1,9 @@ +Title: Allow non-Ascii characters in generated events +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390557118 + + diff --git a/ChangeLog b/ChangeLog index f5d3076..4e991f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ * 0359 FIX: Fixed exception in event simulator when one match group did not match * 0384 FIX: Trying to prevent problem when restarting mkeventd... * 0427 FIX: Fixed exception when handling connections from event unix socket... + * 0679 FIX: Allow non-Ascii characters in generated events Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index ebd3df9..e82258d 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -146,6 +146,8 @@ def send_event(event): timestamp = time.strftime("%b %d %T", time.localtime()) rfc = "<%d>%s %s %s: %s\n" % ( prio, timestamp, event["host"], event["application"], event["text"]) + if type(rfc) == unicode: + rfc = rfc.encode("utf-8") pipe = file(pipe_path, "w") pipe.write(rfc + "\n") return rfc

10 years, 5 months

Check_MK Git: check_mk: EC: fix name of archive command in confirmation

by Mathias Kettner

Module: check_mk Branch: master Commit: 736aa763be6d1e48f843e35c1cb1684c005c437b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=736aa763be6d1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:50:00 2014 +0100 EC: fix name of archive command in confirmation --- mkeventd/web/plugins/views/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 046c62d..ae8230a 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -721,7 +721,7 @@ if mkeventd_enabled: def command_mkeventd_delete(cmdtag, spec, row): if html.var("_delete_event"): command = "DELETE;%s;%s" % (row["event_id"], config.user_id) - title = _("<b>delete</b>") + title = _("<b>archive</b>") return command, title

10 years, 5 months

Check_MK Git: check_mk: Updated draft

by Mathias Kettner

Module: check_mk Branch: master Commit: 06224ac37fc71d4d0462af233ba2b967e6bbd1fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06224ac37fc71d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:46:56 2014 +0100 Updated draft --- doc/drafts/README.rule_based_notifications | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/drafts/README.rule_based_notifications b/doc/drafts/README.rule_based_notifications index dbbcc57..7ff87da 100644 --- a/doc/drafts/README.rule_based_notifications +++ b/doc/drafts/README.rule_based_notifications @@ -262,4 +262,7 @@ D) NOTIFICATION they are not available in the notification context. +============================================================================================== +Further ideas: +- Diagnostic feature: Click on a Host or Service and ask "who will be notified?"

10 years, 5 months

Check_MK Git: check_mk: FIX Move two last global settings of Event Console to proper places

by Mathias Kettner

Module: check_mk Branch: master Commit: c090f44ca49a0cd2ca67c1650cc953295e944bac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c090f44ca49a0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:43:08 2014 +0100 FIX Move two last global settings of Event Console to proper places --- .werks/678 | 9 +++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 61 +++++++++++++++++---------------- web/htdocs/wato.py | 6 +++- 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/.werks/678 b/.werks/678 new file mode 100644 index 0000000..b3187f8 --- /dev/null +++ b/.werks/678 @@ -0,0 +1,9 @@ +Title: Move two last global settings of Event Console to proper places +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390556556 + + diff --git a/ChangeLog b/ChangeLog index bde65fd..f5d3076 100644 --- a/ChangeLog +++ b/ChangeLog @@ -221,6 +221,7 @@ * 0256 FIX: wato snapshots: snapshot restore no longer fails with older python versions... * 0433 FIX: Creating WATO lock during automations (like e.g. master to slave syncs)... * 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode... + * 0678 FIX: Move two last global settings of Event Console to proper places Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index dd7b71b..ce555ab 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1482,21 +1482,6 @@ if mkeventd_enabled: ) register_configvar(group, - "mkeventd_connect_timeout", - Integer( - title = _("Connect timeout to status socket"), - help = _("When the Multisite GUI connects the socket of the event daemon " - "in order to retrieve information about current and historic events " - "then this timeout will be applied."), - minvalue = 1, - maxvalue = 120, - default_value = 10, - unit = "sec", - ), - domain = "multisite", - ) - - register_configvar(group, "replication", Optional( Dictionary( @@ -1675,20 +1660,6 @@ if mkeventd_enabled: ) register_configvar(group, - "mkeventd_pprint_rules", - Checkbox(title = _("Pretty-Print rules in configuration file"), - label = _("enable pretty-printing of rules"), - help = _("When the WATO module of the Event Console saves rules to the file " - "<tt>mkeventd.d/wato/rules.mk</tt> it usually prints the Python " - "representation of the rules-list into one single line by using the " - "native Python code generator. Enabling this option switches to <tt>pprint</tt>, " - "which nicely indents everything. While this is a bit slower for large " - "rulesets it makes debugging and manual editing simpler."), - default_value = False), - domain = "multisite", - ) - - register_configvar(group, "actions", vs_mkeventd_actions, allow_reset = False, @@ -1781,6 +1752,38 @@ if mkeventd_enabled: domain = "mkeventd", ) + # A few settings for Multisite and WATO + register_configvar(_("Status GUI (Multisite)"), + "mkeventd_connect_timeout", + Integer( + title = _("Connect timeout to status socket of Event Console"), + help = _("When the Multisite GUI connects the socket of the event daemon " + "in order to retrieve information about current and historic events " + "then this timeout will be applied."), + minvalue = 1, + maxvalue = 120, + default_value = 10, + unit = "sec", + ), + domain = "multisite", + ) + + register_configvar(_("Configuration GUI (WATO)"), + "mkeventd_pprint_rules", + Checkbox(title = _("Pretty-Print rules in configuration file"), + label = _("enable pretty-printing of rules"), + help = _("When the WATO module of the Event Console saves rules to the file " + "<tt>mkeventd.d/wato/rules.mk</tt> it usually prints the Python " + "representation of the rules-list into one single line by using the " + "native Python code generator. Enabling this option switches to <tt>pprint</tt>, " + "which nicely indents everything. While this is a bit slower for large " + "rulesets it makes debugging and manual editing simpler."), + default_value = False), + domain = "multisite", + ) + + + # Settings that should also be avaiable on distributed Sites that # do not run an own eventd but want to query one or send notifications # to one. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dc5b503..0bcddd7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6358,7 +6358,7 @@ def render_global_configuration_variables(default_values, current_settings, show groupnames.sort() html.write('<div class=globalvars>') for groupname in groupnames: - forms.header(groupname, isopen=False) + header_is_painted = False # needed for omitting empty groups for domain, varname, valuespec in g_configvar_groups[groupname]: if not show_all and (not g_configvars[varname][4] @@ -6371,6 +6371,10 @@ def render_global_configuration_variables(default_values, current_settings, show else: continue + if not header_is_painted: + forms.header(groupname, isopen=False) + header_is_painted = True + defaultvalue = default_values.get(varname, valuespec.default_value()) edit_url = make_link([("mode", "edit_configvar"), ("varname", varname), ("site", html.var("site", ""))])

10 years, 5 months

Check_MK Git: check_mk: Better description for (cached data)

by Mathias Kettner

Module: check_mk Branch: master Commit: 2201ce45b8ad5a1fa58a3ee2d15e19b2b3321be4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2201ce45b8ad5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:35:36 2014 +0100 Better description for (cached data) --- ChangeLog | 9 +++------ web/htdocs/wato.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b0260b..bde65fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,16 +62,13 @@ * 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system... * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well -<<<<<<< HEAD - * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm - * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored - * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures -======= * 0464 stulz_pump: new check for the status of pumps of Stulz clima units * 0125 unitrends_backup:Unitrends Backup... * 0126 mikrotik_signal: Check for mikrotik wifi bridges * 0127 hp_proliant_raid: Check for proliant RAID status. ->>>>>>> d95f1c667c93038de25f1677c693ad80fd9b937c + * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm + * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored + * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d68ff37..dc5b503 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2427,7 +2427,7 @@ def mode_inventory(phase, firsttime): if html.var("_scan"): title += _(" (live scan)") else: - title += _(" (cached data)") + title += _(" (might be cached data)") return title elif phase == "buttons":

10 years, 5 months

Check_MK Git: check_mk: Make title of tags and tag groups localizable

by Mathias Kettner

Module: check_mk Branch: master Commit: 90d163d712e1789ed448afd506eeb2f49e9c240f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d163d712e178… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 24 10:30:00 2014 +0100 Make title of tags and tag groups localizable The names of the host tags that are shipped are now correctly localized. More then that: the user now can change these localizations and even create language depended name for his own host tags. --- .werks/677 | 10 +++++++ ChangeLog | 1 + web/htdocs/lib.py | 40 +++++++++++++++++++++++++ web/htdocs/valuespec.py | 15 ++++++++-- web/htdocs/wato.py | 45 ++++++++++++++++------------ web/plugins/config/builtin.py | 2 ++ web/plugins/wato/check_mk_configuration.py | 28 +++++++++++++++++ 7 files changed, 120 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90d163d712…

10 years, 5 months

Check_MK Git: check_mk: cmciii_lcp_fans: now monitors the lower limit for the rpm

by Götz Golla

Module: check_mk Branch: master Commit: 8c901d5c5bd27cb07c147aa26b4843f3af168285 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c901d5c5bd27c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Jan 23 20:25:18 2014 +0100 cmciii_lcp_fans: now monitors the lower limit for the rpm --- .werks/571 | 9 +++++++++ ChangeLog | 2 +- checkman/cmciii_lcp_fans | 2 ++ checks/cmciii_lcp_fans | 25 +++++++++++++++++-------- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.werks/571 b/.werks/571 new file mode 100644 index 0000000..c67eb70 --- /dev/null +++ b/.werks/571 @@ -0,0 +1,9 @@ +Title: cmciii_lcp_fans: now monitors the lower limit for the rpm +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1390505063 + + diff --git a/ChangeLog b/ChangeLog index ff848c2..a25baca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system... * 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems... * 0570 fileinfo.groups: file groups now allow exclude patterns as well + * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... @@ -171,7 +172,6 @@ * 0428 Changed user profiles (e.g. pw changes) are now replicated in distributed setups... * 0114 User Custom Attributes can now be exported to the core... * 0448 New button in WATO service list for displaying check parameters... - * 0353 New button in service list for refreshing all services... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/checkman/cmciii_lcp_fans b/checkman/cmciii_lcp_fans index 9f63824..5200b70 100644 --- a/checkman/cmciii_lcp_fans +++ b/checkman/cmciii_lcp_fans @@ -11,6 +11,8 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Futhermore, the global lower limit for the fan RPM is extracted from + the device. If the fan RPM is below this limit, the check is {WARN}. item: The number of the fan diff --git a/checks/cmciii_lcp_fans b/checks/cmciii_lcp_fans index 40e581b..8f56bd7 100644 --- a/checks/cmciii_lcp_fans +++ b/checks/cmciii_lcp_fans @@ -33,21 +33,30 @@ def inventory_cmciii_lcp_fans(info): return inventory def check_cmciii_lcp_fans(item, params, info): - for i in range(1,7): - if item == i: - status = info[0][i*4-1] - lowlevel = re.sub(" .*$", "", info[0][0]) - info_text = "%s RPM: %s, Status: %s" % \ - (info[0][i*4-3], info[0][i*4-2], info[0][i*4-1]) + lowlevel = int(re.sub(" .*$", "", info[0][0])) # global low warning - perfdata = [ ("rpm", re.sub(" ","", info[0][i*4-2]), lowlevel+":", 0, 0 ) ] + for i in range(1,7): + if item == i: + name = info[0][i*4-3] + status = info[0][i*4-1].lower() + rpm = int(info[0][i*4-2].split(" ")[0]) + unit = info[0][i*4-2].split(" ")[1] - if status.lower() == "ok": + sym = "" + if status == "ok" and rpm >= lowlevel: state = 0 + elif ( status == "ok" and rpm < lowlevel ): + state = 1 + sym = "(!)" else: state = 2 + info_text = "%s RPM: %d%s (limit %d%s)%s, Status %s" \ + % (name, rpm, unit, lowlevel, unit, sym, status) + + perfdata = [ ("rpm", str(rpm)+unit, str(lowlevel)+":", 0, 0 ) ] + return (state, info_text, perfdata) return (3, "no SNMP data found")

10 years, 5 months

Check_MK Git: check_mk: cmciii_lcp_airin, cmciii_lcp_airout,

by Götz Golla

cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures Message-ID: <52e17f80.t6yEATQNsA0k217d%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 1d63ba2f23b9efa4508433e1724399450fb8f32f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d63ba2f23b9ef… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Jan 23 21:43:15 2014 +0100 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures --- .werks/573 | 9 +++++++++ ChangeLog | 1 + checkman/cmciii_lcp_airin | 3 +++ checkman/cmciii_lcp_airout | 3 +++ checkman/cmciii_lcp_waterin | 4 ++++ checkman/cmciii_lcp_waterout | 4 ++++ checks/cmciii_lcp_airin | 24 +++++++++++++++++------- checks/cmciii_lcp_airout | 24 +++++++++++++++++------- checks/cmciii_lcp_waterin | 25 ++++++++++++++++++------- checks/cmciii_lcp_waterout | 25 ++++++++++++++++++------- 10 files changed, 94 insertions(+), 28 deletions(-) diff --git a/.werks/573 b/.werks/573 new file mode 100644 index 0000000..5bb68c0 --- /dev/null +++ b/.werks/573 @@ -0,0 +1,9 @@ +Title: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1390509708 + + diff --git a/ChangeLog b/ChangeLog index 91c128b..ae585a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 0570 fileinfo.groups: file groups now allow exclude patterns as well * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored + * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/cmciii_lcp_airin b/checkman/cmciii_lcp_airin index ee09805..e0f444f 100644 --- a/checkman/cmciii_lcp_airin +++ b/checkman/cmciii_lcp_airin @@ -13,6 +13,9 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Furthermore, the lower and upper warning and critical limits configured + in the device are extracted and used as limimts for the + average temperature read from the device. item: None diff --git a/checkman/cmciii_lcp_airout b/checkman/cmciii_lcp_airout index 048a30b..98ff81a 100644 --- a/checkman/cmciii_lcp_airout +++ b/checkman/cmciii_lcp_airout @@ -13,6 +13,9 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Furthermore, the lower and upper warning and critical limits configured + in the device are extracted and used as limimts for the + average temperature read from the device. item: None diff --git a/checkman/cmciii_lcp_waterin b/checkman/cmciii_lcp_waterin index 1025247..8e754f4 100644 --- a/checkman/cmciii_lcp_waterin +++ b/checkman/cmciii_lcp_waterin @@ -11,6 +11,10 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Furthermore, the lower and upper warning and critical limits configured + in the device are extracted and used as limimts for the + temperature read from the device. + item: None diff --git a/checkman/cmciii_lcp_waterout b/checkman/cmciii_lcp_waterout index 8420c91..55c90de 100644 --- a/checkman/cmciii_lcp_waterout +++ b/checkman/cmciii_lcp_waterout @@ -11,6 +11,10 @@ description: taken as the state of the check as follows: If the Rittal device returns {OK}, the check is {OK}. Otherwise the check is {CRIT}. + Furthermore, the lower and upper warning and critical limits configured + in the device are extracted and used as limimts for the + temperature read from the device. + item: None diff --git a/checks/cmciii_lcp_airin b/checks/cmciii_lcp_airin index 555e97b..1f98955 100644 --- a/checks/cmciii_lcp_airin +++ b/checks/cmciii_lcp_airin @@ -38,18 +38,28 @@ def check_cmciii_lcp_airin(item, params, info): unit_desc, unit_status, desc, status = info[0][0:4] temps = extract_temps(info[0][4:]) - info_text = "%s %s %s %s, Temp.Average: %.1f°C, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ - (unit_desc, unit_status, desc, status, temps[4], temps[5], temps[6], temps[7]) + state = 0 + if status.lower() != "ok" or unit_status.lower() != "ok": + state = 2 + sym = "" + + if temps[4] < temps[0] or temps[4] > temps[3] : + state = 2 + sym = "(!!)" + elif temps[4] < temps[1] or temps[4] > temps[2]: + state = max(state, 1) + sym = "(!)" + else: + state = max(state, 0) + sym = "" + + info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ + (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( temps[0], temps[1], temps[2], temps[3] ) perfdata = [ ("temp", temps[4], str(temps[1])+":"+str(temps[2]), str(temps[0])+":"+str(temps[3]), 0 ) ] - if status.lower() == "ok" and unit_status.lower() == "ok": - state = 0 - else: - state = 2 - return (state, info_text + levels_text, perfdata) check_info['cmciii_lcp_airin'] = { diff --git a/checks/cmciii_lcp_airout b/checks/cmciii_lcp_airout index b6100b5..041c16d 100644 --- a/checks/cmciii_lcp_airout +++ b/checks/cmciii_lcp_airout @@ -38,18 +38,28 @@ def check_cmciii_lcp_airout(item, params, info): unit_desc, unit_status, desc, status = info[0][0:4] temps = extract_temps(info[0][4:]) - info_text = "%s %s %s %s, Temp.Average: %.1f°C, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ - (unit_desc, unit_status, desc, status, temps[4], temps[5], temps[6], temps[7]) + state = 0 + if status.lower() != "ok" or unit_status.lower() != "ok": + state = 2 + sym = "" + + if temps[4] < temps[0] or temps[4] > temps[3] : + state = 2 + sym = "(!!)" + elif temps[4] < temps[1] or temps[4] > temps[2]: + state = max(state, 1) + sym = "(!)" + else: + state = max(state, 0) + sym = "" + + info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ + (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( temps[0], temps[1], temps[2], temps[3] ) perfdata = [ ("temp", temps[4], str(temps[1])+":"+str(temps[2]), str(temps[0])+":"+str(temps[3]), 0 ) ] - if status.lower() == "ok" and unit_status.lower() == "ok": - state = 0 - else: - state = 2 - return (state, info_text + levels_text, perfdata) check_info['cmciii_lcp_airout'] = { diff --git a/checks/cmciii_lcp_waterin b/checks/cmciii_lcp_waterin index 95c8249..009ef5d 100644 --- a/checks/cmciii_lcp_waterin +++ b/checks/cmciii_lcp_waterin @@ -41,17 +41,28 @@ def check_cmciii_lcp_waterin(item, params, info): temp = limits.pop(0) status = info[0][9] - info_text = "%s %s, %s %s, Temperature: %.1f°C" % (unit_desc, unit_status, desc, status, temp) + state = 0 + if status.lower() != "ok" or unit_status.lower() != "ok": + state = 2 + sym = "" - levels_text = ", limits lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( limits[3], limits[2], limits[1], limits[0] ) + if temp < limits[3] or temp > limits[0] : + state = 2 + sym = "(!!)" + elif temp < limits[2] or temp > limits[1]: + state = max(state, 1) + sym = "(!)" + else: + state = max(state, 0) + sym = "" - perfdata = [ ("temp", temp, str(limits[2])+":"+str(limits[1]), str(limits[3])+":"+str(limits[0]), 0 ) ] + info_text = "%s %s, %s %s, Temperature: %.1f°C%s" \ + % (unit_desc, unit_status, desc, status, temp, sym) + levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" \ + % ( limits[3], limits[2], limits[1], limits[0] ) - if status.lower() == "ok" and unit_status.lower() == "ok": - state = 0 - else: - state = 2 + perfdata = [ ("temp", temp, str(limits[2])+":"+str(limits[1]), str(limits[3])+":"+str(limits[0]), 0 ) ] return (state, info_text + levels_text, perfdata) diff --git a/checks/cmciii_lcp_waterout b/checks/cmciii_lcp_waterout index ddf950f..fa3ef91 100644 --- a/checks/cmciii_lcp_waterout +++ b/checks/cmciii_lcp_waterout @@ -41,17 +41,28 @@ def check_cmciii_lcp_waterout(item, params, info): temp = limits.pop(0) status = info[0][9] - info_text = "%s %s, %s %s, Temperature: %.1f°C" % (unit_desc, unit_status, desc, status, temp) + state = 0 + if status.lower() != "ok" or unit_status.lower() != "ok": + state = 2 + sym = "" - levels_text = ", limits lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( limits[3], limits[2], limits[1], limits[0] ) + if temp < limits[3] or temp > limits[0] : + state = 2 + sym = "(!!)" + elif temp < limits[2] or temp > limits[1]: + state = max(state, 1) + sym = "(!)" + else: + state = max(state, 0) + sym = "" - perfdata = [ ("temp", temp, str(limits[2])+":"+str(limits[1]), str(limits[3])+":"+str(limits[0]), 0 ) ] + info_text = "%s %s, %s %s, Temperature: %.1f°C%s" \ + % (unit_desc, unit_status, desc, status, temp, sym) + levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" \ + % ( limits[3], limits[2], limits[1], limits[0] ) - if status.lower() == "ok" and unit_status.lower() == "ok": - state = 0 - else: - state = 2 + perfdata = [ ("temp", temp, str(limits[2])+":"+str(limits[1]), str(limits[3])+":"+str(limits[0]), 0 ) ] return (state, info_text + levels_text, perfdata)

10 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014