Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: werk list now support the selection of a certain version

by Mathias Kettner

Module: check_mk Branch: master Commit: e65ad76a5296bf23309b927f0fb36da121d786d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e65ad76a5296bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 10 16:34:20 2014 +0100 werk list now support the selection of a certain version --- werk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/werk b/werk index bf28bc8..f71463a 100755 --- a/werk +++ b/werk @@ -202,7 +202,6 @@ def load_werk(werkid): "state" : "unknown", "title" : "unknown", "component" : "general", - "targetversion" : "future", } f = file(str(werkid)) @@ -218,6 +217,7 @@ def load_werk(werkid): description += line werk["description"] = description + versions.add(werk["version"]) return werk def save_werk(werk): @@ -354,6 +354,7 @@ def main_list(args, format): ( "component", components ), ( "level", levels ), ( "class", classes ), + ( "version", versions ), ]: for v in values: if type(v) == tuple: @@ -797,6 +798,7 @@ def main_fetch_ids(args): # |_| |_| |_|\__,_|_|_| |_| # +versions = set([]) goto_werksdir() load_config() load_werks()

10 years, 5 months

Check_MK Git: check_mk: Minor code cleanup

by Götz Golla

Module: check_mk Branch: master Commit: 83bad49a4e2a2474d744929a1ac6475454cc1c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bad49a4e2a24… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 10 15:47:27 2014 +0100 Minor code cleanup --- checks/job | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/checks/job b/checks/job index 3a75bff..bf58809 100644 --- a/checks/job +++ b/checks/job @@ -26,6 +26,7 @@ #<<<job>>> #==> asd ASD <== +#start_time 1389355839 #exit_code 0 #real_time 0:00.00 #user_time 0.00 @@ -37,6 +38,7 @@ # # #==> test <== +#start_time 1389352839 #exit_code 0 #real_time 0:00.00 #user_time 0.00 @@ -46,10 +48,13 @@ #max_res_kbytes 1984 #avg_mem_kbytes 0 -import datetime - def inventory_job(info): - return [ (' '.join(l[1:-1]), None) for l in info if l[0] == '==>' ] + inventory = [] + for line in info: + if line[0] == '==>': + item = ' '.join(line[1:-1]) + inventory.append( (item, None) ) + return inventory def job_parse_real_time(s): parts = s.split(':') @@ -77,10 +82,8 @@ def job_parse(item, info): val = job_parse_real_time(val) elif key in [ 'user_time', 'system_time' ]: val = float(val) - elif key in [ 'exit_code', 'invol_context_switches', 'vol_context_switches' ]: + elif key in [ 'exit_code', 'invol_context_switches', 'vol_context_switches', 'start_time' ]: val = int(val) - elif key == 'start_time': - val = datetime.datetime.fromtimestamp(int(val)) elif key in [ 'max_res_kbytes', 'avg_mem_kbytes' ]: key = key.replace('kbytes', 'bytes') val = int(val) * 1000 @@ -103,9 +106,8 @@ def check_job(item, _no_params, info): txt += ' (!!)' output.append(txt) - output.append('Started: %s' % job['start_time'].strftime('%Y-%m-%d %H:%M:%S')) - for key, title, value in [ + ('start_time', 'Started', job['start_time']), ('real_time', 'Real-Time', job['real_time']), ('user_time', 'User-Time', job['user_time']), ('system_time', 'System-Time', job['system_time']), @@ -120,6 +122,8 @@ def check_job(item, _no_params, info): display_value = get_bytes_human_readable(value, 1000) elif key in [ 'real_time', 'user_time', 'system_time' ]: display_value = get_age_human_readable(value) + elif key == 'start_time': + display_value = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(value) ) else: display_value = value

10 years, 5 months

Check_MK Git: check_mk: cmciii.psm_current, cmciii_psm_plugs, cmciii_io, cmciii.access, cmciii.temp, cmciii.can_current, cmciii.sensor, cmciii. state: new sub checks included in one new check cmcmiii superseding and improving several previous checks of the Rittal CMCIII device

