Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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, 9 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, 9 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, 9 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, 9 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, 9 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, 9 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: 7d4ce1dca79007440abc6b87bde4ae8544734ce7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d4ce1dca79007… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 12 16:35:04 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Windows agent: new section <<<fileinfo>>>

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d6b2fe7e669915e38a930339b766ddbb77b53ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6b2fe7e669915… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 12 15:44:29 2011 +0100 Windows agent: new section <<<fileinfo>>> --- .bugs/491 | 10 ++++ ChangeLog | 2 + agents/windows/check_mk.ini | 5 ++- agents/windows/check_mk_agent.cc | 97 ++++++++++++++++++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 101888 -> 102912 bytes 5 files changed, 111 insertions(+), 3 deletions(-) diff --git a/.bugs/491 b/.bugs/491 new file mode 100644 index 0000000..151f82a --- /dev/null +++ b/.bugs/491 @@ -0,0 +1,10 @@ +Title: Document Windows agent <<<fileinfo>>> +Component: docu +Benefit: 1 +State: open +Cost: 1 +Date: 2011-12-12 15:44:36 +Targetversion: 1.2.0 +Class: todo + +Document the new feature of the Windows agent diff --git a/ChangeLog b/ChangeLog index 1c5c316..be56aa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ a system reboot is (hopefully) not neccessary anymore * Windows agent: section <<<df>>> now also outputs junctions (windows mount points). No external plugin is needed. + * Windows agent: new section <<<fileinfo>>> for monitoring file sizes + (and later possible ages) * logwatch: allow to classify messages based on their count (see man page of logwatch for details) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index c156a0f..0f94b3d 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -32,7 +32,6 @@ # send messages of type warn or crit # logfile * = off - [mrpe] # Run classical Nagios plugins. The word before the command # line is the service description for Nagios. Use backslashes @@ -40,3 +39,7 @@ # check = Dummy mrpe\check_crit # check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 # check = Whatever c:\myplugins\check_whatever -w 10 -c 20 + +[fileinfo] + # path = C:\Programs\Foo\*.log + # path = M:\Bar Test\*.* diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e911a62..be2c8dc 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -90,6 +90,7 @@ #define SECTION_PLUGINS 0x00000200 #define SECTION_LOCAL 0x00000400 #define SECTION_MRPE 0x00000800 +#define SECTION_FILEINFO 0x00001000 // Limits for static global arrays #define MAX_EVENTLOGS 128 @@ -97,6 +98,7 @@ #define MAX_WINPERF_COUNTERS 64 #define MAX_MRPE_COMMANDS 64 #define MAX_EXECUTE_SUFFIXES 64 +#define MAX_FILEINFO_ENTRIES 128 // Default buffer size for reading performance counters #define DEFAULT_BUFFER_SIZE 40960L @@ -132,6 +134,7 @@ void listen_tcp_loop(); void output(SOCKET &out, const char *format, ...); char *ipv4_to_text(uint32_t ip); void output_data(SOCKET &out); +double file_time(const FILETIME *filetime); // .----------------------------------------------------------------------. // | ____ _ _ _ | @@ -196,6 +199,10 @@ unsigned int g_num_mrpe_entries = 0; unsigned g_num_execute_suffixes = 0; char *g_execute_suffixes[MAX_EXECUTE_SUFFIXES]; +// Array of file patterns for fileinfo +unsigned g_num_fileinfo_paths = 0; +char *g_fileinfo_path[MAX_FILEINFO_ENTRIES]; + // .----------------------------------------------------------------------. // | _ _ _ | // | | | | | ___| |_ __ ___ _ __ ___ | @@ -278,8 +285,13 @@ double current_time() FILETIME filetime; GetSystemTime(&systime); SystemTimeToFileTime(&systime, &filetime); - unsigned long long ft = (unsigned long long)(filetime.dwLowDateTime) - + (((unsigned long long)filetime.dwHighDateTime) << 32); + return file_time(&filetime); +} + +double file_time(const FILETIME *filetime) +{ + unsigned long long ft = (unsigned long long)(filetime->dwLowDateTime) + + (((unsigned long long)filetime->dwHighDateTime) << 32); return ft / 10000000.0; } @@ -1282,6 +1294,76 @@ void section_mem(SOCKET &out) output(out, "PageFree: %11d kB\n", statex.ullAvailPageFile / 1024); } +// .-----------------------------------------------------------------------. +// | ______ __ _ _ _ __ ______ | +// | / / / // _(_) | ___(_)_ __ / _| ___\ \ \ \ | +// | / / / /| |_| | |/ _ \ | '_ \| |_ / _ \\ \ \ \ | +// | \ \ \ \| _| | | __/ | | | | _| (_) / / / / | +// | \_\_\_\_| |_|_|\___|_|_| |_|_| \___/_/_/_/ | +// | | +// '-----------------------------------------------------------------------' + +void output_fileinfos(SOCKET &out, const char *path); +void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data); + +void section_fileinfo(SOCKET &out) +{ + output(out, "<<<fileinfo(sep:124)>>>\n"); + output(out, "%.0f\n", current_time()); + for (unsigned i=0; i<g_num_fileinfo_paths; i++) { + output_fileinfos(out, g_fileinfo_path[i]); + } +} + +void output_fileinfos(SOCKET &out, const char *path) +{ + WIN32_FIND_DATA data; + HANDLE h = FindFirstFileEx(path, FindExInfoStandard, &data, FindExSearchNameMatch, NULL, 0); + if (h != INVALID_HANDLE_VALUE) { + // compute basename of path: search backwards for '\' + const char *basename = ""; + char *end = strrchr(path, '\\'); + if (end) { + *end = 0; + basename = path; + } + output_fileinfo(out, basename, &data); + while (FindNextFile(h, &data)) + output_fileinfo(out, basename, &data); + FindClose(h); + } + else { + output(out, "%s|missing\n", path); + } +} + + +void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data) +{ + unsigned long long size = (unsigned long long)data->nFileSizeLow + + (((unsigned long long)data->nFileSizeHigh) << 32); + + if (0 == (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + output(out, "%s\\%s|%llu|%.0f\n", basename, + data->cFileName, size, file_time(&data->ftLastWriteTime)); + } +} + + +bool handle_fileinfo_config_variable(char *var, char *value) +{ + if (!strcmp(var, "path")) { + if (g_num_fileinfo_paths >= MAX_FILEINFO_ENTRIES) { + fprintf(stderr, "Sorry, only %d entries in [fileinfo] are allowed.\r\n", + MAX_FILEINFO_ENTRIES); + return false; + } + g_fileinfo_path[g_num_fileinfo_paths++] = strdup(value); + return true; + } + return false; +} + // .----------------------------------------------------------------------. // | ____ _ | @@ -1863,6 +1945,8 @@ bool handle_global_config_variable(char *var, char *value) enabled_sections |= SECTION_LOCAL; else if (!strcmp(word, "mrpe")) enabled_sections |= SECTION_MRPE; + else if (!strcmp(word, "fileinfo")) + enabled_sections |= SECTION_FILEINFO; else { fprintf(stderr, "Invalid section '%s'.\r\n", word); return false; @@ -2061,6 +2145,8 @@ void read_config_file() variable_handler = handle_logwatch_config_variable; else if (!strcmp(section, "mrpe")) variable_handler = handle_mrpe_config_variable; + else if (!strcmp(section, "fileinfo")) + variable_handler = handle_fileinfo_config_variable; else { fprintf(stderr, "Invalid section [%s] in %s in line %d.\r\n", section, g_config_file, lineno); @@ -2338,6 +2424,8 @@ void output_data(SOCKET &out) section_ps(out); if (enabled_sections & SECTION_MEM) section_mem(out); + if (enabled_sections & SECTION_FILEINFO) + section_fileinfo(out); if (enabled_sections & SECTION_SERVICES) section_services(out); if (enabled_sections & SECTION_WINPERF) @@ -2359,9 +2447,14 @@ void cleanup() { if (eventlog_buffer_size > 0) delete [] eventlog_buffer; + unregister_all_eventlogs(); // frees a few bytes + while (g_num_execute_suffixes) free(g_execute_suffixes[--g_num_execute_suffixes]); + + while (g_num_fileinfo_paths) + free(g_fileinfo_path[--g_num_fileinfo_paths]); } void show_version() diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e2e4994..ce77e13 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 9 months

