Checkmk git commits January 2011

checkmk-commits@lists.checkmk.com

3 participants
114 discussions

Check_MK Git: check_mk: Fixed bullet layout of two snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1367f6997b8fa3595a7d15ed6d063f083ad5167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1367f6997b8fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 16:26:52 2011 +0100 Fixed bullet layout of two snapins --- web/plugins/sidebar/shipped.py | 2 ++ web/plugins/sidebar/wato.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 97511cd..19e9c07 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -44,10 +44,12 @@ except NameError: # -------------------------------------------------------------- def render_about(): html.write("Version: " + defaults.check_mk_version) + html.write("<ul>") bulletlink("Homepage", "http://mathias-kettner.de/check_mk.html") bulletlink("Documentation", "http://mathias-kettner.de/checkmk.html") bulletlink("Download", "http://mathias-kettner.de/check_mk_download.html") bulletlink("Mathias Kettner", "http://mathias-kettner.de") + html.write("</ul>") sidebar_snapins["about"] = { "title" : "About Check_MK", diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index aeba3f7..a25f76f 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -28,9 +28,11 @@ def ajax_wato_files(h): global html html = h if config.may("use_wato"): + html.write('<ul>') for filename, title, roles in config.config_files: if config.role in roles: bulletlink(title, "wato.py?filename=%s" % filename) + html.write('</ul>') sidebar_snapins["wato"] = {

13 years, 8 months

