Checkmk git commits August 2011

checkmk-commits@lists.checkmk.com

3 participants
272 discussions

Check_MK Git: check_mk: Livestatus: WaitObject allow semicolon as a separator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0baa4692f1c264751a140cc442ae4c0b7674dabf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0baa4692f1c264… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 18:33:48 2011 +0200 Livestatus: WaitObject allow semicolon as a separator This allows for spaces in host names --- ChangeLog | 4 ++++ livestatus/src/TableServices.cc | 19 +++++++++++++++++-- livestatus/src/strutil.cc | 3 ++- livestatus/src/strutil.h | 4 ++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4da707..eefc534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,10 @@ new log messages per log file * Windows Agent: Now supports direct execution of powershell scripts + MK Livestatus: + * WaitObject: allow to separate host name and service with a semicolon. + That makes host names containing spaces possible. + 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 05993ba..e1e48ca 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -374,7 +374,22 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, void *TableServices::findObject(char *objectspec) { - char *host_name = next_field(&objectspec); - char *description = objectspec; + char *host_name; + char *description; + + // The protocol proposes spaces as a separator between + // the host name and the service description. That introduces + // the problem that host name containing spaces will not work. + // For that reason we alternatively allow a semicolon as a separator. + char *semicolon = strchr(objectspec, ';'); + if (semicolon) { + *semicolon = 0; + host_name = rstrip(objectspec); + description = rstrip(semicolon + 1); + } + else { + host_name = next_field(&objectspec); + description = objectspec; + } return find_service(host_name, description); } diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index 0511f6b..29a9d62 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -27,11 +27,12 @@ #include "strutil.h" -void rstrip(char *c) +char *rstrip(char *c) { char *w = c + strlen(c) - 1; while (w >= c && isspace(*w)) *w-- = '\0'; + return c; } char *lstrip(char *c) diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index 611008a..9565d8d 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -30,8 +30,8 @@ #ifdef __cplusplus extern "C" { #endif - void rstrip(char *); - char *lstrip(char *line); + char *rstrip(char *); + char *lstrip(char *); int ends_with(const char *a, const char *b); #ifdef __cplusplus char *next_token(char **c, char delim = ',');

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad9f18df2684ca243f82e069759278cffb469900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad9f18df2684ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 18:17:50 2011 +0200 Updated bug entries --- .bugs/147 | 10 +++++++--- .bugs/161 | 10 +++++++--- .bugs/262 | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.bugs/147 b/.bugs/147 index aba2141..7dbef83 100644 --- a/.bugs/147 +++ b/.bugs/147 @@ -1,12 +1,16 @@ Title: New config option snmp_options Component: core +State: wontfix +Class: feature +Date: 2011-02-17 11:43:29 Benefit: 2 -State: open Cost: 1 -Date: 2011-02-17 11:43:29 -Class: feature +Fun: 0 With the new config variable snmp_options one could add custom options for the snmpget/walk command line. That way one could e.g. add a -Cc for certain devices (see docu of snmpwalk). Adding -Cc generally might be dangerous. + +2011-08-18 18:17:23: changed state open -> wontfix +Same as #0084 diff --git a/.bugs/161 b/.bugs/161 index 5a18aab..e7eabee 100644 --- a/.bugs/161 +++ b/.bugs/161 @@ -1,10 +1,11 @@ Title: Add -Cc to snmpwalk options Component: core +State: done +Class: feature +Date: 2011-02-27 14:08:10 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-27 14:08:10 -Class: feature +Fun: 0 This avoids problem on some devices. But Might also introduce new ones. So I'm not sure what to do here. From the manpage of snmpwalk: @@ -18,3 +19,6 @@ Use -Cc to turn off this check. I think we simply enable this option in 1.1.11i1 and see what happens... + +2011-08-18 18:16:05: changed state open -> done +This is done since 1.1.11i1 and does not seem to harm. diff --git a/.bugs/262 b/.bugs/262 index 0921779..2d4d94b 100644 --- a/.bugs/262 +++ b/.bugs/262 @@ -1,10 +1,14 @@ Title: Speed up use of stored snmpwalks Component: core +State: done +Class: feature +Date: 2011-04-20 10:50:15 Benefit: 1 -State: open Cost: 1 -Date: 2011-04-20 10:50:15 -Class: feature +Fun: 0 For large walks it takes almost for ever to make an inventory. Use an in-memory cache. + +2011-08-18 18:16:34: changed state open -> done +We now use binary search.

13 years, 1 month

Check_MK Git: check_mk: --snmpwalk: fix missing space in case of HEX strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6af275c19a233dac24c8b2a024af9eec0a07e230 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6af275c19a233d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 18:15:34 2011 +0200 --snmpwalk: fix missing space in case of HEX strings --- .bugs/151 | 10 +++++++--- ChangeLog | 3 +++ modules/check_mk.py | 7 ++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.bugs/151 b/.bugs/151 index f722057..b7396c1 100644 --- a/.bugs/151 +++ b/.bugs/151 @@ -1,13 +1,17 @@ Title: --snmpwalk garbles HEX strings Component: core +State: done +Class: bug +Date: 2011-02-18 09:58:05 Benefit: 1 -State: open Cost: 2 -Date: 2011-02-18 09:58:05 -Class: bug +Fun: 0 When doing a --snmpwalk if the target machine outputs multiline HEX strings, the trailing spaces are stripped and thus hex codes are glued together (202E instead of 20 2E). That way, the hex string detection fails. This is probably in line 2731 of main.py: the strip() should only strip trailing LF/CR, not spaces. + +2011-08-18 18:14:56: changed state open -> done +Fixed. Problem was a strip() too much. diff --git a/ChangeLog b/ChangeLog index cafd9ac..c4da707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.1.11i3: + Core, Setup, etc.: + * --snmpwalk: fix missing space in case of HEX strings + Checks & Agents: * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect * mk_logwatch: allow to set limits in processing time and number of diff --git a/modules/check_mk.py b/modules/check_mk.py index b0af17b..105c518 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2978,13 +2978,14 @@ def do_snmpwalk_on(hostname, filename): line = f.readline() if not line: break - parts = line.strip().split("=", 1) + parts = line.split("=", 1) if len(parts) != 2: continue oid, value = parts - if value.strip().startswith('"'): + value = value.rstrip("\n") + if value.lstrip().startswith('"'): while value[-1] != '"': - value += f.readline().strip() + value += f.readline().rstrip("\n") if not oid.startswith("."): oid = "." + oid

13 years, 1 month

Check_MK Git: check_mk: printer_pages: workaround for trailing-zeroes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92b1db5a514ec6ee2290d24a8c1bf66c0201baaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92b1db5a514ec6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 18:02:24 2011 +0200 printer_pages: workaround for trailing-zeroes --- ChangeLog | 1 + checks/printer_supply | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26bddc4..cafd9ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i3: Checks & Agents: + * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect * mk_logwatch: allow to set limits in processing time and number of new log messages per log file * Windows Agent: Now supports direct execution of powershell scripts diff --git a/checks/printer_supply b/checks/printer_supply index 13d0bfa..ccfa4f7 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -74,13 +74,14 @@ def printer_supply_fix_infos(info): def inventory_printer_supply(checkname, info): # Ignore devices which show -2 for current value and -2 for max value -> useless - return [ (line[0], "printer_supply_default_levels") + # Also fix trailing zero bytes (seen on HP Jetdirect 143) + return [ (line[0].rstrip('\0'), "printer_supply_default_levels") for line in printer_supply_fix_infos(info) if not (line[1] == '-2' and line[2] == '-2') ] # ignore useless devices def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info): - if line[0] == item: + if line[0].rstrip('\0') == item: maxlevel = int(line[1]) current = saveint(line[2]) warn, crit = params # in percent

13 years, 1 month

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: 47c85db7e407c2ff9ecbacd367407de86605ea98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47c85db7e407c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 17:19:21 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: agents/windows/check_mk_agent.exe ---

13 years, 1 month

Check_MK Git: check_mk: Recompiled check_mk_agent.exe

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90578d813f6112fcdaa83eae4f1930cca9bcfcec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90578d813f6112… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 17:20:27 2011 +0200 Recompiled check_mk_agent.exe --- agents/windows/check_mk_agent.exe | Bin 0 -> 97280 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe new file mode 100755 index 0000000..16e6aaf Binary files /dev/null and b/agents/windows/check_mk_agent.exe differ

13 years, 1 month

Check_MK Git: check_mk: windows check_mk_agent now supports direct execution of powershell scripts

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 274854ab2e50fff7d8bd7419332d94e1f668b847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=274854ab2e50ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 17:18:55 2011 +0200 windows check_mk_agent now supports direct execution of powershell scripts --- agents/windows/check_mk_agent.cc | 18 ++++++++++++++++++ agents/windows/check_mk_agent.exe | Bin 96768 -> 97280 bytes 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a8ccabc..425b1e1 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1075,6 +1075,24 @@ char *add_interpreter(char *path, char *newpath) snprintf(newpath, 256, "cscript.exe //Nologo %s", path); return newpath; } + else if (!strcmp(path + strlen(path) - 5, ".ps1\"")) { + // Same for the powershell scripts. Add the powershell interpreter. + // To make this work properly two things are needed: + // 1.) The powershell interpreter needs to be in PATH + // 2.) The execution policy needs to allow the script execution + // -> Get-ExecutionPolicy / Set-ExecutionPolicy + // Another ugly thing: The commandline syntax of the interpreter. + // we need to replace the quotes round the path + // and put the path into single quotes oO. + + // Strip the quotes round the string + char tmppath[256]; + strcpy(tmppath, ++path); + tmppath[strlen(tmppath) - 1] = '\0'; + + snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", tmppath); + return newpath; + } else return path; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index edf623a..fcec366 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 1 month

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e588696d6b476bdb50eb83f10fbbbb2efa3ff42c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e588696d6b476b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 17:21:15 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95cf0fa..26bddc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * mk_logwatch: allow to set limits in processing time and number of new log messages per log file + * Windows Agent: Now supports direct execution of powershell scripts 1.1.11i2: Core, Setup, etc.:

13 years, 1 month

Check_MK Git: check_mk: mk_logwatch: configurable limits in new lines and time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53f722f1b3d36fa8b295090a5999d8574e9d5674 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53f722f1b3d36f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 16:52:44 2011 +0200 mk_logwatch: configurable limits in new lines and time --- .bugs/116 | 13 +++++++-- .bugs/26 | 10 +++++-- ChangeLog | 5 +++ agents/.f12 | 4 +++ agents/logwatch.cfg | 2 +- agents/plugins/.f12 | 3 ++ agents/plugins/mk_logwatch | 60 ++++++++++++++++++++++++++++++++++++++++--- checkman/logwatch | 46 ++++++++++++--------------------- 8 files changed, 102 insertions(+), 41 deletions(-) diff --git a/.bugs/116 b/.bugs/116 index d9c6116..9f2c661 100644 --- a/.bugs/116 +++ b/.bugs/116 @@ -1,10 +1,11 @@ Title: Make configurable limit on lines processed by mk_logwatch Component: checks +State: done +Class: feature +Date: 2011-01-30 13:42:20 Benefit: 1 -State: open Cost: 2 -Date: 2011-01-30 13:42:20 -Class: feature +Fun: 0 Logfile that grow fast make problems with mk_logwatch since the processing takes too long. We could make the following @@ -19,3 +20,9 @@ or "W" if this limit is exceeded. Exceeding lines are not lost but processed in the next turn. + +We could also allow a time limit, e.g. maxtime=20s. + + +2011-08-18 16:52:03: changed state open -> done +Is implemented. Documentation is online. diff --git a/.bugs/26 b/.bugs/26 index 7b7d7d7..ccc447c 100644 --- a/.bugs/26 +++ b/.bugs/26 @@ -1,11 +1,15 @@ Title: korrupte logwatch-state Datei abfangen Component: checks +State: done +Class: bug +Date: 2010-12-21 16:33:25 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-21 16:33:25 -Class: bug +Fun: 0 Wenn aus irgendeinem Grund die state-Datei vom Logwatch-Agenten kaputt ist, soll man diese einfach neu anlegen (mit Exceptions abfangen). Und irgendwie eine Fehlermeldung hochsenden (künstliche Logzeile?) + +2011-08-18 16:52:29: changed state open -> done +Ein Fehler in der Datei wird einfach ignoriert. diff --git a/ChangeLog b/ChangeLog index 7f2acd8..95cf0fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.11i3: + Checks & Agents: + * mk_logwatch: allow to set limits in processing time and number of + new log messages per log file + 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically diff --git a/agents/.f12 b/agents/.f12 index 1c27cc5..d1f6a26 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -1 +1,5 @@ sudo cp -r * /omd/versions/default/share/check_mk/agents/ +if [ -e /etc/check_mk ] +then + sudo install -m 644 logwatch.cfg /etc/check_mk/ +fi diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index 6dedc9e..696785c 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -38,7 +38,7 @@ I mdadm.*: Rebuild.*event detected W mdadm\[ -/var/log/kern /var/log/kern.log +/var/log/syslog /var/log/kern.log C panic C Oops diff --git a/agents/plugins/.f12 b/agents/plugins/.f12 new file mode 100755 index 0000000..9c4a18e --- /dev/null +++ b/agents/plugins/.f12 @@ -0,0 +1,3 @@ +#!/bin/bash +sudo mkdir -p /usr/lib/check_mk_agent/plugins +sudo install -m 755 * /usr/lib/check_mk_agent/plugins diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 462054c..e4d86e3 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -26,7 +26,7 @@ # Call with -d for debug mode: colored output, no saving of status -import sys,os,re +import sys, os, re, time if '-d' in sys.argv[1:]: tty_red = '\033[1;31m' @@ -179,7 +179,29 @@ def process_logfile(logfile, patterns): f = os.fdopen(fl) worst = 0 outputtxt = "" + lines_parsed = 0 + start_time = time.time() + for line in f: + lines_parsed += 1 + # Check if maximum number of new log messages is exceeded + if opt_maxlines != None and lines_parsed > opt_maxlines: + outputtxt += "%s Maximum number (%d) of new log messages exceeded.\n" % ( + opt_overflow, opt_maxlines) + worst = max(worst, opt_overflow_level) + os.lseek(fl, 0, 2) # Seek to end of file, skip all other messages + break + + # Check if maximum processing time (per file) is exceeded. Check only + # every 100'th line in order to save system calls + if opt_maxtime != None and lines_parsed % 100 == 10 \ + and time.time() - start_time > opt_maxtime: + outputtxt += "%s Maximum parsing time (%.1f sec) of this log file exceeded.\n" % ( + opt_overflow, opt_maxtime) + worst = max(worst, opt_overflow_level) + os.lseek(fl, 0, 2) # Seek to end of file, skip all other messages + break + level = "." for lev, pattern in patterns: if pattern.search(line[:-1]): @@ -189,6 +211,7 @@ def process_logfile(logfile, patterns): break color = {'C': tty_red, 'W': tty_yellow, '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 @@ -203,17 +226,44 @@ except Exception, e: print "CANNOT READ CONFIG FILE: %s" % e sys.exit(1) +# Simply ignore errors in the status file. In case of a corrupted status file we simply begin +# with an empty status. That keeps the monitoring up and running - even if we might loose a +# message in the extreme case of a corrupted status file. try: status = read_status() -except IOError: - status = {} except Exception, e: - print "CANNOT PARSE STATUS FILE: %s" % e - sys.exit(1) status = {} + +# The filename line may contain options like 'maxlines=100' or 'maxtime=10' for filenames, patterns in config: + # Initialize options with default values + opt_maxlines = None + opt_maxtime = None + opt_overflow = 'C' + opt_overflow_level = 2 + try: + options = [ o.split('=', 1) for o in filenames if '=' in o ] + for key, value in options: + if key == 'maxlines': + opt_maxlines = int(value) + 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) + opt_overflow = value + opt_overflow_level = {'C':2, 'W':1, 'I':0}[value] + else: + raise Exception("Invalid option %s" % key) + except Exception, e: + print "INVALID CONFIGURATION: %s" % e + sys.exit(1) + + for glob in filenames: + if '=' in glob: + continue logfiles = [ l.strip() for l in os.popen("ls %s 2>/dev/null" % glob).readlines() ] if len(logfiles) == 0: print '[[[%s:missing]]]' % glob diff --git a/checkman/logwatch b/checkman/logwatch index e4512d5..fe9f1a8 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -4,41 +4,29 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check processes the output of those agents - having the logwatch extension. The windows agent - has this extension built in. The logwatch extension - of the Linux/UNIX agents needs a configuration file - that lists all relevant logfiles and lists possible - log lines that should result in warning or critical - state. The windows agents does not need any configuration - but sends all log files in the Windows event log. - It uses the warning/error classification of Windows. + This check processes the output of agents with the logwatch pluing. The windows agent has built + in this extension. The logwatch extension of the Linux/UNIX agents needs a configuration file + that lists all relevant logfiles and lists possible log lines that should result in warning + or critical state. The windows agents does not need any configuration but sends all log files + in the Windows event log. It uses the warning/error classification of Windows. - Relevant log messages found by the agent are stored - locally into a text file. The check is critical, if - at least one new {or old} log message exists that - is classified as critical. If at least one warning - message exists but no critical, the check results - in a warning state. + Relevant log messages found by the agent are stored locally into a text file. The check is + critical, if at least one new {or old} log message exists that is classified as critical. If + at least one warning message exists but no critical, the check results in a warning state. - The only way to bring the state back to OK is to - delete the text file with the stored log messages. - This is stored below {/var/lib/check_mk/logwatch}. - Usually the logwatch webpage is used to browse and - delete the messages. Please refer to the online - documentation of check_mk for more details about logwatch. + The only way to bring the state back to OK is to delete the text file with the stored log + messages. This is stored below {/var/lib/check_mk/logwatch}. Usually the logwatch webpage is + used to browse and delete the messages. Please refer to the online documentation of check_mk + for more details about logwatch. item: - The name of the logfile. For Linux/UNIX this is - the complete absolute path name of the logfile. - For Windows this is the name as shown in the - windows event log, for example {Application} (case - sensitive!). + The name of the logfile. For Linux/UNIX this is the complete absolute path name of the logfile. + For Windows this is the name as shown in the windows event log, for example {Application} + (case sensitive!). inventory: - All logfiles sent by the agent are automatically - inventorized. Please use standard inventory configuration - methods if you want to ignore certain log files. + All logfiles sent by the agent are automatically inventorized. Please use standard inventory + configuration methods if you want to ignore certain log files. examples:

13 years, 1 month

Check_MK Git: check_mk: Switched version to 1.1.11i3

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14be11a1c6831b005eaceeb833875e4c958ff212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14be11a1c6831b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 10:07:47 2011 +0200 Switched version to 1.1.11i3 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 74b95ed..e862024 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.11i2 +VERSION = 1.1.11i3 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index c925afd..1232ee6 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.11i2 +echo Version: 1.1.11i3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index d6ca648..e3f48cd 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.11i2 +echo Version: 1.1.11i3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 728cb31..68bd0a5 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.11i2 +echo Version: 1.1.11i3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e3bd113..9a07a73 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.11i2 +echo Version: 1.1.11i3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index f1e04c7..c1989de 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.11i2 +echo Version: 1.1.11i3 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a8ccabc..eb4951a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.11i2" +#define CHECK_MK_VERSION "1.1.11i3" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index edf623a..3fcd8bd 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 7cef11e..a949d7d 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 3daa160..6df66fa 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.11i2-1_all.deb net optional +check-mk_1.1.11i3-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 881e14f..1831714 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.11i2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.11i3], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 7d514d2..e797864 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.11i2 +CHECK_MK_VERSION=1.1.11i3 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 0a949b4..74ab21b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.11i2 +VERSION=1.1.11i3 NAME=check_mk LANG= LC_ALL=

13 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2011