by Götz Golla

Module: check_mk Branch: master Commit: a0f9eaac2fef8ce014b5e5ffcb89b6448cfc8c4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0f9eaac2fef8c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 10 13:55:03 2014 +0100 cmciii.psm_current, cmciii_psm_plugs, cmciii_io, cmciii.access, cmciii.temp, cmciii.can_current, cmciii.sensor, cmciii.state: new sub checks included in one new check cmcmiii superseding and improving several previous checks of the Rittal CMCIII device The sub checks included in this new check cmciii supersede the following old checks: cmciii_psm_current, cmciii_psm_plugs, cmciii_io, cmciii_pu_io, cmciii_pu_access, cmciii_pu_temp, cmciii_canbus, cmciii_state The new checks deliver significant better performance and unify the service description names. To switch from the old to the new checks you only need to re-inventorize your Rittal CMCIII device. --- .werks/77 | 19 + ChangeLog | 2 + checkman/{cmciii_pu_access => cmciii.access} | 6 +- checkman/{cmciii_pu_canbus => cmciii.can_current} | 4 +- checkman/{cmciii_io => cmciii.io} | 6 +- checkman/cmciii.psm_current | 23 + checkman/cmciii.psm_plugs | 21 + checkman/cmciii.sensor | 22 + checkman/cmciii.state | 22 + checkman/{cmciii_pu_temp => cmciii.temp} | 10 +- checkman/cmciii_pu_io | 22 - checks/cmciii | 643 +++++++++++++++++++++ checks/cmciii_io | 84 --- checks/cmciii_psm_current | 73 --- checks/cmciii_psm_plugs | 69 --- checks/cmciii_pu_access | 61 -- checks/cmciii_pu_canbus | 67 --- checks/cmciii_pu_io | 81 --- checks/cmciii_pu_temp | 82 --- checks/cmciii_state | 74 --- 20 files changed, 765 insertions(+), 626 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a0f9eaac2f…

10 years, 5 months

Check_MK Git: check_mk: fixed typo in werk 442

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f3dcca2e2b26332fc2b07baed673637b093d8839 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3dcca2e2b2633… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jan 10 14:30:59 2014 +0100 fixed typo in werk 442 --- .werks/442 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/442 b/.werks/442 index 0b9169c..eefc367 100644 --- a/.werks/442 +++ b/.werks/442 @@ -1,4 +1,4 @@ -Title: dell_om_disks: Treat global host spare disks as OK, instead of WARN +Title: dell_om_disks: Treat global hot spare disks as OK, instead of WARN Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 4f156a2..9cb3276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,7 +83,7 @@ * 0440 FIX: heartbeat_crm: Inventory more gracefully handles case where agent output is invalid... * 0113 FIX: blade_blades: Now only make inventory for blades that are powered on... * 0441 FIX: megaraid_bbu: Fix several false alarms and cases where inventory failed - * 0442 FIX: dell_om_disks: Treat global host spare disks as OK, instead of WARN... + * 0442 FIX: dell_om_disks: Treat global hot spare disks as OK, instead of WARN... * 0443 FIX: brocade_fcport: cope with firmware that does not provide speed information... * 0322 FIX: timemachine: Check now also works if there are spaces in the name of the backup volume or the hostname * 0253 FIX: windows agent: fixed crash on processing eventlog records...

10 years, 5 months