Check_MK Git: check_mk: Revert "Added new check df. trend to analyze df growth within given timeranges"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84244c50b66242607b632471b2df1406274eb4b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84244c50b66242… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 15:45:04 2011 +0100 Revert "Added new check df.trend to analyze df growth within given timeranges" This reverts commit 518a623ed8f06257b4d900fcdbee070d20372517. --- checkman/df.trend | 78 ------------------------------- checks/df | 133 ----------------------------------------------------- 2 files changed, 0 insertions(+), 211 deletions(-) diff --git a/checkman/df.trend b/checkman/df.trend deleted file mode 100644 index 8bdd86d..0000000 --- a/checkman/df.trend +++ /dev/null @@ -1,78 +0,0 @@ -title: Check filesystem space usage trends within a given timerange -agents: linux, windows, aix, solaris, vms -author: lars Michelsen <lm(a)mathias-kettner.de -license: GPL -distribution: check_mk -description: - This check measures the disk usage trend within a given timerange. - Thresholds can be used to check if the trend is within a given range - and the disk space is enough for a given amount of time. - - The check snapshots the current disk usage and compares it with the - current usage until it is too old for the given timerange. Then the - snapshot is refreshed. - When setting up the check for a filesystem it needs one interval of - the given timerange to get an average value for this time. Until this - is done the check might be to sensitive. - - The check tries to calculate the time left until the disk is full. This - calculation is done on the average bytes per second within the given - timerange. This calculation assumes a linear growing disk usage. If you - find this senseless these checks can be disabled. - -item: - The mount point of the filesystem (UNIX) or the drive - letter in upper case followed by a colon (Windows). - -examples: - # Set default parameters to: - # 1. analyze the last 24 hours - # 2. growing of 1% within the given timerange raises a WARNING - # 3. growing of 2% within the given timerange raises a CRITICAL - # 4. 10 days left until disk is full (on linear growing) raises a CRITICAL - df_trend_default_levels = (24 * 60 * 60, 1.0, 2.0, 10, None) - - # Exclude temporary backup from inventory - inventory_df_exclude_mountpoints = [ "/mnt/backup" ] - - # Exclude certain filesystems from being inventorized at all - inventory_df_exclude_fs = [ "iso9660", "romfs" ] - -perfdata: - One variable: the used space of the filesystem in MB. Also the minimum (0 MB), - maximum (size of the filesystem) and the warning and critical - levels in MB are provided. - -inventory: - df.trend supports inventory. All filesystem the agent reports - will be inventorized except mount points listed in - {inventory_df_exclude_mountpoints} and filesystem types - listed in {inventory_df_exclude_fs}. The Windows agent - only reports fixed disks. The Linux agent reports filesystems - that have a size and are not of type smbfs, tmpfs, cifs or nfs. - -[parameters] - # 1. timerange to look at - # 2. warning grow percent - # 3. critical grow percent - # 4. warning days left (based on linear growing) - # 5. critical days left (based on linear growing) -timerange (int): The timerange to analyze (in seconds). Defaults to 86400. -warning_perc (float): Grow percent compared to the volume size within the given - timerange to raise a {WARNING} state. Can be set to {None} to disable this check. - Defaults to 1.0. -critical_perc (float): Grow percent compared to the volume size within the given - timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. - Defaults to 2.0. -warning_days (int): Days left when assuming linear growing as measured in the given - timerange to raise a {WARNING} state. Can be set to {None} to disable this check. - Defaults to {10} days. -critical_days (int): Days left when assuming linear growing as measured in the given - timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. - Defaults to {None}. - -[configuration] -inventory_df_exclude_fs (list of strings): Lists of filesystem types to exclude from inventory -inventory_df_exclude_mountpoints (list of strings): List of mount points to exclude from inventory -df_trend_default_levels (int, float, float, int, int): Default levels for filesystem trends detected by inventory. This variable is preset to {(86400, 1.0, 2.0, 10, None)}. - diff --git a/checks/df b/checks/df index 1555b66..a809e35 100644 --- a/checks/df +++ b/checks/df @@ -101,136 +101,3 @@ def inventory_df(checkname, info): return inventory check_info['df'] = (check_df, "fs_%s", 1, inventory_df) - - - -# New check: df.trend with checks the amount of space -# which has been allocated in a given time range -# -# Author: Lars Michelsen <lm(a)mathias-kettner.de - -df_trend_default_levels = (86400, 1.0, 2.0, 10, None) - -# This stores the current value and compares it with the value -# which before "backlog" seconds. If there is no value found -# with this age (check is too new) the oldest known value is used. -def get_trend(itemname, this_time, this_val, backlog): - - # first call: take current value - if not itemname in g_counters: - g_counters[itemname] = (this_time, this_val) - - if opt_dont_submit: - return 0, this_val - raise MKCounterWrapped(itemname, 'Counter initialization') - - # Get previous value and time difference - last_time, last_val = g_counters.get(itemname) - timedif = this_time - last_time - - # Only update when old data is older than 24h - if this_time - last_time > backlog: - print "get_trend: Saving new val" - g_counters[itemname] = (this_time, this_val) - - return timedif, (this_val - last_val) - -def inventory_df_trend(checkname, info): - inventory = [] - for line in info: - try: - fs_type = line[1] - size_kb = int(line[2]) - if size_kb == 0 or line[5] == '-': - continue # exclude filesystems without size - item = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / - - # exclude some filesystem types and some items - if fs_type not in inventory_df_exclude_fs and item not in inventory_df_exclude_mountpoints: - inventory.append((item, 'df_trend_default_levels')) - except ValueError,e: - sys.stderr.write("Invalid plugin output '%s'\n" % (line,)) - pass # ignore e.g. entries for /proc, etc. if plugin sends any - - return inventory - -# FIXME: There is some duplicate code with the df check. Maybe move to include file -def check_df_trend(item, params, info): - # df outputs seven columns: - # DEVICE FS-TYPE SIZE(KB) USED(KB) AVAIL(KB) USED(%) MOUNTPOINT - # The mount point may contain spaces (seen on VMWare volumes) - - used_list = [ l for l in info if " ".join(l[6:]).replace('\\','/') == item ] - - if len(used_list) == 0: - return (3, "UNKNOWN - %s missing or not a partition" % item ) - used = used_list[0] # might be listed twice. We take the first occurance - - # In some rare cases the item may contain a space (happened on ESX). - if len(used) > 7: - used = used[0:6] + [ " ".join(used[6:]) ] - - if len(used) != 7 or used[5][-1] != '%': - return (3, "UNKNOWN - Invalid output from agent (%s)" % (' '.join(used),)) - - bytes_total = saveint(used[2]) * 1024 - bytes_used = bytes_total - (saveint(used[4]) * 1024) - - # Get trend within the given timerange. When there are no information - # for the whole range get the oldest available data - try: - timedif, trend = get_trend("df.trend.%s" % item, time.time(), saveint(bytes_used), params[0]) - except MKCounterWrapped, e: - return (3, "UNKNOWN - Initialized value -> Skipping check result") - - # Check thresholds: percentage trend - perc_used = 100 * (bytes_used / float(bytes_total)) - perc_trend = 100 * (trend / float(bytes_total)) - status = 0 - status_txt = '' - if params[2] and perc_trend > params[2]: - status = 2 - status_txt = ' (grew more than %s%%)' % params[2] - elif params[1] and perc_trend > params[1]: - status = 1 - status_txt = ' (grew more than %s%%)' % params[1] - - # Format the timedif - (hours, seconds) = divmod(timedif, 3600) - (minutes, seconds) = divmod(seconds, 60) - timedif_txt = '%02d:%02d:%02d' % (int(hours), int(minutes), int(seconds)) - - perfdata = [ - ( 'trend_mb', '%.2fMB' % (trend / 1024 / 1024), '', '', 0, '%.2f' % (bytes_total / 1024 / 1024)), - ( 'trend_perc', '%.2f%%' % perc_trend, params[1], params[2], 0, 100 ), - ] - - output = "%s trend is %s (%.2f%%) for last %s%s" % \ - (item, get_bytes_human_readable(trend), perc_trend, timedif_txt, status_txt) - - # Calculate the time left, assuming linear growing - sec_left = -1 - if trend > 0: - bytes_per_sec = trend / timedif - sec_left = bytes_total / bytes_per_sec - - if params[4] and params[4] * 86400 > sec_left: - status = 2 - status_txt = ' (CRIT: less than %d days left)' % params[4] - elif params[3] and params[3] * 86400 > sec_left: - if status < 1: - status = 1 - status_txt = ' (WARN: less than %d days left)' % params[3] - - # Fortmat the output - (days, seconds) = divmod(sec_left, 86400) - (hours, seconds) = divmod(seconds, 3600) - (minutes, seconds) = divmod(seconds, 60) - output += ' - %d days, %d hours, %d minutes, %d seconds left%s' % \ - (int(days), int(hours), int(minutes), int(seconds), status_txt) - - perfdata += [('sec_left', sec_left, params[3], params[4])] - - return (status, '%s - %s' % (nagios_state_names[status], output), perfdata) - -check_info['df.trend'] = (check_df_trend, "Disk Usage Trend %s", 1, inventory_df_trend)