Check_MK Git: check_mk: First version of always-OK fileinfo check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e232526027b5d6fb018db5c5a408697998eaec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e232526027b5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 12 16:34:15 2011 +0100 First version of always-OK fileinfo check --- agents/windows/check_mk.ini | 2 + agents/windows/check_mk_agent.cc | 7 +++- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes checks/fileinfo | 56 +++++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 0f94b3d..5b82eb1 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -14,6 +14,7 @@ # Just output certain sections (e.g. for upper hosts) # sections = check_mk plugins df + sections = fileinfo [winperf] @@ -43,3 +44,4 @@ [fileinfo] # path = C:\Programs\Foo\*.log # path = M:\Bar Test\*.* + path = M:\*.* diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index be2c8dc..2cc1083 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1308,7 +1308,7 @@ void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data); void section_fileinfo(SOCKET &out) { - output(out, "<<<fileinfo(sep:124)>>>\n"); + output(out, "<<<fileinfo:sep(124)>>>\n"); output(out, "%.0f\n", current_time()); for (unsigned i=0; i<g_num_fileinfo_paths; i++) { output_fileinfos(out, g_fileinfo_path[i]); @@ -1330,10 +1330,13 @@ void output_fileinfos(SOCKET &out, const char *path) output_fileinfo(out, basename, &data); while (FindNextFile(h, &data)) output_fileinfo(out, basename, &data); + if (end) + *end = '\\'; // repair string FindClose(h); } else { - output(out, "%s|missing\n", path); + DWORD e = GetLastError(); + output(out, "%s|missing|%d\n", path, e); } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ce77e13..b912cbd 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index a33e770..b69d1ae 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/checks/fileinfo b/checks/fileinfo new file mode 100644 index 0000000..93cd915 --- /dev/null +++ b/checks/fileinfo @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example output: +# <<<fileinfo(sep:124)>>> +# 12968175080 +# M:\check_mk.ini|missing +# M:\check_mk.ini|1390|12968174867 +# M:\check_mk_agent.cc|86277|12968174554 +# M:\Makefile|1820|12964010975 +# M:\check_mk_agent.exe|102912|12968174364 +# M:\crash.cc|1672|12964010975 +# M:\crash.exe|20024|12968154426 + +def inventory_fileinfo(info): + return [(line[0], None) for line in info[1:] if len(line) >= 3] + +def check_fileinfo(item, params, info): + reftime = int(info[0][0]) + for line in info[1:]: + if item == line[0]: + if line[1] == "missing": + return (3, "File is missing") + 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) + return (3, "UNKNOWN - File missing in agent output") + + +check_info["fileinfo"] = (check_fileinfo, "File %s", 1, inventory_fileinfo)

12 years, 9 months

Check_MK Git: check_mk: MobileUI: Changed id to class attribute to prevent multipe id Attributes at one page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 957115fa57bf7a5c20eedc754037aa82b32bc28f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=957115fa57bf7a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Dec 12 13:11:12 2011 +0100 MobileUI: Changed id to class attribute to prevent multipe id Attributes at one page --- web/htdocs/mobile.py | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 172797c..e6d6715 100755 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -71,21 +71,16 @@ def jqm_page_navfooter(items, current, page_id): '<div data-role="footer" data-id="%s" data-position="fixed">\n' '<div data-role="navbar">\n' '<ul>\n' % page_id) - for href, title, icon, obj_id in items: - #Is there an html id attribute - if obj_id != False: - obj_id = ' id="%s"' % obj_id - else: - obj_id = '' - + for href, title, icon, custom_css in items: + if custom_css == False: + custom_css = "" if current == href: - active = ' class="ui-state-persist ui-btn-active"' + custom_css += ' ui-state-persist ui-btn-active' else: - active = '' - html.write('<li><a data-transition="slide" %s ' + html.write('<li><a class="%s" data-transition="slide"' 'data-icon="%s" data-iconpos="bottom" ' - 'href="%s"%s>%s</a></li>\n' % - (obj_id, icon, href, active, title)) + 'href="%s">%s</a></li>\n' % + (custom_css, icon, href, title)) html.write( '</ul>\n' '</div>\n' @@ -267,7 +262,7 @@ def show_filter_form(show_filters): # itself and first switch to that page... html.javascript(""" $(document).ready(function() { - $('#results_button').live('click', function(e) { + $('.results_button').live('click', function(e) { e.preventDefault(); var view_div = $("#view_results"); view_div.empty();

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits