Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2340 FIX Email validation: Top level domains can now have a maximum length of 24 characters

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fa76f10a677239a8190b5080fe933ecbc29c39e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa76f10a67723… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 5 11:52:29 2015 +0200 #2340 FIX Email validation: Top level domains can now have a maximum length of 24 characters --- .werks/2340 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2340 b/.werks/2340 new file mode 100644 index 0000000..b5b2fa6 --- /dev/null +++ b/.werks/2340 @@ -0,0 +1,9 @@ +Title: Email validation: Top level domains can now have a maximum length of 24 characters +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1433497930 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7839e46..fedb555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 2335 FIX: Fixed PNP default template for active checks with arguments... * 2337 FIX: Fixed problem with long hanging pnp graph rendering calls * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... + * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters BI: * 2336 FIX: BI compilation diagnostics are now logged to the generic web.log... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0294774..12ea130 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -512,7 +512,10 @@ class EmailAddress(TextAscii): def __init__(self, **kwargs): kwargs.setdefault("size", 40) TextAscii.__init__(self, **kwargs) - self._regex = re.compile('^[A-Z0-9._%+-]+(a)(localhost|[A-Z0-9.-]+\.[A-Z]{2,4})$', re.I) + # The "new" top level domains are very unlimited in length. Theoretically they can be + # up to 63 chars long. But currently the longest is 24 characters. Check this out with: + # wget -qO - http://data.iana.org/TLD/tlds-alpha-by-domain.txt | tail -n+2 | wc -L + self._regex = re.compile('^[A-Z0-9._%+-]+(a)(localhost|[A-Z0-9.-]+\.[A-Z]{2,24})$', re.I) self._make_clickable = kwargs.get("make_clickable", False) def value_to_text(self, value):

9 years

Check_MK Git: check_mk: #2118 FIX aix_sap_processlist: agent plugin now is more general to deal with various AIX versions

by Goetz Golla