13 years, 8 months

Check_MK Git: check_mk: Multisite: new column for comments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96486567b6d21b5d58b11830bd14a04d0373d8ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96486567b6d21b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 13 10:43:48 2011 +0100 Multisite: new column for comments --- ChangeLog | 2 ++ web/.f12 | 2 +- web/plugins/views/painters.py | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2269d58..2ed206e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Multisite: * New reschedule icon now also works for non-local sites. * painter options are now persisted on a per-user-base + * new optional column for displaying host and service comments + (not used in shipped views but available in view editor) Livestatus: * Check for buffer overflows (replace strcat with strncat, etc.) diff --git a/web/.f12 b/web/.f12 index c49acf6..8c90ab2 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd reload eins apache' +sudo su - -c 'omd reload wato apache' diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9e13488..e440a6b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -603,6 +603,21 @@ multisite_painters["check_manpage"] = { "paint" : paint_check_manpage } +def paint_comments(prefix, row): + comments = row[ prefix + "comments_with_info"] + text = ", ".join(["<i>%s</i>: %s" % (a,c) for (id,a,c) in comments ]) + return "", text + +multisite_painters["svc_comments"] = { + "title" : "Service Comments", + "short" : "Comments", + "columns" : [ "service_comments_with_info" ], + "paint" : lambda row: paint_comments("service_", row) +} + + + + def notes_matching_pattern_entries(dirs, item): from fnmatch import fnmatch matching = [] @@ -1014,6 +1029,14 @@ multisite_painters["host_tags"] = { "paint" : paint_host_tags } +multisite_painters["host_comments"] = { + "title" : "Host Comments", + "short" : "Comments", + "columns" : [ "host_comments_with_info" ], + "paint" : lambda row: paint_comments("host_", row) +} + + # _ _ _ # | | | | ___ ___| |_ __ _ _ __ ___ _ _ _ __ ___ # | |_| |/ _ \/ __| __/ _` | '__/ _ \| | | | '_ \/ __|

13 years, 8 months

Check_MK Git: check_mk: Byte formating function can handle negative byte values now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d19d7c20831d9bfd799de10dd371321b8a183ec8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d19d7c20831d9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 12 14:04:23 2011 +0100 Byte formating function can handle negative byte values now --- modules/check_mk_base.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7a296a4..cb15778 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1033,15 +1033,21 @@ def savefloat(f): # Takes bytes as integer and returns a string which represents the bytes in a # more human readable form scaled to GB/MB/KB -def get_bytes_human_readable(b, base=1024.0): +def get_bytes_human_readable(b, base=1024): + # Handle negative bytes correctly + prefix = '' + if b < 0: + prefix = '-' + b *= -1 + if b > base * base * base: - return '%.2fGB' % (b / base / base / base) + return '%s%.2fGB' % (prefix, b / base / base / base) if b > base * base: - return '%.2fMB' % (b / base / base) + return '%s%.2fMB' % (prefix, b / base / base) elif b > base: - return '%.2fKB' % (b / base) + return '%s%.2fKB' % (prefix, b / base) else: - return '%.2fB' % b + return '%s%.2fB' % (prefix, b) def get_nic_speed_human_readable(speed): try:

13 years, 8 months

Check_MK Git: check_mk: Added new check df. trend to analyze df growth within given timeranges

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 518a623ed8f06257b4d900fcdbee070d20372517 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=518a623ed8f062… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 12 22:52:57 2011 +0100 Added new check df.trend to analyze df growth within given timeranges --- checkman/df.trend | 78 +++++++++++++++++++++++++++++++ checks/df | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 0 deletions(-) diff --git a/checkman/df.trend b/checkman/df.trend new file mode 100644 index 0000000..8bdd86d --- /dev/null +++ b/checkman/df.trend @@ -0,0 +1,78 @@ +title: Check filesystem space usage trends within a given timerange +agents: linux, windows, aix, solaris, vms +author: lars Michelsen <lm(a)mathias-kettner.de +license: GPL +distribution: check_mk +description: + This check measures the disk usage trend within a given timerange. + Thresholds can be used to check if the trend is within a given range + and the disk space is enough for a given amount of time. + + The check snapshots the current disk usage and compares it with the + current usage until it is too old for the given timerange. Then the + snapshot is refreshed. + When setting up the check for a filesystem it needs one interval of + the given timerange to get an average value for this time. Until this + is done the check might be to sensitive. + + The check tries to calculate the time left until the disk is full. This + calculation is done on the average bytes per second within the given + timerange. This calculation assumes a linear growing disk usage. If you + find this senseless these checks can be disabled. + +item: + The mount point of the filesystem (UNIX) or the drive + letter in upper case followed by a colon (Windows). + +examples: + # Set default parameters to: + # 1. analyze the last 24 hours + # 2. growing of 1% within the given timerange raises a WARNING + # 3. growing of 2% within the given timerange raises a CRITICAL + # 4. 10 days left until disk is full (on linear growing) raises a CRITICAL + df_trend_default_levels = (24 * 60 * 60, 1.0, 2.0, 10, None) + + # Exclude temporary backup from inventory + inventory_df_exclude_mountpoints = [ "/mnt/backup" ] + + # Exclude certain filesystems from being inventorized at all + inventory_df_exclude_fs = [ "iso9660", "romfs" ] + +perfdata: + One variable: the used space of the filesystem in MB. Also the minimum (0 MB), + maximum (size of the filesystem) and the warning and critical + levels in MB are provided. + +inventory: + df.trend supports inventory. All filesystem the agent reports + will be inventorized except mount points listed in + {inventory_df_exclude_mountpoints} and filesystem types + listed in {inventory_df_exclude_fs}. The Windows agent + only reports fixed disks. The Linux agent reports filesystems + that have a size and are not of type smbfs, tmpfs, cifs or nfs. + +[parameters] + # 1. timerange to look at + # 2. warning grow percent + # 3. critical grow percent + # 4. warning days left (based on linear growing) + # 5. critical days left (based on linear growing) +timerange (int): The timerange to analyze (in seconds). Defaults to 86400. +warning_perc (float): Grow percent compared to the volume size within the given + timerange to raise a {WARNING} state. Can be set to {None} to disable this check. + Defaults to 1.0. +critical_perc (float): Grow percent compared to the volume size within the given + timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. + Defaults to 2.0. +warning_days (int): Days left when assuming linear growing as measured in the given + timerange to raise a {WARNING} state. Can be set to {None} to disable this check. + Defaults to {10} days. +critical_days (int): Days left when assuming linear growing as measured in the given + timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. + Defaults to {None}. + +[configuration] +inventory_df_exclude_fs (list of strings): Lists of filesystem types to exclude from inventory +inventory_df_exclude_mountpoints (list of strings): List of mount points to exclude from inventory +df_trend_default_levels (int, float, float, int, int): Default levels for filesystem trends detected by inventory. This variable is preset to {(86400, 1.0, 2.0, 10, None)}. + diff --git a/checks/df b/checks/df index a809e35..1555b66 100644 --- a/checks/df +++ b/checks/df @@ -101,3 +101,136 @@ def inventory_df(checkname, info): return inventory check_info['df'] = (check_df, "fs_%s", 1, inventory_df) + + + +# New check: df.trend with checks the amount of space +# which has been allocated in a given time range +# +# Author: Lars Michelsen <lm(a)mathias-kettner.de + +df_trend_default_levels = (86400, 1.0, 2.0, 10, None) + +# This stores the current value and compares it with the value +# which before "backlog" seconds. If there is no value found +# with this age (check is too new) the oldest known value is used. +def get_trend(itemname, this_time, this_val, backlog): + + # first call: take current value + if not itemname in g_counters: + g_counters[itemname] = (this_time, this_val) + + if opt_dont_submit: + return 0, this_val + raise MKCounterWrapped(itemname, 'Counter initialization') + + # Get previous value and time difference + last_time, last_val = g_counters.get(itemname) + timedif = this_time - last_time + + # Only update when old data is older than 24h + if this_time - last_time > backlog: + print "get_trend: Saving new val" + g_counters[itemname] = (this_time, this_val) + + return timedif, (this_val - last_val) + +def inventory_df_trend(checkname, info): + inventory = [] + for line in info: + try: + fs_type = line[1] + size_kb = int(line[2]) + if size_kb == 0 or line[5] == '-': + continue # exclude filesystems without size + item = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / + + # exclude some filesystem types and some items + if fs_type not in inventory_df_exclude_fs and item not in inventory_df_exclude_mountpoints: + inventory.append((item, 'df_trend_default_levels')) + except ValueError,e: + sys.stderr.write("Invalid plugin output '%s'\n" % (line,)) + pass # ignore e.g. entries for /proc, etc. if plugin sends any + + return inventory + +# FIXME: There is some duplicate code with the df check. Maybe move to include file +def check_df_trend(item, params, info): + # df outputs seven columns: + # DEVICE FS-TYPE SIZE(KB) USED(KB) AVAIL(KB) USED(%) MOUNTPOINT + # The mount point may contain spaces (seen on VMWare volumes) + + used_list = [ l for l in info if " ".join(l[6:]).replace('\\','/') == item ] + + if len(used_list) == 0: + return (3, "UNKNOWN - %s missing or not a partition" % item ) + used = used_list[0] # might be listed twice. We take the first occurance + + # In some rare cases the item may contain a space (happened on ESX). + if len(used) > 7: + used = used[0:6] + [ " ".join(used[6:]) ] + + if len(used) != 7 or used[5][-1] != '%': + return (3, "UNKNOWN - Invalid output from agent (%s)" % (' '.join(used),)) + + bytes_total = saveint(used[2]) * 1024 + bytes_used = bytes_total - (saveint(used[4]) * 1024) + + # Get trend within the given timerange. When there are no information + # for the whole range get the oldest available data + try: + timedif, trend = get_trend("df.trend.%s" % item, time.time(), saveint(bytes_used), params[0]) + except MKCounterWrapped, e: + return (3, "UNKNOWN - Initialized value -> Skipping check result") + + # Check thresholds: percentage trend + perc_used = 100 * (bytes_used / float(bytes_total)) + perc_trend = 100 * (trend / float(bytes_total)) + status = 0 + status_txt = '' + if params[2] and perc_trend > params[2]: + status = 2 + status_txt = ' (grew more than %s%%)' % params[2] + elif params[1] and perc_trend > params[1]: + status = 1 + status_txt = ' (grew more than %s%%)' % params[1] + + # Format the timedif + (hours, seconds) = divmod(timedif, 3600) + (minutes, seconds) = divmod(seconds, 60) + timedif_txt = '%02d:%02d:%02d' % (int(hours), int(minutes), int(seconds)) + + perfdata = [ + ( 'trend_mb', '%.2fMB' % (trend / 1024 / 1024), '', '', 0, '%.2f' % (bytes_total / 1024 / 1024)), + ( 'trend_perc', '%.2f%%' % perc_trend, params[1], params[2], 0, 100 ), + ] + + output = "%s trend is %s (%.2f%%) for last %s%s" % \ + (item, get_bytes_human_readable(trend), perc_trend, timedif_txt, status_txt) + + # Calculate the time left, assuming linear growing + sec_left = -1 + if trend > 0: + bytes_per_sec = trend / timedif + sec_left = bytes_total / bytes_per_sec + + if params[4] and params[4] * 86400 > sec_left: + status = 2 + status_txt = ' (CRIT: less than %d days left)' % params[4] + elif params[3] and params[3] * 86400 > sec_left: + if status < 1: + status = 1 + status_txt = ' (WARN: less than %d days left)' % params[3] + + # Fortmat the output + (days, seconds) = divmod(sec_left, 86400) + (hours, seconds) = divmod(seconds, 3600) + (minutes, seconds) = divmod(seconds, 60) + output += ' - %d days, %d hours, %d minutes, %d seconds left%s' % \ + (int(days), int(hours), int(minutes), int(seconds), status_txt) + + perfdata += [('sec_left', sec_left, params[3], params[4])] + + return (status, '%s - %s' % (nagios_state_names[status], output), perfdata) + +check_info['df.trend'] = (check_df_trend, "Disk Usage Trend %s", 1, inventory_df_trend)

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3409e2ff299a21f8e8a14f123e66bde92695f8c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3409e2ff299a21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 12 22:53:02 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6bc33391e3e9cb85e357579341233de73db4289 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6bc33391e3e9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 12 22:53:41 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e74ae54..2269d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Checks & Agents: * apc_symmetra: handle empty SNMP variables and treat as 0. + * Added new check df.trend to analyze df growth during given timeranges 1.1.9i3: INCOMPATIBLE CHANGES:

13 years, 8 months

Check_MK Git: check_mk: Livestatus: Reduce number of log messages ( reclassify to debug)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f59542aaffbb0a1f88e58c283178af7670fcf28d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f59542aaffbb0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 12 17:17:57 2011 +0100 Livestatus: Reduce number of log messages (reclassify to debug) --- ChangeLog | 1 + livestatus/src/module.c | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83b376f..e74ae54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Livestatus: * Check for buffer overflows (replace strcat with strncat, etc.) + * Reduce number of log messages (reclassify to debug) Checks & Agents: * apc_symmetra: handle empty SNMP variables and treat as 0. diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 2f55de6..614df90 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -128,7 +128,6 @@ void livestatus_cleanup_after_fork() void *main_thread(void *data) { g_thread_pid = getpid(); - logger(LG_INFO, "Entering main loop, listening on UNIX socket. PID is %d", g_thread_pid); while (!g_should_terminate) { do_statistics(); @@ -192,7 +191,8 @@ void start_threads() /* start thread that listens on socket */ pthread_atfork(livestatus_count_fork, NULL, livestatus_cleanup_after_fork); pthread_create(&g_mainthread_id, 0, main_thread, (void *)0); - logger(LG_INFO, "Starting %d client threads", g_num_clientthreads); + if (g_debug_level > 0) + logger(LG_INFO, "Starting %d client threads", g_num_clientthreads); unsigned t; g_clientthread_id = (pthread_t *)malloc(sizeof(pthread_t) * g_num_clientthreads); @@ -228,7 +228,8 @@ void terminate_threads() if (0 != pthread_join(g_clientthread_id[t], NULL)) logger(LG_INFO, "Warning: could not join thread %p", g_clientthread_id[t]); } - logger(LG_INFO, "Main thread + %u client threads have finished", g_num_clientthreads); + if (g_debug_level > 0) + logger(LG_INFO, "Main thread + %u client threads have finished", g_num_clientthreads); g_thread_running = 0; } free(g_clientthread_id); @@ -255,7 +256,6 @@ int open_unix_socket() logger(LG_CRIT , "Unable to create UNIX socket: %s", strerror(errno)); return false; } - logger(LG_INFO , "Created UNIX control socket at %s", g_socket_path); // Imortant: close on exec -> check plugins must not inherit it! if (0 < fcntl(g_unix_socket, F_SETFD, FD_CLOEXEC)) @@ -286,7 +286,8 @@ int open_unix_socket() return false; } - logger(LG_INFO, "Opened UNIX socket %s\n", g_socket_path); + if (g_debug_level > 0) + logger(LG_INFO, "Opened UNIX socket %s\n", g_socket_path); return true; } @@ -598,8 +599,10 @@ void livestatus_parse_arguments(const char *args_orig) void omd_advertize() { char *omd_site = getenv("OMD_SITE"); - if (omd_site) - logger(LG_INFO, "Running on OMD site %s. Cool.", omd_site); + if (omd_site) { + if (g_debug_level > 0) + logger(LG_INFO, "Running on OMD site %s. Cool.", omd_site); + } else { logger(LG_INFO, "Hint: please try out OMD - the Open Monitoring Distribution"); logger(LG_INFO, "Please visit OMD at http://omdistro.org"); @@ -613,8 +616,7 @@ int nebmodule_init(int flags, char *args, void *handle) g_nagios_handle = handle; livestatus_parse_arguments(args); - logger(LG_INFO, "Version %s initializing. Socket path: '%s'", VERSION, g_socket_path); - logger(LG_INFO, "Livestatus has been brought to you by Mathias Kettner"); + logger(LG_INFO, "Livestatus %s by Mathias Kettner. Socket: '%s'", VERSION, g_socket_path); logger(LG_INFO, "Please visit us at http://mathias-kettner.de/"); omd_advertize(); @@ -622,12 +624,12 @@ int nebmodule_init(int flags, char *args, void *handle) if (!open_unix_socket()) return 1; - if( !verify_event_broker_options() ) { + if (!verify_event_broker_options()) { logger(LG_CRIT, "Fatal: bailing out. Please fix event_broker_options."); logger(LG_CRIT, "Hint: your event_broker_options are set to %d. Try setting it to -1.", event_broker_options); return 1; } - else + else if (g_debug_level > 0) logger(LG_INFO, "Your event_broker_options are sufficient for livestatus."); store_init(); @@ -639,7 +641,8 @@ int nebmodule_init(int flags, char *args, void *handle) thread the first time one of our callbacks is called. Before that happens, we haven't got any data anyway... */ - logger(LG_INFO, "successfully finished initialization"); + if (g_debug_level > 0) + logger(LG_INFO, "successfully finished initialization"); return 0; }

