Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64556 discussions

Check_MK Git: check_mk: FIX mysql_capacity: Did use wrong calculated warn / crit thresholds

by Lars Michelsen

Module: check_mk Branch: master Commit: f2edeb354c743bdd9fac89e3ece867bd5ff535cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2edeb354c743b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 16:40:45 2013 +0100 FIX mysql_capacity: Did use wrong calculated warn / crit thresholds The warn / crit values are given as MB, but the check did not use them as MB values. The thresholds were always applied wrong. --- .werks/363 | 11 +++++++++++ ChangeLog | 1 + checks/mysql_capacity | 13 ++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.werks/363 b/.werks/363 new file mode 100644 index 0000000..d0f5994 --- /dev/null +++ b/.werks/363 @@ -0,0 +1,11 @@ +Title: mysql_capacity: Did use wrong calculated warn / crit thresholds +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387208376 +Targetversion: future + +The warn / crit values are given as MB, but the check did not use them +as MB values. The thresholds were always applied wrong. diff --git a/ChangeLog b/ChangeLog index c5fa6b4..8366da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 0360 FIX: multipath: Inventory handles non loaded kernel module now... * 0339 FIX: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function... * 0340 FIX: blade_health: fix check, it was totally broken... + * 0363 FIX: mysql_capacity: Did use wrong calculated warn / crit thresholds... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/mysql_capacity b/checks/mysql_capacity index a2be13d..b0d6472 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -40,6 +40,7 @@ def inventory_mysql_size(info): return inventory def check_mysql_size(item, params, info): + # size and avail are given as bytes for dbname, size, avail in info: if item == dbname: size = int(size) @@ -49,13 +50,13 @@ def check_mysql_size(item, params, info): warn, crit = params # in MB warn_b = warn * 1048576 crit_b = crit * 1048576 - perfdata = [("size", size, warn, crit)] - if size > crit: + perfdata = [("size", size, warn_b, crit_b)] + if size > crit_b: state = 2 - infotext += " (critical at %s)" % get_bytes_human_readable(crit) - elif size > warn: + infotext += " (critical at %s)" % get_bytes_human_readable(crit_b) + elif size > warn_b: state = 1 - infotext += " (warning at %s)" % get_bytes_human_readable(crit) + infotext += " (warning at %s)" % get_bytes_human_readable(crit_b) else: state = 0 perfdata = [("size", size)] @@ -69,6 +70,4 @@ check_info['mysql_capacity'] = { "service_description" : "MySQL DB %s Size", "has_perfdata" : True, "group" : "dbsize", -# "default_levels_variable" : "filesystem_default_levels", -# "includes" : [ "dbsize.include" ], }

10 years, 9 months

Check_MK Git: check_mk: sms: now searching PATH for sendsms and smssend commands

by Lars Michelsen

Module: check_mk Branch: master Commit: e58cd3d1b46fe0bb572cbc84e290a7d406100c49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e58cd3d1b46fe0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 16:23:37 2013 +0100 sms: now searching PATH for sendsms and smssend commands In previous versions the notification plugin only used the sendsms command and was only searching in /usr/bin and /usr/local/bin. This is more flexible now. --- .werks/362 | 12 ++++++++++++ ChangeLog | 1 + notifications/sms | 16 +++++++++------- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.werks/362 b/.werks/362 new file mode 100644 index 0000000..c93f3b0 --- /dev/null +++ b/.werks/362 @@ -0,0 +1,12 @@ +Title: sms: now searching PATH for sendsms and smssend commands +Level: 1 +Component: notifications +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387207352 +Targetversion: future + +In previous versions the notification plugin only used the sendsms +command and was only searching in /usr/bin and /usr/local/bin. +This is more flexible now. diff --git a/ChangeLog b/ChangeLog index f4acf3e..a722b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 0361 FIX: The page linked by "new rule" can now be bookmarked again Notifications: + * 0362 sms: now searching PATH for sendsms and smssend commands... * 0108 FIX: Prevent service notification on host alerts... * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... diff --git a/notifications/sms b/notifications/sms index 3820672..7fdcf17 100755 --- a/notifications/sms +++ b/notifications/sms @@ -4,14 +4,16 @@ # Note: You have to add the side user to the sendsms group # and restart the site -import os +import os, sys -send_path = '/usr/bin/sendsms' -if not os.path.exists(send_path): - send_path = '/usr/local/bin/sendsms' - if not os.path.exists(send_path): - print "SMS Tools not found" - os._exit(1) +send_path = None +for binary in [ 'sendsms', 'smssend' ]: + if os.system('which %s >/dev/null' % binary) == 0: + send_path = binary + +if not send_path: + sys.stderr.write('Error: SMS Tools binaries (sendsms or smssend) not found\n') + sys.exit(1) max_len = 160 message = os.environ['NOTIFY_HOSTNAME'] + " "

