[checkmk-commits] Check_MK Git: check_mk: FIX: Made logwatch parsing mechanism a little more robust

Module: check_mk Branch: master Commit: bda40546106084c8cce533582353b5ab0731856a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bda40546106084… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Apr 19 10:58:56 2012 +0000 FIX: Made logwatch parsing mechanism a little more robust (Had problems with emtpy sections from windows agent) --- ChangeLog | 4 ++++ checks/logwatch | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d68f4a9..37ebee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ * View Editor: Fixed jump to top of the page after moving painters during editing views + Checks & Agents: + * FIX: Made logwatch parsing mechanism a little more robust + (Had problems with emtpy sections from windows agent) + 1.2.0b2: Core: * FIX: Cluster host checks were UNKNOWN all the time diff --git a/checks/logwatch b/checks/logwatch index 7714d87..43d3fca 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -123,6 +123,7 @@ def logwatch_precompile(hostname, item, _unused): continue params.append((level, pattern)) + return params @@ -262,6 +263,7 @@ def check_logwatch(item, params, info): block_header = None block_worst = 0 block_lines = [] + block_last_worst_line = '' def finish_block(header, block_worst, block_lines): start = ' '.join(header.split(' ')[0:2]) @@ -270,6 +272,9 @@ def check_logwatch(item, params, info): if os.path.exists(logfile): for line in file(logfile): line = line.rstrip('\n') + # Skip empty lines + if not line: + continue if line.startswith('<<<') and line.endswith('>>>'): if block_header: # The section is finished here. Add it to the list of reclassified lines