Module: check_mk Branch: master Commit: 711f10c8088ee5f77e29d5e5a9b10937b59398b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=711f10c8088ee5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 5 10:20:38 2015 +0200 #2118 FIX aix_sap_processlist: agent plugin now is more general to deal with various AIX versions it is now actively searching for the right path to its libraries --- .werks/2118 | 10 ++++++++ ChangeLog | 1 + agents/plugins/mk_sap.aix | 56 +++++++++++++++++++++++++++++++-------------- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/.werks/2118 b/.werks/2118 new file mode 100644 index 0000000..2847d2e --- /dev/null +++ b/.werks/2118 @@ -0,0 +1,10 @@ +Title: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433492293 + +it is now actively searching for the right path to its libraries diff --git a/ChangeLog b/ChangeLog index 7839e46..c30713b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 2216 raritan_pdu_ocprot: New check to monitor overcurrent protectors of Raritan PDUs... * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... + * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/agents/plugins/mk_sap.aix b/agents/plugins/mk_sap.aix index fb49227..5296664 100755 --- a/agents/plugins/mk_sap.aix +++ b/agents/plugins/mk_sap.aix @@ -23,34 +23,56 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# cat sapservices +##!/bin/sh +#LIBPATH=/usr/sap/C01/DVEBMGS25/exe:$LIBPATH; export LIBPATH; /usr/sap/C01/DVEBMGS25/exe/sapstartsrv pf=/usr/sap/C01/SYS/profile/START_DVEBMGS25_sap10c1 -D -u c01adm +#LIBPATH=/usr/sap/DC1/SMDA98/exe:$LIBPATH; export LIBPATH; /usr/sap/DC1/SMDA98/exe/sapstartsrv pf=/usr/sap/DC1/SYS/profile/DC1_SMDA98_sap10c1 -D -u dc1adm +#LIBPATH=/usr/sap/C02/DVEBMGS37/exe:$LIBPATH; export LIBPATH; /usr/sap/C02/DVEBMGS37/exe/sapstartsrv pf=/usr/sap/C02/SYS/profile/START_DVEBMGS37_sap10c1 -D -u c02adm +#LIBPATH=/usr/sap/DAA/SMDA97/exe:$LIBPATH; export LIBPATH; /usr/sap/DAA/SMDA97/exe/sapstartsrv pf=/usr/sap/DAA/SYS/profile/DAA_SMDA97_sap10c1 -D -u daaadm +#LIBPATH=/usr/sap/DDB/SMDA96/exe:$LIBPATH; export LIBPATH; /usr/sap/DDB/SMDA96/exe/sapstartsrv pf=/usr/sap/DDB/SYS/profile/DDB_SMDA96_sap10c1d -D -u ddbadm + +# <<<aix_sap_processlist:sep(44)>>> +# [69] +# 05.06.2015 05:44:36 +# GetProcessList +# OK +# name, description, dispstatus, textstatus, starttime, elapsedtime, pid +# msg_server, MessageServer, GREEN, Running, 2015 06 01 02:28:51, 99:15:45, 17563810 +# enserver, EnqueueServer, GREEN, Running, 2015 06 01 02:28:51, 99:15:45, 15466710 +# gwrd, Gateway, GREEN, Running, 2015 06 01 02:28:51, 99:15:45, 25428046 +# [68] +# 05.06.2015 05:44:36 +# GetProcessList +# OK +# name, description, dispstatus, textstatus, starttime, elapsedtime, pid +# jstart, J2EE Server, GREEN, All processes running, 2015 06 01 02:29:06, 99:15:30, 18087996 +# igswd_mt, IGS Watchdog, GREEN, Running, 2015 06 01 02:29:06, 99:15:30, 9765042 + +# +# <<<aix_sap_processlist:sep(44)>>> +# GetProcessList +# FAIL: NIECONN_REFUSED (Connection refused), NiRawConnect failed in plugin_fopen() + sapservices="/usr/sap/sapservices" if [ -r "$sapservices" ]; then - echo "<<<aix_sap_processlist>>>" + echo "<<<aix_sap_processlist:sep(44)>>>" # loop over ids cat $sapservices | while read LINE do command=$(echo $LINE | grep "^LIBPATH=/usr/sap/" | grep -v "^LIBPATH=/usr/sap/D" | awk -F" " '{print $5}') if [ -n "$command" ]; then - id2=$(echo $command | awk -F"/" '{print $4}') - path=$(echo "/sapmnt/$id2/exe") - id=$(LIBPATH=$LIBPATH:$path $path/sappfpar SAPSYSTEM $command) - echo -n "[$id]" - LIBPATH=$LIBPATH:$path $path/sapcontrol -nr $id -function GetProcessList + id2=$(echo $command | awk -F"/" '{print $4}') + path=$(echo "/sapmnt/$id2/exe") + sappfpar=$(find $path -name sappfpar | head -1) + sapcontrol=$(find $path -name sapcontrol | head -1) + libpath=$(find $path -name libicuuc\*.a | head -1 | sed -e 's,/[^ /]*$,,') + id=$(LIBPATH=$LIBPATH:$libpath $sappfpar SAPSYSTEM $command) + echo -n "[$id]" + LIBPATH=$LIBPATH:$libpath $sapcontrol -nr $id -function GetProcessList fi done fi -# 16.02.2015 16:39:40 -# GetProcessList -# OK -# name, description, dispstatus, textstatus, starttime, elapsedtime, pid -# msg_server, MessageServer, GREEN, Running, 2015 02 16 16:30:39, 0:09:01, 26345666 -# enserver, EnqueueServer, GREEN, Running, 2015 02 16 16:30:39, 0:09:01, 27787298 - -# 16.03.2015 16:23:24 -# GetProcessList -# FAIL: NIECONN_REFUSED (Connection refused), NiRawConnect failed in plugin_fopen() -

9 years

Check_MK Git: check_mk: raritan_pdu_ocprot: Cleanup after merge of subchecks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0598d438351ca9f2538808ebb45baa0b32c96f1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0598d438351ca9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 3 17:08:56 2015 +0200 raritan_pdu_ocprot: Cleanup after merge of subchecks --- checkman/raritan_pdu_ocprot | 9 +++++++-- checkman/raritan_pdu_ocprot.current | 17 ----------------- web/plugins/metrics/check_mk.py | 2 +- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/checkman/raritan_pdu_ocprot b/checkman/raritan_pdu_ocprot index 46fad38..bc89d6d 100644 --- a/checkman/raritan_pdu_ocprot +++ b/checkman/raritan_pdu_ocprot @@ -1,4 +1,4 @@ -title: Raritan PX-2000 family PDU overcurrent protector status +title: Raritan PX-2000 family PDU overcurrent protector agents: snmp catalog: hw/other license: GPL @@ -6,10 +6,15 @@ distribution: check_mk description: This check monitors the electrical current of overcurrent protectors of the Raritan PX-2000 family of intelligent rack power distribution - units (iPDUs). + units (iPDUs). As well as the current, the status as reported by the + device is taken into account, whereby the status open is interpreted + as CRIT, closed as OK, and unavailable as UNKNOWN. item: The ID of the Overcurrent protector, eg. C1. +perfdata: + One value: The current current in Ampère. + inventory: One check per overcurrent protector is created. diff --git a/checkman/raritan_pdu_ocprot.current b/checkman/raritan_pdu_ocprot.current deleted file mode 100644 index 07e3d83..0000000 --- a/checkman/raritan_pdu_ocprot.current +++ /dev/null @@ -1,17 +0,0 @@ -title: Raritan PX-2000 family PDU overcurrent protector status -agents: snmp -catalog: hw/other -license: GPL -distribution: check_mk -description: - This check monitors the current of overcurrent protectors of the Raritan PX-2000 - family of intelligent rack power distribution units (iPDUs). - -item: - The ID of the Overcurrent protector, eg. C1. - -perfdata: - One value: The current current in Ampère. - -inventory: - One check per overcurrent protector is created. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6d6aaa8..3190c77 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1412,7 +1412,7 @@ check_metrics["check_mk-apc_rackpdu_power"] = { "amperage" : check_metrics["check_mk-apc_ats_output"] = { "volt" : { "name" : "voltage" }, "watt" : { "name" : "power"}, "ampere": { "name": "current"}, "load_perc" : { "name": "output_load" }} check_metrics["check_mk-raritan_pdu_inlet"] = {} check_metrics["check_mk-raritan_pdu_inlet_summary"] = {} -check_metrics["check_mk-raritan_pdu_ocprot.current"] = {} +check_metrics["check_mk-raritan_pdu_ocprot"] = {} check_metrics["check_mk-ups_socomec_outphase"] = {} check_metrics["check_mk-ucs_bladecenter_psu.switch_power"] = {} check_metrics["check_mk-bluenet_meter"] = {}

9 years

Check_MK Git: check_mk: Updated werk description

by Konstantin Büttner

Module: check_mk Branch: master Commit: 346cfe80e24fb3e9937f97612722f9cbd9a36a96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=346cfe80e24fb3… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 3 17:04:15 2015 +0200 Updated werk description --- .werks/2216 | 4 ++-- ChangeLog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.werks/2216 b/.werks/2216 index 25b8ca3..78dd6e9 100644 --- a/.werks/2216 +++ b/.werks/2216 @@ -1,4 +1,4 @@ -Title: raritan_pdu_ocprot, raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs +Title: raritan_pdu_ocprot: New check to monitor overcurrent protectors of Raritan PDUs Level: 1 Component: checks Compatible: compat @@ -6,4 +6,4 @@ Version: 1.2.7i2 Date: 1433340363 Class: feature -raritan_pdu_ocprot monitors the status of overcurrent protectors, raritan_pdu_ocprot.current the electrical current. +raritan_pdu_ocprot monitors the status of overcurrent protectors and the electrical current. diff --git a/ChangeLog b/ChangeLog index 521e7d4..c56bae8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Checks & Agents: * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... - * 2216 raritan_pdu_ocprot, raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs... + * 2216 raritan_pdu_ocprot: New check to monitor overcurrent protectors of Raritan PDUs... * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon...

9 years

Check_MK Git: check_mk: Fixed typo in Werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 4bfd91c071941041eacbc0d23f3a96e72ba21bf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bfd91c0719410… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 3 16:53:16 2015 +0200 Fixed typo in Werk --- .werks/2339 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2339 b/.werks/2339 index a0a245d..6acef9d 100644 --- a/.werks/2339 +++ b/.werks/2339 @@ -1,4 +1,4 @@ -Title: Discovery service: Fixed handling of agent / snmp communication errors +Title: Discovery service: Fixed handling of agent / SNMP communication errors Level: 1 Component: core Class: fix diff --git a/ChangeLog b/ChangeLog index 627fda9..09f45cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 1.2.7i2: Core & Setup: - * 2339 FIX: Discovery service: Fixed handling of agent / snmp communication errors... + * 2339 FIX: Discovery service: Fixed handling of agent / SNMP communication errors... Checks & Agents: * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well

9 years

Check_MK Git: check_mk: raritan_pdu_ocprot: merge two checks into one

by Mathias Kettner

Module: check_mk Branch: master Commit: 82eb780adc9f79036f8c5c84b447756c78e10398 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82eb780adc9f79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 3 16:52:20 2015 +0200 raritan_pdu_ocprot: merge two checks into one --- checks/raritan_pdu_ocprot | 126 +++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 74 deletions(-) diff --git a/checks/raritan_pdu_ocprot b/checks/raritan_pdu_ocprot index 1a18ad9..b97aa52 100644 --- a/checks/raritan_pdu_ocprot +++ b/checks/raritan_pdu_ocprot @@ -24,100 +24,78 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -def parse_raritan_pdu_ocprot(info): - parsed = {} - for line in info: - if line[0].endswith("15"): - ocprotid = "C" + line[0].split(".")[1] - if parsed.get(ocprotid) == None: - parsed[ocprotid] = {} - parsed[ocprotid]["state"] = line[1] - elif line[0].endswith("1"): - ocprotid = "C" + line[0].split(".")[1] - if parsed.get(ocprotid) == None: - parsed[ocprotid] = {} - parsed[ocprotid]["current"] = float(line[2]) / 10 - return parsed - - -#. -# .--Current-------------------------------------------------------------. -# | ____ _ | -# | / ___| _ _ __ _ __ ___ _ __ | |_ | -# | | | | | | | '__| '__/ _ \ '_ \| __| | -# | | |__| |_| | | | | | __/ | | | |_ | -# | \____\__,_|_| |_| \___|_| |_|\__| | -# | | -# '----------------------------------------------------------------------' - raritan_pdu_ocprot_current_default_levels = (14.0, 15.0) +# Example for info: +# [['1.1.1', '4', '0'], +# ['1.1.15', '1', '0'], +# ['1.2.1', '4', '0'], +# ['1.2.15', '1', '0'], +# ['1.3.1', '4', '0'], +# ['1.3.15', '1', '0'], +# ['1.4.1', '4', '0'], +# ['1.4.15', '1', '0'], +# ['1.5.1', '4', '0'], +# ['1.5.15', '1', '0'], +# ['1.6.1', '4', '0'], +# ['1.6.15', '1', '0']] +# Raritan implements a strange way of indexing here. The two last components +# of the OID should really be swapped! -def inventory_raritan_pdu_ocprot_current(parsed): - for ocprotid in parsed: - yield ocprotid, "raritan_pdu_ocprot_current_default_levels" - - -def check_raritan_pdu_ocprot_current(item, params, parsed): - current = parsed[item]["current"] - warn, crit = params +def parse_raritan_pdu_ocprot(info): + parsed = {} + for end_oid, state, value in info: + protector_id = "C" + end_oid.split(".")[1] # 1.5.1 --> Item will be "C5" - infotext = "%.1f A" % current - levelstext = " (warn/crit at %.1f/%.1f A)" % (warn, crit) + if end_oid.endswith(".15"): + parsed.setdefault(protector_id, {})["state"] = state + elif end_oid.endswith(".1"): + parsed.setdefault(protector_id, {})["current"] = float(value) / 10 - if current >= crit: - status = 2 - infotext += levelstext - elif current >= warn: - status = 1 - infotext += levelstext - else: - status = 0 + pprint.pprint(parsed) + return parsed - perfdata = [ ("current", current, warn, crit) ] - return status, infotext, perfdata +def inventory_raritan_pdu_ocprot(parsed): + for protector_id in parsed: + yield protector_id, "raritan_pdu_ocprot_current_default_levels" -check_info["raritan_pdu_ocprot.current"] = { - "inventory_function" : inventory_raritan_pdu_ocprot_current, - "check_function" : check_raritan_pdu_ocprot_current, - "service_description" : "Overcurrent Protector Current %s", - "has_perfdata" : True, - "group" : "ocprot_current", -} +def check_raritan_pdu_ocprot(item, params, parsed): + states = { + "-1" : (3, "Overcurrent protector information is unavailable"), + "0" : (2, "Overcurrent protector is open"), + "1" : (0, "Overcurrent protector is closed"), + } + if item in parsed: + yield states[parsed[item]["state"]] -#. -# .--Status--------------------------------------------------------------. -# | ____ _ _ | -# | / ___|| |_ __ _| |_ _ _ ___ | -# | \___ \| __/ _` | __| | | / __| | -# | ___) | || (_| | |_| |_| \__ \ | -# | |____/ \__\__,_|\__|\__,_|___/ | -# | | -# '----------------------------------------------------------------------' + current = parsed[item]["current"] + warn, crit = params -def inventory_raritan_pdu_ocprot(parsed): - for ocprotid in parsed: - yield ocprotid, None + infotext = "Current: %.1f A" % current + levelstext = " (warn/crit at %.1f/%.1f A)" % (warn, crit) + if current >= crit: + status = 2 + infotext += levelstext + elif current >= warn: + status = 1 + infotext += levelstext + else: + status = 0 -def check_raritan_pdu_ocprot(item, _no_params, parsed): - states = { - "-1" : (3, "Overcurrent protector information is unavailable"), - "0" : (2, "Overcurrent protector is open"), - "1" : (0, "Overcurrent protector is closed"), - } - return states[parsed[item]["state"]] + perfdata = [ ("current", current, warn, crit) ] + yield status, infotext, perfdata check_info["raritan_pdu_ocprot"] = { "parse_function" : parse_raritan_pdu_ocprot, "inventory_function" : inventory_raritan_pdu_ocprot, "check_function" : check_raritan_pdu_ocprot, - "service_description" : "Overcurrent Protector Status %s", + "service_description" : "Overcurrent Protector %s", + "group" : "ocprot_current", "snmp_info" : (".1.3.6.1.4.1.13742.6.5.3.3.1", [ OID_END, "3",

9 years

Check_MK Git: check_mk: Fixed permission error in .f12 file of web (min.js )

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c344dbf8f48b2cdcadb1356739389791039cc6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c344dbf8f48b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 3 16:51:51 2015 +0200 Fixed permission error in .f12 file of web (min.js) --- web/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index 9b4e557..0acbb42 100644 --- a/web/.f12 +++ b/web/.f12 @@ -15,7 +15,7 @@ fi # Per Default wird geguckt, ob die *_min.js-Dateien älter sind, als # die Original-Dateien. Wenn ja, dann werden sie neu erstellt. -make DESTDIR=/omd/sites/$SITE/share/check_mk -C .. minify-js +sudo make DESTDIR=/omd/sites/$SITE/share/check_mk -C .. minify-js # Wenn man ohne die min-Dateien entwickeln will, kann man das hier # auskommentieren. Dies räumt dann auch die Dateien weg, die # schon in der original-Installation vom OMD vorhanden waren.

9 years

Check_MK Git: check_mk: #2339 FIX Discovery service: Fixed handling of agent / snmp communication errors

by Lars Michelsen

Module: check_mk Branch: master Commit: b1794776e130ab024fa32e1c3630556c41b4b8b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1794776e130ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 16:31:49 2015 +0200 #2339 FIX Discovery service: Fixed handling of agent / snmp communication errors When a host could not be contacted via agent or did not receive an SNMP response, this resulted in a situation where the check was shown as UNKNOWN and broken check with the hint to send a bug report the us. This handling has been changed to reporting a WARNING state together with the related error message as output. The "crashed check" link is not displayed for this case anymore. --- .werks/2339 | 15 +++++++++++++++ ChangeLog | 3 +++ modules/discovery.py | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/2339 b/.werks/2339 new file mode 100644 index 0000000..a0a245d --- /dev/null +++ b/.werks/2339 @@ -0,0 +1,15 @@ +Title: Discovery service: Fixed handling of agent / snmp communication errors +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433341742 + +When a host could not be contacted via agent or did not receive an SNMP response, +this resulted in a situation where the check was shown as UNKNOWN and broken check +with the hint to send a bug report the us. + +This handling has been changed to reporting a WARNING state together with the related +error message as output. The "crashed check" link is not displayed for this case anymore. diff --git a/ChangeLog b/ChangeLog index 521e7d4..627fda9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.7i2: + Core & Setup: + * 2339 FIX: Discovery service: Fixed handling of agent / snmp communication errors... + Checks & Agents: * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... diff --git a/modules/discovery.py b/modules/discovery.py index 44821e6..aac4e4d 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -162,6 +162,13 @@ def check_discovery(hostname, ipaddress=None): else: output = "no unchecked services found\n" status = 0 + except (MKSNMPError, MKAgentError), e: + output = "Discovery failed: %s" % e + # Honor rule settings for "Status of the Check_MK service". In case of + # a problem we assume a connection error here. + spec = exit_code_spec(hostname) + status = spec.get("connection", 1) + except SystemExit, e: raise e except Exception, e:

9 years

Check_MK Git: check_mk: Fix code comments in job check

by Mathias Kettner

Module: check_mk Branch: master Commit: 7de8d33631ea17ace30943f3e5991af46048eef4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7de8d33631ea17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 3 16:13:06 2015 +0200 Fix code comments in job check --- checks/job | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/checks/job b/checks/job index f8c895f..b8372c2 100644 --- a/checks/job +++ b/checks/job @@ -24,32 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#<<<job>>> -#==> asd ASD <== -#start_time 1389355839 -#exit_code 0 -#real_time 0:00.00 -#user_time 0.00 -#system_time 0.00 -#reads 0 -#writes 0 -#max_res_kbytes 1968 -#avg_mem_kbytes 0 +# <<<job>>> +# ==> asd ASD <== +# start_time 1389355839 +# exit_code 0 +# real_time 0:00.00 +# user_time 0.00 +# system_time 0.00 +# reads 0 +# writes 0 +# max_res_kbytes 1968 +# avg_mem_kbytes 0 # # -#==> test <== -#start_time 1389352839 -#exit_code 0 -#real_time 0:00.00 -#user_time 0.00 -#system_time 0.00 -#reads 0 -#writes 0 -#max_res_kbytes 1984 -#avg_mem_kbytes 0 +# ==> test <== +# start_time 1389352839 +# exit_code 0 +# real_time 0:00.00 +# user_time 0.00 +# system_time 0.00 +# reads 0 +# writes 0 +# max_res_kbytes 1984 +# avg_mem_kbytes 0 factory_settings["job_default_levels"] = { - "age": ( 0, 0 ) # disabled as default + "age": (0, 0) # disabled as default } def inventory_job(info):

9 years

Check_MK Git: check_mk: #2216 raritan_pdu_ocprot,

by Konstantin Büttner

raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs Message-ID: <556f0a22.8id92xlQKwJklDDo%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 4073518c404a1644fcd2596cca3ee4d7a0ef1534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4073518c404a16… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 3 16:07:23 2015 +0200 #2216 raritan_pdu_ocprot, raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs raritan_pdu_ocprot monitors the status of overcurrent protectors, raritan_pdu_ocprot.current the electrical current. --- .werks/2216 | 9 +++ ChangeLog | 1 + checkman/raritan_pdu_ocprot | 15 ++++ checkman/raritan_pdu_ocprot.current | 17 +++++ checks/raritan_pdu_ocprot | 127 ++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 14 ++++ 7 files changed, 184 insertions(+) diff --git a/.werks/2216 b/.werks/2216 new file mode 100644 index 0000000..25b8ca3 --- /dev/null +++ b/.werks/2216 @@ -0,0 +1,9 @@ +Title: raritan_pdu_ocprot, raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1433340363 +Class: feature + +raritan_pdu_ocprot monitors the status of overcurrent protectors, raritan_pdu_ocprot.current the electrical current. diff --git a/ChangeLog b/ChangeLog index d8aa284..521e7d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... + * 2216 raritan_pdu_ocprot, raritan_pdu_ocprot.current: Two new checks to monitor overcurrent protectors of Raritan PDUs... * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... diff --git a/checkman/raritan_pdu_ocprot b/checkman/raritan_pdu_ocprot new file mode 100644 index 0000000..46fad38 --- /dev/null +++ b/checkman/raritan_pdu_ocprot @@ -0,0 +1,15 @@ +title: Raritan PX-2000 family PDU overcurrent protector status +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the electrical current of overcurrent protectors + of the Raritan PX-2000 family of intelligent rack power distribution + units (iPDUs). + +item: + The ID of the Overcurrent protector, eg. C1. + +inventory: + One check per overcurrent protector is created. diff --git a/checkman/raritan_pdu_ocprot.current b/checkman/raritan_pdu_ocprot.current new file mode 100644 index 0000000..07e3d83 --- /dev/null +++ b/checkman/raritan_pdu_ocprot.current @@ -0,0 +1,17 @@ +title: Raritan PX-2000 family PDU overcurrent protector status +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the current of overcurrent protectors of the Raritan PX-2000 + family of intelligent rack power distribution units (iPDUs). + +item: + The ID of the Overcurrent protector, eg. C1. + +perfdata: + One value: The current current in Ampère. + +inventory: + One check per overcurrent protector is created. diff --git a/checks/raritan_pdu_ocprot b/checks/raritan_pdu_ocprot new file mode 100644 index 0000000..1a18ad9 --- /dev/null +++ b/checks/raritan_pdu_ocprot @@ -0,0 +1,127 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def parse_raritan_pdu_ocprot(info): + parsed = {} + for line in info: + if line[0].endswith("15"): + ocprotid = "C" + line[0].split(".")[1] + if parsed.get(ocprotid) == None: + parsed[ocprotid] = {} + parsed[ocprotid]["state"] = line[1] + elif line[0].endswith("1"): + ocprotid = "C" + line[0].split(".")[1] + if parsed.get(ocprotid) == None: + parsed[ocprotid] = {} + parsed[ocprotid]["current"] = float(line[2]) / 10 + return parsed + + +#. +# .--Current-------------------------------------------------------------. +# | ____ _ | +# | / ___| _ _ __ _ __ ___ _ __ | |_ | +# | | | | | | | '__| '__/ _ \ '_ \| __| | +# | | |__| |_| | | | | | __/ | | | |_ | +# | \____\__,_|_| |_| \___|_| |_|\__| | +# | | +# '----------------------------------------------------------------------' + +raritan_pdu_ocprot_current_default_levels = (14.0, 15.0) + + +def inventory_raritan_pdu_ocprot_current(parsed): + for ocprotid in parsed: + yield ocprotid, "raritan_pdu_ocprot_current_default_levels" + + +def check_raritan_pdu_ocprot_current(item, params, parsed): + current = parsed[item]["current"] + warn, crit = params + + infotext = "%.1f A" % current + levelstext = " (warn/crit at %.1f/%.1f A)" % (warn, crit) + + if current >= crit: + status = 2 + infotext += levelstext + elif current >= warn: + status = 1 + infotext += levelstext + else: + status = 0 + + perfdata = [ ("current", current, warn, crit) ] + + return status, infotext, perfdata + + +check_info["raritan_pdu_ocprot.current"] = { + "inventory_function" : inventory_raritan_pdu_ocprot_current, + "check_function" : check_raritan_pdu_ocprot_current, + "service_description" : "Overcurrent Protector Current %s", + "has_perfdata" : True, + "group" : "ocprot_current", +} + + +#. +# .--Status--------------------------------------------------------------. +# | ____ _ _ | +# | / ___|| |_ __ _| |_ _ _ ___ | +# | \___ \| __/ _` | __| | | / __| | +# | ___) | || (_| | |_| |_| \__ \ | +# | |____/ \__\__,_|\__|\__,_|___/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_raritan_pdu_ocprot(parsed): + for ocprotid in parsed: + yield ocprotid, None + + +def check_raritan_pdu_ocprot(item, _no_params, parsed): + states = { + "-1" : (3, "Overcurrent protector information is unavailable"), + "0" : (2, "Overcurrent protector is open"), + "1" : (0, "Overcurrent protector is closed"), + } + return states[parsed[item]["state"]] + + +check_info["raritan_pdu_ocprot"] = { + "parse_function" : parse_raritan_pdu_ocprot, + "inventory_function" : inventory_raritan_pdu_ocprot, + "check_function" : check_raritan_pdu_ocprot, + "service_description" : "Overcurrent Protector Status %s", + "snmp_info" : (".1.3.6.1.4.1.13742.6.5.3.3.1", [ + OID_END, + "3", + "4", + ]), + "snmp_scan_function" : lambda oid: "13742" in oid(".1.3.6.1.2.1.1.2.0"), +} diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index af0b41b..6d6aaa8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1412,6 +1412,7 @@ check_metrics["check_mk-apc_rackpdu_power"] = { "amperage" : check_metrics["check_mk-apc_ats_output"] = { "volt" : { "name" : "voltage" }, "watt" : { "name" : "power"}, "ampere": { "name": "current"}, "load_perc" : { "name": "output_load" }} check_metrics["check_mk-raritan_pdu_inlet"] = {} check_metrics["check_mk-raritan_pdu_inlet_summary"] = {} +check_metrics["check_mk-raritan_pdu_ocprot.current"] = {} check_metrics["check_mk-ups_socomec_outphase"] = {} check_metrics["check_mk-ucs_bladecenter_psu.switch_power"] = {} check_metrics["check_mk-bluenet_meter"] = {} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index be90cb0..df7cc4a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -456,6 +456,20 @@ register_check_parameters( match_type = "first", ) +register_check_parameters( + subgroup_environment, + "ocprot_current", + _("Electrical Current of Overcurrent Protectors"), + Tuple( + elements = [ + Float(title = _("Warning at"), unit = u"A", default_value = 14.0), + Float(title = _("Critical at"), unit = u"A", default_value = 15.0), + ], + ), + TextAscii(title = _("The Index of the Overcurrent Protector")), + match_type = "first", +) + #.

9 years

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015