Check_MK Git: check_mk: emcvnx_disks: Disk slots reported to be empty are not inventorized

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 25008b364f92a0616c4ae0dd3adc0d38d89adaf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25008b364f92a0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jan 10 11:22:38 2014 +0100 emcvnx_disks: Disk slots reported to be empty are not inventorized --- checks/emcvnx_disks | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/emcvnx_disks b/checks/emcvnx_disks index 7169b92..63cb7fb 100644 --- a/checks/emcvnx_disks +++ b/checks/emcvnx_disks @@ -130,7 +130,12 @@ def parse_emcvnx_disks(info): def inventory_emcvnx_disks(info): - return [ (disk, None) for disk in parse_emcvnx_disks(info).keys() ] + parsed = parse_emcvnx_disks(info) + inventory = [] + for disk in parsed: + if parsed[disk]["state"] != "Empty": + inventory.append((disk, None)) + return inventory def check_emcvnx_disks(item, _no_params, info):

10 years, 5 months

Check_MK Git: check_mk: emcvnx_hwstatus: FIX: in EMC VNX 7500 series there is a new type of enclosures called SPE which did break the check because of unexpected output

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: d35100dd87a4f08504c2dd9681c4a1275761487c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d35100dd87a4f0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jan 10 11:02:32 2014 +0100 emcvnx_hwstatus: FIX: in EMC VNX 7500 series there is a new type of enclosures called SPE which did break the check because of unexpected output --- checks/emcvnx_hwstatus | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/checks/emcvnx_hwstatus b/checks/emcvnx_hwstatus index 0364b56..d2fbd9d 100644 --- a/checks/emcvnx_hwstatus +++ b/checks/emcvnx_hwstatus @@ -82,6 +82,9 @@ def parse_emcvnx_hwstatus(info): parsed = {} for line in info: + # recognice Enclosures by a line like + # DAE6S Bus 0 Enclosure 1 + # with maybe an additional error message if Overall Status is not ok if len(line) > 3 and line[1] == "Bus" and line[3] == "Enclosure": encid = line[2] + "/" + line[4] enc = {} @@ -90,6 +93,19 @@ def parse_emcvnx_hwstatus(info): enc["Overall Status"] = line[5].replace("*", "") else: enc["Overall Status"] = "No Errors Reported" + # recognice Enclosures by a line like + # SPE5 Enclosure SPE + # with maybe an additional error message if Overall Status is not ok + elif len(line) > 2 and line[1] == "Enclosure": + encid = line[2] + enc = {} + parsed[encid] = enc + if len(line) > 3: + enc["Overall Status"] = line[3].replace("*", "") + else: + enc["Overall Status"] = "No Errors Reported" + # gather additional information about an Enclosure found in one + # of the cases above elif len(line) > 2 and line[-2] == "State:": if line[0] == "SP": device = line[0] + " " + line[1]

10 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2125

by Lars Michelsen

Module: check_mk Branch: master Commit: ccfea1adbeb7fff775ad9f2fe0adeb638e686032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccfea1adbeb7ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 10 08:35:44 2014 +0100 Updated bug entries #2125 --- .bugs/2125 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2125 b/.bugs/2125 new file mode 100644 index 0000000..e013c37 --- /dev/null +++ b/.bugs/2125 @@ -0,0 +1,14 @@ +Title: EventFilterState() based view filters handle all boxes unticked not as expected +Component: multisite +State: open +Date: 2014-01-10 08:32:57 +Targetversion: 1.2.5i1 +Class: nastiness + +The view filter EventFilterState renders checkboxes of things, for example of states. If all boxes +are unchecked, the filter behaves like all boxes are checked -> no filtering. The user expects that +this filter setting makes the filter all rows out, means an empty result. + +The current implementation might be confusing. Either make the filter work as expected or make the +filter aumomatically check all boxes when the last checkbox is unchecked. This should also show the +user that excluding all states is senseless.

10 years, 5 months

Check_MK Git: check_mk: Nicer output for human readable age

by Mathias Kettner

