Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Updated bug entries #0418, #0419

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d64c20dd9f4e1369a479542ef6ffefc9d235454 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d64c20dd9f4e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 13 16:44:31 2011 +0100 Updated bug entries #0418, #0419 --- .bugs/418 | 11 +++++++++++ .bugs/419 | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.bugs/418 b/.bugs/418 new file mode 100644 index 0000000..e66e1d5 --- /dev/null +++ b/.bugs/418 @@ -0,0 +1,11 @@ +Title: CPU Check: Schwellwerte nicht automatisch gegen 15 Minuten Wert prüfen +Component: checks +Benefit: 2 +State: open +Cost: 2 +Date: 2011-12-13 13:57:51 +Targetversion: 1.1.13i1 +Class: feature + +Der CPU Check prüft die angegebenen Werte momentan immer gegen die 15 Minuten Mittelwerte +Das ist nicht in allen Fällen so gewünscht. Das muss konfigurierbar sein. diff --git a/.bugs/419 b/.bugs/419 new file mode 100644 index 0000000..5e7027d --- /dev/null +++ b/.bugs/419 @@ -0,0 +1,21 @@ +Title: mem.vmalloc falsche Default Limits +Component: checks +Benefit: 2 +State: open +Cost: 1 +Date: 2011-12-13 14:50:04 +Targetversion: 1.1.13i1 +Class: cleanup + + kann es sein, dass die Default-LImits von mem.vmalloc bzgl. +largest free(!) chunk unsinnig sind: + +[configuration] +mem_vmalloc_default_levels (int/float, int/float, int/float, int/float): + Levels used by checks created by inventory. The default value is set + to {(80.0, 90.0, 32, 64)}. + +Da es sich um free mem handelt, sollte die Warning kommen, wenn es +weniger als 64MB sind, und Crit bei < 32MB, also: + +(80.0, 90.0, 64, 32)

12 years, 6 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: 06d4535b8f64b3baebd8ddc2105af5c05f63853f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06d4535b8f64b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 13 16:44:36 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: radio-group for htmllib.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3a992423046e4b37fcb4f62ddc60d2df604ce7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a992423046e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 15:55:37 2011 +0100 radio-group for htmllib.py --- web/htdocs/htmllib.py | 8 ++++++++ web/plugins/views/filters.py | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 109f48f..415faae 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -451,6 +451,14 @@ class html: if varname: self.form_vars.append(varname) + def begin_radio_group(self): + if self.mobile: + self.write('<div>') + + def end_radio_group(self): + if self.mobile: + self.write('</div>') + def radiobutton(self, varname, value, checked, label): if self.has_var(varname): checked = self.var(varname) == value diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 899e7af..633fda6 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -249,9 +249,11 @@ class FilterTristate(Filter): def display(self): current = html.var(self.varname) + html.begin_radio_group() for value, text in [("1", _("yes")), ("0", _("no")), ("-1", _("(ignore)"))]: checked = current == value or (current in [ None, ""] and int(value) == self.deflt) html.radiobutton(self.varname, value, checked, text + "   ") + html.end_radio_group() def tristate_value(self): current = html.var(self.varname)

12 years, 6 months

Check_MK Git: check_mk: Added Perf-O-Meter for fileinfo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eebe8a5a67978942830b769b8bb04859a62fc529 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebe8a5a679789… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 12:08:38 2011 +0100 Added Perf-O-Meter for fileinfo --- ChangeLog | 1 + web/htdocs/status.css | 8 ++++++++ web/plugins/perfometer/check_mk.py | 14 ++++++++++++++ web/plugins/views/perfometer.py | 26 ++++++++++++++++++++------ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index be56aa2..82b7b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ (and later possible ages) * logwatch: allow to classify messages based on their count (see man page of logwatch for details) + * fileinfo: new check for monitoring age and size of files Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 107df0b..09ed6b8 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -193,6 +193,14 @@ table.data td.perfometer td.inner { height: 22px; padding: 0px 0px 0px 1px; } +table.data td.perfometer div.stacked table:first-child { + border-bottom-style: none; +} + +table.data td.perfometer div.stacked td.inner { + height: 10px; +} + td.perfometer a { color: #000; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 1d113c5..841c76f 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -371,3 +371,17 @@ def perfometer_msx_queues(row, check_command, perf_data): return "%d" % length, perfometer_logarithmic(length, 100, 2, color) perfometers["check_mk-winperf_msx_queues"] = perfometer_msx_queues + +def perfometer_fileinfo(row, check_command, perf_data): + h = '<div class="stacked">' + texts = [] + for i, color, base, scale, verbfunc in [ + ( 0, "#ffcc50", 1000000, 10, lambda v: number_human_readable(v, precision=0) ), # size + ( 1, "#ccff50", 3600, 10, age_human_redable )]: # age + val = float(perf_data[i][1]) + h += perfometer_logarithmic(val, base, scale, color) + texts.append(verbfunc(val)) + h += '</div>' + return " / ".join(texts), h # perfometer_logarithmic(100, 200, 2, "#883875") + +perfometers["check_mk-fileinfo"] = perfometer_fileinfo diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 78fec0f..0f37aa1 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -31,7 +31,8 @@ perfometers = {} # Helper functions for perfometers def perfometer_td(perc, color): - return '<td class="inner" style="background-color: %s; width: %d%%;"></td>' % (color, int(float(perc))) + return '<td class="inner" style="background-color: %s; ' \ + 'width: %d%%;"></td>' % (color, int(float(perc))) # Paint linear performeter with one value def perfometer_linear(perc, color): @@ -89,16 +90,29 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right return result + '</tr></table>' -def number_human_readable(n): +def number_human_readable(n, precision=1): n = float(n) + f = "%." + str(precision) + "f" if abs(n) > 1024 * 1024 * 1024: - return "%.1fG" % (n / (1024.0 * 1024 * 1024)) + return (f + "G") % (n / (1024.0 * 1024 * 1024)) elif abs(n) > 1024 * 1024: - return "%.1fM" % (n / (1024.0 * 1024)) + return (f + "M") % (n / (1024.0 * 1024)) elif abs(n) > 1024: - return "%.fK" % (n / 1024.0) + return (f + "K") % (n / 1024.0) else: - return "%.1fB" % n + return (f + "B") % n + +def age_human_redable(secs): + if secs < 240: + return "%d sec" % secs + mins = secs / 60 + if mins < 240: + return "%d min" % mins + hours = mins / 60 + if hours < 48: + return "%d hours" % hours + days = hours / 24 + return "%d days" % days def paint_perfometer(row):

12 years, 6 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 787eee74b9b17bbe6e388cec60b1212d86836f14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787eee74b9b17b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 10:48:11 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 6 months

Check_MK Git: check_mk: Added man-page for fileinfo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96688c23fd9bb98ba266ffc2035abec2c6dddee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96688c23fd9bb9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 10:48:08 2011 +0100 Added man-page for fileinfo --- checkman/fileinfo | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/checkman/fileinfo b/checkman/fileinfo new file mode 100644 index 0000000..c056c79 --- /dev/null +++ b/checkman/fileinfo @@ -0,0 +1,83 @@ +title: Check age and size of files +agents: windows +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the size and age of specific files + in the target host's filesystem. + You can set lower and upper + limits on both the modification time and the size of + a file. When the file is missing then the check will go + {UNKNOWN}. + + This check needs some configuration in the agent, + as the agent needs to know the information about + which files need to be sent. + + Currently only the Windows agent supports this type + of check. Configuration is done in {check_mk.ini} in + the section {[fileinfo]}. Put one or more entries + of the format {path = C:\Some Dir\*.log} into this + section. The agent will send all files that match + the pattern. Wildcards are only allowed in the + filename part, not in the directory path. + +item: + The complete path name of the file as sent by + the agent (this is case sensitive even when monitoring + Windows). + + Please note: when referring to the item in + {check_parameters}, make sure that backslashes + (contained in Windows paths) are properly + quoted. You need one escape level for the Python + string and one for the regular expression. + If you prefix the Python string with a {r}, then + just the regular expression needs its double + backslash (see examples). Without the {r} you + would need four backslashes in a row in order to + denote one backslash in the file's path. + +examples: + check_parameters += [ + # Alert if backup files are too small + ( { "minsize" : (5000000, 10000000) }, + ALL_HOSTS, [ r"File D:\\Backup\\.*.zip" ] ), + + # Alert if snapshot file are too old + ( { "maxage" : (120, 180) }, + ALL_HOSTS, [ "File.*snapshot" ] ), + ] + +perfdata: + Two values: the size of the file in bytes and the age + of the file in seconds (the time since the last + modification of the file). + +inventory: + For each file that the agent sends one service will + be created. + +[parameters] +parameters (dict): This check uses dictionary based + parameters. Per default no parameters are set and + the check is always OK (unless the file is missing). + + + {"minage"}: A pair of integers for the warning and + critical level of the minimum file age in seconds. + A missing key or {None} disables the minimum age + checking. The borders itself always belong to the + better state, so {(60, 120)} will make the check + OK as long as the age of the file is not exceeding + 60 seconds and warning if the age is 120 seconds + or less. + + {"maxage"}: Pair of integers for the maximum file + age in seconds. + + {"minsize"}: The minimum size of the file in bytes (pair of + integers). + + {"maxsize"}: The maximum size.

12 years, 6 months

Check_MK Git: check_mk: Allow dict params without factory settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d6dc7766f57dbb4c826faca94438bddf400e4774 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6dc7766f57dbb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 10:16:21 2011 +0100 Allow dict params without factory settings --- modules/check_mk.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 609b1e5..4d8c9d5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4124,14 +4124,18 @@ def compute_check_parameters(host, checktype, item, params): if type(fs) == dict: params = {} - # Honor factory settings for dict-type checks - if def_levels_varname and type(params) == dict: + # Honor factory settings for dict-type checks. Merge + # dict type checks with multiple matching rules + if type(params) == dict: # Start with factory settings - new_params = factory_settings.get(def_levels_varname, {}).copy() + if def_levels_varname: + new_params = factory_settings.get(def_levels_varname, {}).copy() + else: + new_params = {} # Merge user's default settings onto it - if def_levels_varname in globals(): + if def_levels_varname and (def_levels_varname in globals()): def_levels = eval(def_levels_varname) if type(def_levels) == dict: new_params.update(eval(def_levels_varname)) @@ -4151,7 +4155,7 @@ def compute_check_parameters(host, checktype, item, params): if len(entries) > 0: # loop from last to first (first must have precedence) for entry in entries[::-1]: - if def_levels_varname and type(entry) == dict: + if type(params) == dict and type(entry) == dict: params.update(entry) else: params = entry

12 years, 6 months

Check_MK Git: check_mk: New get_*_human_readable() helpers for checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53d920f9ee252d109f49a632492588a8cd197170 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d920f9ee252d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 10:16:49 2011 +0100 New get_*_human_readable() helpers for checks --- modules/check_mk_base.py | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 747b025..01d6cca 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1037,7 +1037,7 @@ 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.0, bytefrac=True): # Handle negative bytes correctly prefix = '' if b < 0: @@ -1050,8 +1050,21 @@ def get_bytes_human_readable(b, base=1024.0): return '%s%.2fMB' % (prefix, b / base / base) elif b >= base: return '%s%.2fKB' % (prefix, b / base) - else: + elif bytefrac: return '%s%.2fB' % (prefix, b) + else: # Omit byte fractions + return '%s%.0fB' % (prefix, b) + +# Similar to get_bytes_human_readable, but optimized for file +# sizes +def get_filesize_human_readable(size): + if size < 4 * 1024 * 1024: + return str(size) + elif size < 4 * 1024 * 1024 * 1024: + return "%.2fMB" % (float(s) / (1024 * 1024)) + else: + return "%.2fGB" % (float(s) / (1024 * 1024 * 1024)) + def get_nic_speed_human_readable(speed): try: @@ -1078,4 +1091,22 @@ def get_nic_speed_human_readable(speed): def to_celsius(f): return round(float(f) - 32.0) * 5.0 / 9.0 - +# Format time difference seconds into approximated +# human readable value +def get_age_human_readable(secs): + if secs < 240: + return "%d sec" % secs + mins = secs / 60 + if mins < 120: + return "%d min" % mins + hours, mins = divmod(mins, 60) + if hours < 12: + return "%d hours, %d min" % (hours, mins) + if hours < 48: + return "%d hours" % hours + days, hours = divmod(hours, 24) + if days < 7: + return "%d days, %d hours" % (days, hours) + return "%d days" % days + +

12 years, 6 months

Check_MK Git: check_mk: fileinfo: Check now honors parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 34d76b1511a199074c59609f3357bab678bbaedd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34d76b1511a199… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 13 10:17:03 2011 +0100 fileinfo: Check now honors parameters --- checks/fileinfo | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 93cd915..c504d9d 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -35,8 +35,14 @@ # M:\crash.cc|1672|12964010975 # M:\crash.exe|20024|12968154426 +# Parameters +# "minsize" : ( 5000, 4000 ), in bytes +# "maxsize" : ( 8000, 9000 ), in bytes +# "minage" : ( 10, 20 ), in minutes +# "maxage" : ( 50, 80 ), in minutes + def inventory_fileinfo(info): - return [(line[0], None) for line in info[1:] if len(line) >= 3] + return [(line[0], {}) for line in info[1:] if len(line) >= 3] def check_fileinfo(item, params, info): reftime = int(info[0][0]) @@ -47,9 +53,29 @@ def check_fileinfo(item, params, info): state = 0 size = int(line[1]) age = reftime - int(line[2]) - infotext = " - size is %s" % get_bytes_human_readable(size) - perfdata = [ ("size", size), ("age", age) ] - return (state, nagios_state_names[state] + infotext, perfdata) + infos = [] + perfdata = [] + for what, val, verbfunc in [ + ("size", size, get_filesize_human_readable), + ("age", age, get_age_human_readable) ]: + infos.append("%s is %s" % (what, verbfunc(val))) + warn, crit = "", "" + for how, comp in [ ("min", "<" ), + ("max", ">" ) ]: + p = params.get(how + what) + if p: + warn, crit = p + cfunc = eval("lambda a,b: a %s b" % comp) + if cfunc(val, crit): + state = 2 + infos[-1] += " (%s %s)(!!)" % (comp, verbfunc(crit)) + elif cfunc(val, warn): + state = max(state, 1) + infos[-1] += " (%s %s)(!)" % (comp, verbfunc(warn)) + perfdata.append((what, val, warn, crit)) + + infotext = nagios_state_names[state] + " - " + ", ".join(infos) + return (state, infotext, perfdata) return (3, "UNKNOWN - File missing in agent output")

12 years, 6 months

Check_MK Git: check_mk: WATO: Fixed initialization in API function update_host_attributes()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57ceba9af5431edf3d29a1ad71b4fd2ab904d07f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57ceba9af5431e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 12 16:55:28 2011 +0100 WATO: Fixed initialization in API function update_host_attributes() --- web/htdocs/wato.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0d71234..a5bda50 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9720,6 +9720,11 @@ class API: # Update the attributes of the given host and returns the resulting host attributes # which have been persisted def update_host_attributes(self, host, attr): + # Initialize attributes and load all folders + declare_host_tag_attributes() + declare_site_attribute() + load_all_folders() + folder = g_folders.get(host["path"]) load_hosts(folder) folder[".hosts"][host["name"]].update(attr)

12 years, 6 months

← Newer
1
...
21
22
23
24
25
26
27
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011