Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 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: 5f2a731e9793bc39acd42836ad062829003bc15a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f2a731e9793bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 14:51:21 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: logwatch agents/plugins now with ok pattern support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 421edb7274f6bc6d1f4be490acdbb6055140cadf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=421edb7274f6bc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 14:37:13 2012 +0100 logwatch agents/plugins now with ok pattern support --- ChangeLog | 1 + agents/plugins/mk_logwatch | 18 +++++++++--------- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 109568 -> 109568 bytes agents/windows/install_agent.exe | Bin 129941 -> 129945 bytes checks/logwatch | 10 +++++----- web/htdocs/logwatch.css | 5 +++++ web/htdocs/logwatch.py | 8 ++++++++ 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index b260bba..b8ce60d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ progress dialogs (e.g. bulk inventory mode) * FIX: Fixed editing of icon_image rules * Added support of locked hosts and folders ( created by CMDB ) + * Logwatch: logwatch agents/plugins now with ok pattern support Checks & Agents: * New check mssql_counters.locks: Monitors locking related information of diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 2910ab6..821fab5 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -74,7 +74,7 @@ def parse_pattern(line): compiled = re.compile(pattern) except: raise(Exception("Invalid regular expression in line '%s'" % line)) - if level not in [ 'C', 'W', 'I' ]: + if level not in [ 'C', 'W', 'I', 'O' ]: raise(Exception("Invalid pattern line '%s'" % line)) return (level, compiled) @@ -177,7 +177,7 @@ def process_logfile(logfile, patterns): # now seek to offset where interesting data begins os.lseek(fl, offset, 0) # os.SEEK_SET not available in Python 2.4 f = os.fdopen(fl) - worst = 0 + worst = -1 outputtxt = "" lines_parsed = 0 start_time = time.time() @@ -206,17 +206,17 @@ def process_logfile(logfile, patterns): for lev, pattern in patterns: if pattern.search(line[:-1]): level = lev - levelint = {'C': 2, 'W': 1, 'I': 0, '.': 0}[lev] + levelint = {'C': 2, 'W': 1, 'O': 0, 'I': -1, '.': -1}[lev] worst = max(levelint, worst) break - color = {'C': tty_red, 'W': tty_yellow, 'I': tty_blue, '.': ''}[level] + color = {'C': tty_red, 'W': tty_yellow, 'O': tty_green, 'I': tty_blue, '.': ''}[level] outputtxt += "%s%s %s%s\n" % (color, level, line[:-1], tty_normal) new_offset = os.lseek(fl, 0, 1) # os.SEEK_CUR not available in Python 2.4 status[logfile] = new_offset, inode - # output all lines if at least one warning or error has been found - if worst > 0: + # output all lines if at least one warning, error or ok has been found + if worst > -1: sys.stdout.write(outputtxt) sys.stdout.flush() @@ -251,10 +251,10 @@ for filenames, patterns in config: elif key == 'maxtime': opt_maxtime = float(value) elif key == 'overflow': - if value not in [ 'C', 'I', 'W' ]: - raise Exception("Invalid value %s for overflow. Allowed are C, I and W" % value) + if value not in [ 'C', 'I', 'W', 'O' ]: + raise Exception("Invalid value %s for overflow. Allowed are C, I, O and W" % value) opt_overflow = value - opt_overflow_level = {'C':2, 'W':1, 'I':0}[value] + opt_overflow_level = {'C':2, 'W':1, 'O':0, 'I':0}[value] elif key == 'regex': opt_regex = re.compile(value) elif key == 'iregex': diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index aacb292..ff0b467 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1622,7 +1622,7 @@ bool process_textfile(FILE *file, logwatch_textfile* textfile, SOCKET &out, bool } } if (write_output && strlen(line) > 0) - output(out, "%c %s\n", state == 'O' ? 'I' : state, line); + output(out, "%c %s\n", state, line); } return false; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d2bf124..c137d77 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c372d48..5f5f52d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/checks/logwatch b/checks/logwatch index 9100e2b..57e1c9a 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -88,13 +88,15 @@ def logwatch_state(state): return "OK" def logwatch_level_name(level): - if level == 'W': return 'WARN' + if level == 'I': return 'OK' + elif level == 'O': return 'OK' + elif level == 'W': return 'WARN' elif level == 'C': return 'CRIT' - elif level == 'I': return 'OK' else: return 'IGN' def logwatch_level_worst(worst, level): if level == 'I': return max(worst, 0) + elif level == 'O': return max(worst, 0) elif level == 'W': return max(worst, 1) elif level == 'C': return max(worst, 2) else: return worst @@ -116,9 +118,7 @@ def logwatch_precompile(hostname, item, _unused): # only modify the levels taken from the defined rules. # FIXME: Oneday we should clean it up. Maybe via hint in migration nodes or # some mor inteligent valuespec, ... - if pattern[0] == 'O': # Fix "OK" declaration - level = 'I' - elif pattern[0] == 'I': # Fix "IGNORE" declaration + if pattern[0] == 'I': # Fix "IGNORE" declaration level = 'S' else: level = pattern[0] diff --git a/web/htdocs/logwatch.css b/web/htdocs/logwatch.css index 49df5a4..41f9ded 100644 --- a/web/htdocs/logwatch.css +++ b/web/htdocs/logwatch.css @@ -89,6 +89,11 @@ Boston, MA 02110-1301 USA. border-bottom: 1px solid #c00; } +#logwatch .OK { + background-color: #0b3; + border-bottom: 1px solid #0c0; +} + #logwatch td.WARN, td.CRIT, td.OK { width: 5em; text-align: center; diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 0747285..9c6a518 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -33,11 +33,13 @@ stylesheets = [ 'pages', 'status', 'logwatch' ] def level_name(level): if level == 'W': return 'WARN' elif level == 'C': return 'CRIT' + elif level == 'O': return 'OK' else: return 'OK' def level_state(level): if level == 'W': return 1 elif level == 'C': return 2 + elif level == 'O': return 0 else: return 0 # .----------------------------------------------------------------------. @@ -301,6 +303,8 @@ def parse_file(host, file, hidecontext = False): log['level'] = 2 elif level == 'WARN': log['level'] = 1 + elif level == 'OK': + log['level'] = 0 else: log['level'] = 0 @@ -321,6 +325,10 @@ def parse_file(host, file, hidecontext = False): elif line[0] == 'C': line_level = 2 line_class = 'CRIT' + + elif line[0] == 'O': + line_level = 0 + line_class = 'OK' elif not hidecontext: line_level = 0

11 years, 7 months

Check_MK Git: check_mk: livecheck: fixed SIGSEGV on hosts without check_command

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb94a01ba71db493900048ba52d2a1a9bb38d3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb94a01ba71db4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 11:36:24 2012 +0100 livecheck: fixed SIGSEGV on hosts without check_command --- ChangeLog | 1 + livestatus/src/livechecking.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c961f62..b260bba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * FIX: kill process group of called plugin if timeout is reached -> preventing possible freeze of livecheck * FIX: correct escaping of character / in nagios checkresult file + * FIX: fixed SIGSEGV on hosts without defined check_command Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index 1acd9e5..6dfecfd 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -228,7 +228,10 @@ int broker_host_livecheck(int event_type __attribute__ ((__unused__)), void *dat grab_host_macros(hst); char *raw_command; - get_raw_command_line(hst->check_command_ptr, hst->host_check_command, &raw_command,0); + if (get_raw_command_line(hst->check_command_ptr, hst->host_check_command, &raw_command,0) == ERROR) { + // No need to free raw_command + return NEB_OK; + } char *processed_command; process_macros(raw_command, &processed_command, 0);

11 years, 7 months

Check_MK Git: check_mk: check_icmp: fixed length calculation of output buffer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab13e3f0ef63052e0630bb9c1ef45d7d31b70f07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab13e3f0ef6305… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 10:36:15 2012 +0100 check_icmp: fixed length calculation of output buffer --- ChangeLog | 1 + livestatus/src/check_icmp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bb45d3..c961f62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ Livestatus * FIX: comments_with_info in service table was always empty + * FIX: check_icmp: fixed calculation of remaining length of output buffer Livecheck * FIX: fixed problem with long plugin output diff --git a/livestatus/src/check_icmp.c b/livestatus/src/check_icmp.c index d5eba33..fb015e7 100644 --- a/livestatus/src/check_icmp.c +++ b/livestatus/src/check_icmp.c @@ -242,7 +242,7 @@ void do_output(int crash, char *format, ...) { va_list ap; va_start(ap, format); - int place_left = g_output_pointer - g_output_buffer + g_output_buffer_size; + int place_left = g_output_buffer + g_output_buffer_size - g_output_pointer; g_output_pointer += vsnprintf(g_output_pointer, place_left, format, ap); va_end(ap); *g_output_pointer = 0;

11 years, 7 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: eb48d782d68dd49b1ca0b99081fdc46fe2494bba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb48d782d68dd4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 10:38:10 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Add note about plugin to {PostgreSQL check man pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56d3c2fc73bb7407857470ef4bdc47224e08ba30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56d3c2fc73bb74… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 2 14:44:33 2012 +0100 Add note about plugin to {PostgreSQL check man pages --- checkman/postgres_sessions | 2 ++ checkman/postgres_stat_database | 2 ++ checkman/postgres_stat_database.size | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/checkman/postgres_sessions b/checkman/postgres_sessions index fb5cec5..be61db6 100644 --- a/checkman/postgres_sessions +++ b/checkman/postgres_sessions @@ -9,6 +9,8 @@ description: It reports how many sessions there are in total and how many of them are actively querying something. + This check relies on data reported by the agent-side plugin {mk_postgres} + inventory: The check generates one item for the sessions connected to the PostgreSQL daemon. diff --git a/checkman/postgres_stat_database b/checkman/postgres_stat_database index a09a3eb..aac1a89 100644 --- a/checkman/postgres_stat_database +++ b/checkman/postgres_stat_database @@ -17,6 +17,8 @@ description: {commits}, which PostgreSQL tracks down to the sub-transaction level. You can then define levels on the per-second amount of the statements. + + This check relies on data reported by the agent-side plugin {mk_postgres} inventory: One item is generated per database. diff --git a/checkman/postgres_stat_database.size b/checkman/postgres_stat_database.size index 920a005..af32afc 100644 --- a/checkman/postgres_stat_database.size +++ b/checkman/postgres_stat_database.size @@ -8,6 +8,9 @@ description: The check has no alarm levels since PostgreSQL databasizes don't have a size limit. (Single table limit is 32TB, too) + This check relies on data reported by the agent-side plugin {mk_postgres} + + inventory: The check generates one item per Database found.

11 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64e8c9241e9e1cd9e5da9d81ca98dc3b98626754 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e8c9241e9e1c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 2 14:44:40 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 8 months

Check_MK Git: check_mk: windows agent: remove some logging output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a21f92b5b74a490ee930944ea2f7d6c3744c370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a21f92b5b74a4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 13:07:13 2012 +0100 windows agent: remove some logging output --- agents/windows/check_mk_agent.cc | 4 +--- agents/windows/check_mk_agent.exe | Bin 109568 -> 109568 bytes agents/windows/install_agent.exe | Bin 129962 -> 129941 bytes 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 15c945e..aacb292 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1427,7 +1427,6 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta logwatch_textfile *textfile; if ((textfile = get_logwatch_textfile(full_filename)) != NULL) { - printf("File already exists %s\n", full_filename); HANDLE hFile = CreateFile(textfile->path,// file to open GENERIC_READ, // open for reading FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, @@ -1461,7 +1460,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta } CloseHandle(hFile); } else { - printf("Cant open file with CreateFile\n"); + printf("Cant open file with CreateFile %s\n", full_filename); } } @@ -2831,7 +2830,6 @@ void read_config_file() } } fclose(file); - print_logwatch_config(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 59e9dd9..d2bf124 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index fbab14f..c372d48 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 8 months

Check_MK Git: check_mk: windows agent: extended file sharing option on CreateFile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4c46a6868a5d81bc3068a2954afab2dbbf4f900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4c46a6868a5d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 12:53:52 2012 +0100 windows agent: extended file sharing option on CreateFile --- agents/windows/check_mk_agent.cc | 4 ++-- agents/windows/check_mk_agent.exe | Bin 109568 -> 109568 bytes agents/windows/install_agent.exe | Bin 129960 -> 129962 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 53e59c9..15c945e 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1397,7 +1397,7 @@ bool add_new_logwatch_textfile(const char *full_filename, pattern_container *pat HANDLE hFile = CreateFile(full_filename,// file to open GENERIC_READ, // open for reading - FILE_SHARE_READ, // share for reading + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, // default security OPEN_EXISTING, // existing file only FILE_ATTRIBUTE_NORMAL, // normal file @@ -1430,7 +1430,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, pattern_conta printf("File already exists %s\n", full_filename); HANDLE hFile = CreateFile(textfile->path,// file to open GENERIC_READ, // open for reading - FILE_SHARE_READ, // share for reading + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, // default security OPEN_EXISTING, // existing file only FILE_ATTRIBUTE_NORMAL, // normal file diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 8de1f7a..59e9dd9 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1c78a11..fbab14f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 8 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: e442bd699ab6354f92619dab02579b4951c9a237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e442bd699ab635… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 2 12:54:52 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012