Module: check_mk Branch: master Commit: 6637c72e138930651203327f0429fa90d41d0eed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6637c72e138930… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 17:40:33 2014 +0100 Nicer output for human readable age --- modules/check_mk_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 359fc3a..b1142cf 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1548,10 +1548,10 @@ def get_age_human_readable(secs): hours, mins = divmod(mins, 60) if hours < 12: return "%d hours, %d min" % (hours, mins) - if hours < 48: + elif hours < 48: return "%d hours" % hours days, hours = divmod(hours, 24) - if days < 7: + if days < 7 and hours > 0: return "%d days, %d hours" % (days, hours) return "%d days" % days

10 years, 5 months

Check_MK Git: check_mk: Internal code cleanup in solaris_multipath check

by Mathias Kettner

Module: check_mk Branch: master Commit: f9405e11c68f8f1d423540de47072397a7b6e88a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9405e11c68f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 17:41:17 2014 +0100 Internal code cleanup in solaris_multipath check --- checks/solaris_multipath | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/checks/solaris_multipath b/checks/solaris_multipath index debf978..9ff6d5e 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -27,22 +27,32 @@ #<<<solaris_multipath>>> #/dev/rdsk/c4t600601608CB02A00DCFD2EEB19A0E111d0s2 4 4 -def check_solaris_multipath(item, params, info): - for line in info: - if line[0].split('/')[-1] == item: - total, ok = map(int, line[1:3]) + +def inventory_solaris_multipath(info): + inventory = [] + for device, total, ok in info: + item = device.split('/')[-1] + inventory.append( (item, None) ) + return inventory + + +def check_solaris_multipath(item, _no_params, info): + for device, total, ok in info: + if item == device.split('/')[-1]: + total = int(total) + ok = int(ok) if total == ok: - return(0, "%d paths up" % total) - elif total > ok and (100 / total) * ok <= 50: - return(2, "only %d/%d paths up" % (ok, total)) + return 0, "%d paths up" % total + elif float(ok) / total <= 0.5: # critical if only half of paths ok + return 2, "only %d/%d paths up" % (ok, total) else: - return(1, "only %d/%d paths up" % (ok, total)) + return 1, "only %d/%d paths up" % (ok, total) + + return 3, "Path not found" - return(2, "Path not found") check_info["solaris_multipath"] = { - "check_function" : check_solaris_multipath, - "inventory_function" : lambda info: [ (item[0].split('/')[-1], None ) for item in info], + "inventory_function" : inventory_solaris_multipath, + "check_function" : check_solaris_multipath, "service_description" : "Multipath %s", - "has_perfdata" : False }

10 years, 5 months

Check_MK Git: check_mk: FIX timemachine: do not inventorize check when timemachine is not used

by Mathias Kettner