10 years, 9 months

Check_MK Git: check_mk: New features for WATO page Backup & Restore

by Andreas Boesl

Module: check_mk Branch: master Commit: 9cde8166e92aac8f87bd20d1252ff77275918e78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cde8166e92aac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 16 14:24:05 2013 +0100 New features for WATO page Backup & Restore --- .werks/244 | 16 ++ ChangeLog | 1 + modules/automation.py | 148 ++++++++++++++++++ web/htdocs/multitar.py | 148 +++++++++++++++++- web/htdocs/wato.py | 296 ++++++++++++++++++++++++++++++++---- web/plugins/wato/backup_domains.py | 156 +++++++++++++++++++ 6 files changed, 726 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9cde8166e9…

10 years, 9 months

Check_MK Git: check_mk: FIX The page linked by "new rule" can now be bookmarked again

by Lars Michelsen

Module: check_mk Branch: master Commit: ef6ecc8cd5ccd63c049ce3af622bdd594935ec5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef6ecc8cd5ccd6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 16:08:37 2013 +0100 FIX The page linked by "new rule" can now be bookmarked again --- .werks/361 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/361 b/.werks/361 new file mode 100644 index 0000000..9a90719 --- /dev/null +++ b/.werks/361 @@ -0,0 +1,10 @@ +Title: The page linked by "new rule" can now be bookmarked again +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387206492 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index ade0b7b..a8108f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 0330 FIX: Improved performance of WATO slave push with a large user base... * 0331 FIX: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO... * 0332 FIX: Own host tag groups without topics resulted in two groups "Host tags" in the rule editor + * 0361 FIX: The page linked by "new rule" can now be bookmarked again Notifications: * 0108 FIX: Prevent service notification on host alerts... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8e2f0be..3c86012 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10790,7 +10790,7 @@ def mode_rulesets(phase): html.write('</div>') def create_new_rule_form(rulespec, hostname = None, item = None, varname = None): - html.begin_form("new_rule", add_transid = False, method = "POST") + html.begin_form("new_rule", add_transid = False) html.write('<table>') if hostname:

10 years, 9 months

Check_MK Git: check_mk: FIX blade_health: fix check, it was totally broken

by Mathias Kettner

Module: check_mk Branch: master Commit: 104330ad9e9effad9f192b1b5b6c00de7ee2d0c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=104330ad9e9eff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 16:08:14 2013 +0100 FIX blade_health: fix check, it was totally broken Thanks to a patch from Christof Musik. --- .werks/340 | 10 ++++++++++ ChangeLog | 1 + checks/blade_health | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/340 b/.werks/340 new file mode 100644 index 0000000..881315d --- /dev/null +++ b/.werks/340 @@ -0,0 +1,10 @@ +Title: blade_health: fix check, it was totally broken +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387206421 +Targetversion: future + +Thanks to a patch from Christof Musik. diff --git a/ChangeLog b/ChangeLog index ef74e59..ad7a684 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0358 FIX: df: now ignores filesystems with a reported size of '-'... * 0360 FIX: multipath: Inventory handles non loaded kernel module now... * 0339 FIX: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function... + * 0340 FIX: blade_health: fix check, it was totally broken... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/blade_health b/checks/blade_health index e81cae6..cc631f4 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -40,7 +40,7 @@ def check_blade_health(_no_item, _no_params, info): state = info[0][0] descr = '' if len(info[0]) > 1: - descr = ': %s' % info[1][1] + descr = ': %s' % info[0][1] if state == "255": return (0, "State is good")