13 years, 8 months

Check_MK Git: check_mk: apc_symmetra: handle empty SNMP variables and treat as 0

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5960c0292581525420bcc60c6b6075b7ba10aaa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5960c029258152… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 12 15:16:28 2011 +0100 apc_symmetra: handle empty SNMP variables and treat as 0 --- ChangeLog | 3 +++ checks/apc_symmetra | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52000ee..83b376f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ Livestatus: * Check for buffer overflows (replace strcat with strncat, etc.) + Checks & Agents: + * apc_symmetra: handle empty SNMP variables and treat as 0. + 1.1.9i3: INCOMPATIBLE CHANGES: * You need a current version of Livestatus for Multisite to work! diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 221065d..f64d443 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -41,7 +41,7 @@ apc_default_levels = ( 95, 40, 1, 220 ) def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ - AdvOutputCurrent = [int(x) for x in info[0][:7]] + AdvOutputCurrent = [ saveint(x) for x in info[0][:7] ] RunTimeRemaining = info[0][7] crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01fa19b637aacac35301111d78a103d736bbe529 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01fa19b637aaca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 12 08:10:46 2011 +0100 Updated bug entries --- .bugs/95 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/95 b/.bugs/95 new file mode 100644 index 0000000..3c436fa --- /dev/null +++ b/.bugs/95 @@ -0,0 +1,12 @@ +Title: Improve output of relative timestamps (since, ago, in) +Component: multisite +Benefit: 1 +State: open +Cost: 1 +Date: 2011-01-12 08:09:36 +Class: feature + +Sometimes it is not clear whether the time is in past or future, +for example on "last check" and "next scheduled check". The latter +one can happen to be in past. We might need to add 'in', 'since' +or 'ago'

13 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2011