Module: check_mk Branch: master Commit: 3953b543d1583b74bd2a0a939d25884aeb24e063 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3953b543d1583b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 9 17:42:24 2014 +0100 FIX timemachine: do not inventorize check when timemachine is not used --- .werks/444 | 10 +++++++ ChangeLog | 1 + checkman/timemachine | 6 ++--- checks/timemachine | 72 ++++++++++++++++++++++++++------------------------ 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/.werks/444 b/.werks/444 new file mode 100644 index 0000000..eef9838 --- /dev/null +++ b/.werks/444 @@ -0,0 +1,10 @@ +Title: timemachine: do not inventorize check when timemachine is not used +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389285719 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index 541f95e..4f156a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * 0253 FIX: windows agent: fixed crash on processing eventlog records... * 0403 FIX: mem.used: Prefer statgrab on FreeBSD for supporting more than 4GB... * 0404 FIX: cups_queues: fix exception in case of alternative time format... + * 0444 FIX: timemachine: do not inventorize check when timemachine is not used Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checkman/timemachine b/checkman/timemachine index 6300966..2ddb63b 100644 --- a/checkman/timemachine +++ b/checkman/timemachine @@ -12,11 +12,11 @@ description: examples: # set default levels to 21600 sec (6h) for WARN and 43200 sec (12h) for CRIT - backup_timemachine_default_levels = { "age": ( 86400, 172800 ) } + timemachine_default_levels = { "age": ( 86400, 172800 ) } # Check timemachine backups on a box called MyMAC with default levels checks += [ - ("MyMAC", "timemachine", None, backup_timemachine_default_levels), + ("MyMAC", "timemachine", None, timemachine_default_levels), ] # or use individual levels for warn and crit @@ -33,6 +33,6 @@ parameters (dict): with the element in seconds [configuration] -backup_timemachine_default_levels(dict): The standard levels for {WARN} and +timemachine_default_levels(dict): The standard levels for {WARN} and {CRIT}, preset to { "age": ( 86400, 172800 ) } which is 1 day / 2 days diff --git a/checks/timemachine b/checks/timemachine index d77e3cb..ee9219b 100644 --- a/checks/timemachine +++ b/checks/timemachine @@ -32,49 +32,51 @@ # <<<timemachine>>> # Unable to locate machine directory for host. -import datetime, time, re -backup_timemachine_default_levels = { "age": ( 86400, 172800 ) } # 1d/2d +factory_settings["timemachine_default_levels"] = { + "age": ( 86400, 172800 ) # 1d/2d +} + def inventory_timemachine(info): - return [(None, backup_timemachine_default_levels)] + if " ".join(info[0]) != "Unable to locate machine directory for host.": + return [ (None, {}) ] + def check_timemachine(item, params, info): - message = " ".join(info[0]) - if not re.match('/Volumes/.+/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]$', message): - return 2, "Backup seems to have failed, message was: %s" % message + line = " ".join(info[0]) # We expect at least one line + if not line.startswith("/Volumes/"): + return 2, "Backup seems to have failed, message was: " + line - warn, crit = params['age'] - now = datetime.datetime.now() - tokens = message.split("/") - timestamp = tokens[-1] - state = 0 - result = re.match('([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])-([0-9][0-9])([0-9][0-9])([0-9][0-9])', timestamp) - if result == None: - return 3, "Timestamp of last backup in unknown format: %s" % timestamp - y = int(result.group(1)) - m = int(result.group(2)) - d = int(result.group(3)) - H = int(result.group(4)) - M = int(result.group(5)) - S = int(result.group(6)) - backuptime = datetime.datetime( y, m, d, H, M, S) - maxage_warn = datetime.timedelta(seconds=warn) - maxage_crit = datetime.timedelta(seconds=crit) - backupage = now - backuptime + tokens = line.split("/") + timestamp = tokens[-1] + backup_timeb = time.strptime(timestamp, "%Y-%m-%d-%H%M%S") + backup_time = time.mktime(backup_timeb) + backup_age = time.time() - backup_time - if backuptime > now: - return 1, "Time problem: The last backup has a timestamp in the future: %s" % backuptime - if backupage > maxage_warn: - state = 1 - if backupage > maxage_crit: + if backup_age < 0: + return 3, "Timestamp of last backup is in the future: " + timestamp + + infotext = "Last backup was at %s (%s ago)" % ( + time.strftime("%c", backup_timeb), get_age_human_readable(backup_age)) + + warn, crit = params['age'] + if backup_age >= crit: state = 2 - return state, "Last Backup was at %s (age %s)" % (backuptime, backupage) + infotext += ", more than %s ago" % get_age_human_readable(crit) + elif backup_age >= warn: + state = 1 + infotext += ", more than %s ago" % get_age_human_readable(warn) + else: + state = 0 + + return state, infotext + check_info["timemachine"] = { - "check_function" : check_timemachine, - "inventory_function" : inventory_timemachine, - "service_description" : "Backup Timemachine", - "group" : "backup_timemachine", - "has_perfdata" : False, + "check_function" : check_timemachine, + "inventory_function" : inventory_timemachine, + "default_levels_variable" : "timemachine_default_levels", + "service_description" : "Backup Timemachine", + "group" : "backup_timemachine", }

10 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
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