10 years, 9 months

Check_MK Git: check_mk: FIX blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod : fix scan function

by Mathias Kettner

Module: check_mk Branch: master Commit: a04498e12aec8ce729b1b0ef9ef9451ab087978e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a04498e12aec8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 16:03:54 2013 +0100 FIX blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function Due to a previous precision in the scan function API the scan functions of the blade_* checks where never successful anymore. That way those checks were not detected on new devices. This has been fixed. Existing checks were not affected. --- .werks/339 | 13 +++++++++++++ ChangeLog | 1 + checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/339 b/.werks/339 new file mode 100644 index 0000000..baf2c49 --- /dev/null +++ b/.werks/339 @@ -0,0 +1,13 @@ +Title: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387205955 +Targetversion: future + +Due to a previous precision in the scan function API the scan functions of +the blade_* checks where never successful anymore. That way those checks +were not detected on new devices. This has been fixed. Existing checks +were not affected. diff --git a/ChangeLog b/ChangeLog index ade0b7b..ef74e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0357 FIX: megaraid_bbu: Fixed expected state checking... * 0358 FIX: df: now ignores filesystems with a reported size of '-'... * 0360 FIX: multipath: Inventory handles non loaded kernel module now... + * 0339 FIX: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/blade_bays b/checks/blade_bays index 3352d5b..d528dc7 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -75,5 +75,5 @@ check_info["blade_bays"] = { "3", # powerDomain2 ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1" ] ), # BLADE-MIB 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blades b/checks/blade_blades index 1313bb4..f1f0e7c 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -79,5 +79,5 @@ check_info["blade_blades"] = { 6, # bladeName ]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blowers b/checks/blade_blowers index d3110d2..b9f9b9c 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -106,5 +106,5 @@ check_info["blade_blowers"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2', [3]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_health b/checks/blade_health index 81a80b8..e81cae6 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -63,5 +63,5 @@ check_info["blade_health"] = { 'service_description': 'Summary health state', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.7', ['1.0', '2.1.3.1']), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 30259c7..9b2402e 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -50,5 +50,5 @@ check_info["blade_mediatray"] = { 'service_description': 'Media tray', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.5.2', [74, 75]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_powerfan b/checks/blade_powerfan index 59b2c25..be50f00 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -59,5 +59,5 @@ check_info["blade_powerfan"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.6.1.1', [1, 2, 3, 4, 5, 6, 7]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_powermod b/checks/blade_powermod index 53e0e87..95c6973 100644 --- a/checks/blade_powermod +++ b/checks/blade_powermod @@ -49,5 +49,5 @@ check_info["blade_powermod"] = { 'service_description': 'Power Module %s', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.4.1.1', [1, 2, 3, 4]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, }

10 years, 9 months

Check_MK Git: check_mk: FIX multipath: Inventory handles non loaded kernel module now

by Lars Michelsen

Module: check_mk Branch: master Commit: 2deaea52d637582a4e581bddda2f783773e3ed9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2deaea52d63758… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 15:45:29 2013 +0100 FIX multipath: Inventory handles non loaded kernel module now The handling for not loaded multipath kernel module and not existing multipath.conf was not working in all cases. This has been improved now. --- .werks/360 | 11 +++++++++++ ChangeLog | 1 + checks/multipath | 14 ++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/360 b/.werks/360 new file mode 100644 index 0000000..0226ffe --- /dev/null +++ b/.werks/360 @@ -0,0 +1,11 @@ +Title: multipath: Inventory handles non loaded kernel module now +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387205073 +Targetversion: future + +The handling for not loaded multipath kernel module and not existing +multipath.conf was not working in all cases. This has been improved now. diff --git a/ChangeLog b/ChangeLog index 4606796..ade0b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 0355 FIX: heartbeat_crm: Now handling "Failed actions:" output in agent... * 0357 FIX: megaraid_bbu: Fixed expected state checking... * 0358 FIX: df: now ignores filesystems with a reported size of '-'... + * 0360 FIX: multipath: Inventory handles non loaded kernel module now... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/multipath b/checks/multipath index d3e73f4..6457f69 100644 --- a/checks/multipath +++ b/checks/multipath @@ -128,7 +128,14 @@ # \_ round-robin 0 [prio=-1][enabled] # \_ 4:0:0:11 sdt 65:48 [active][undef] - +# And a completely new situation: +# <<<multipath>>> +# Nov 05 17:17:03 | DM multipath kernel driver not loaded +# Nov 05 17:17:03 | /etc/multipath.conf does not exist, blacklisting all devices. +# Nov 05 17:17:03 | A sample multipath.conf file is located at +# Nov 05 17:17:03 | /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf +# Nov 05 17:17:03 | You can run /sbin/mpathconf to create or modify /etc/multipath.conf +# Nov 05 17:17:03 | DM multipath kernel driver not loaded def parse_multipath_output(info, only_uuid = None): # only_uuid --> look only for data of this uuid or alias @@ -171,7 +178,10 @@ def parse_multipath_output(info, only_uuid = None): l = " ".join(line) # Skip output when multipath is not present - if l.endswith('DM multipath kernel driver not loaded'): + if l.endswith('DM multipath kernel driver not loaded') \ + or l.endswith('does not exist, blacklisting all devices.') \ + or l.endswith('A sample multipath.conf file is located at') \ + or l.endswith('multipath.conf'): uuid = None continue

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0969

by Mathias Kettner

Module: check_mk Branch: master Commit: 55b5ce495175393ab28b2a64ffd9e0ffb2394847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55b5ce49517539… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 15:31:59 2013 +0100 Updated bug entries #0969 --- .bugs/969 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/969 b/.bugs/969 index 10b6a7e..76547f5 100644 --- a/.bugs/969 +++ b/.bugs/969 @@ -1,12 +1,15 @@ Title: Logwatch in Windows Agent: Problem with EventId 0 Component: checks -State: open +Class: bug +State: wontfix Date: 2013-08-09 14:16:36 Targetversion: 1.2.3i6 -Class: bug Ich überwache mit dem aktuellen Agent WinEventlogs und kann auf zwei Maschinen einen Fehler beobachten wenn die EventID 0 ist. Die Severity bleibt gleich aber der Text wird auf The Operation completed successfully gesetzt. Das geschieht scheinbar durch den Agent selbst, da cmk -d bereits die veränderten Werte anzeigt. + +2013-12-16 15:31:56: changed state open -> wontfix +Die Angaben reichen leider nicht, um das Problem zu untersuchen.

10 years, 9 months

Check_MK Git: check_mk: Windows agent: fix code indentation

by Mathias Kettner

Module: check_mk Branch: master Commit: aa0ff9887b1979c04217299dc59679e1535860af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0ff9887b1979… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 15:30:11 2013 +0100 Windows agent: fix code indentation --- agents/windows/check_mk_agent.cc | 75 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index adeda0f..34cafea 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1067,7 +1067,6 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch dwFlags |= FORMAT_MESSAGE_FROM_HMODULE; DWORD len = FormatMessageW( - // DWORD len = FormatMessage( dwFlags, dll, event->EventID, @@ -1075,46 +1074,46 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch wmsgbuffer, // msgbuffer, 2048, - (char **)strings); + (char **)strings + ); - if (dll) - FreeLibrary(dll); + if (dll) + FreeLibrary(dll); - if (len) - { - // convert message to UTF-8 - len = WideCharToMultiByte(CP_UTF8, 0, wmsgbuffer, -1, msgbuffer, sizeof(msgbuffer), NULL, NULL); - } + if (len) { + // convert message to UTF-8 + len = WideCharToMultiByte(CP_UTF8, 0, wmsgbuffer, -1, msgbuffer, sizeof(msgbuffer), NULL, NULL); + } - if (len == 0) // message could not be converted - { - // if conversion was not successfull while trying to load a DLL, we return a - // failure. Our parent function will then retry later without a DLL path. - if (dllpath) - return false; - - // if message cannot be converted, then at least output the text strings. - // We render all messages one after the other into msgbuffer, separated - // by spaces. - memset(msgbuffer, 0, sizeof(msgbuffer)); // avoids problems with 0-termination - char *w = msgbuffer; - int sizeleft = sizeof(msgbuffer) - 1; // leave one byte for termination - int n = 0; - while (strings[n]) // string array is zero terminated - { - WCHAR *s = strings[n]; - DWORD len = WideCharToMultiByte(CP_UTF8, 0, s, -1, w, sizeleft, NULL, NULL); - if (!len) - break; - sizeleft -= len; - w += len; - if (sizeleft <= 0) - break; - n++; - if (strings[n]) - *w++ = ' '; - } - } + if (len == 0) // message could not be converted + { + // if conversion was not successfull while trying to load a DLL, we return a + // failure. Our parent function will then retry later without a DLL path. + if (dllpath) + return false; + + // if message cannot be converted, then at least output the text strings. + // We render all messages one after the other into msgbuffer, separated + // by spaces. + memset(msgbuffer, 0, sizeof(msgbuffer)); // avoids problems with 0-termination + char *w = msgbuffer; + int sizeleft = sizeof(msgbuffer) - 1; // leave one byte for termination + int n = 0; + while (strings[n]) // string array is zero terminated + { + WCHAR *s = strings[n]; + DWORD len = WideCharToMultiByte(CP_UTF8, 0, s, -1, w, sizeleft, NULL, NULL); + if (!len) + break; + sizeleft -= len; + w += len; + if (sizeleft <= 0) + break; + n++; + if (strings[n]) + *w++ = ' '; + } + } // replace newlines with spaces. check_mk expects one message each line. char *w = msgbuffer;

10 years, 9 months

Check_MK Git: check_mk: FIX df: now ignores filesystems with a reported size of '-'

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e5322b46dcfd783e7ffe427e520f9ba4e67a759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e5322b46dcfd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 15:09:41 2013 +0100 FIX df: now ignores filesystems with a reported size of '-' Previous versions of the check raised an exception because the '-' could not be converted via int(). --- .werks/358 | 11 +++++++++++ ChangeLog | 1 + checks/df | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/358 b/.werks/358 new file mode 100644 index 0000000..278eb0b --- /dev/null +++ b/.werks/358 @@ -0,0 +1,11 @@ +Title: df: now ignores filesystems with a reported size of '-' +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387202921 +Targetversion: future + +Previous versions of the check raised an exception because the '-' +could not be converted via int(). diff --git a/ChangeLog b/ChangeLog index 80ddcf8..a9d1b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0334 FIX: cisco_fantray: Fixed error on Cisco devices which do not support this check... * 0355 FIX: heartbeat_crm: Now handling "Failed actions:" output in agent... * 0357 FIX: megaraid_bbu: Fixed expected state checking... + * 0358 FIX: df: now ignores filesystems with a reported size of '-'... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/df b/checks/df index 516cc4e..e67770c 100644 --- a/checks/df +++ b/checks/df @@ -37,8 +37,7 @@ def inventory_df(info): if line[1] in inventory_df_exclude_fs: continue # ignore this filesystem type - size_kb = int(line[2]) - if size_kb == 0 or line[5] == '-': + if line[2] == '-' or int(line[2]) == 0 or line[5] == '-': continue # exclude filesystems without size mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with /

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits