Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64143 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: 2ea56cace4db847d5b28797305c8ad8ebf8e85f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ea56cace4db84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 21:21:30 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: windows agent: Cleaned up plugin command quotings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 858e1984a64cfb0ef6c0dbdc04a41cd8d04f8a49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858e1984a64cfb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 20:08:31 2011 +0200 windows agent: Cleaned up plugin command quotings --- agents/windows/check_mk_agent.cc | 25 +++++++++---------------- agents/windows/check_mk_agent.exe | Bin 97280 -> 97280 bytes 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a40aef7..5803397 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1068,33 +1068,26 @@ void section_eventlog(SOCKET &out) char *add_interpreter(char *path, char *newpath) { - if (!strcmp(path + strlen(path) - 5, ".vbs\"")) { + if (!strcmp(path + strlen(path) - 4, ".vbs")) { // If this is a vbscript don't rely on the default handler for this // file extensions. This might be notepad or some other editor by // default on a lot of systems. So better add cscript as interpreter. - snprintf(newpath, 256, "cscript.exe //Nologo %s", path); + snprintf(newpath, 256, "cscript.exe //Nologo \"%s\"", path); return newpath; } - else if (!strcmp(path + strlen(path) - 5, ".ps1\"")) { + else if (!strcmp(path + strlen(path) - 4, ".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); + snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", path); + return newpath; + } + else { + snprintf(newpath, 256, "\"%s\"", path); return newpath; } - else - return path; } void run_plugin(SOCKET &out, char *path) @@ -1121,7 +1114,7 @@ void run_external_programs(SOCKET &out, char *dirname) while (0 != (de = readdir(dir))) { char *name = de->d_name; if (name[0] != '.') { - snprintf(path, sizeof(path), "\"%s\\%s\"", dirname, name); + snprintf(path, sizeof(path), "%s\\%s", dirname, name); run_plugin(out, path); } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 16e6aaf..dca5b54 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: 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: bfb28f2a89c17b8703dc0f7c6ebd223dba6f6892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfb28f2a89c17b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 18 20:08:47 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: Allow host names to contain spaces

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7b8df49f98a2a9cdd7c182c501751361bd05f9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7b8df49f98a2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 18 18:35:36 2011 +0200 Allow host names to contain spaces --- ChangeLog | 4 ++++ doc/check_mk_templates.cfg | 4 ++-- web/htdocs/actions.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eefc534..3db1c0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i3: Core, Setup, etc.: + * FIX: allow host names to have spaces * --snmpwalk: fix missing space in case of HEX strings Checks & Agents: @@ -12,6 +13,9 @@ * WaitObject: allow to separate host name and service with a semicolon. That makes host names containing spaces possible. + Multisite: + * FIX: reschedule now works for host names containing spaces + 1.1.11i2: Core, Setup, etc.: * FIX: sort output of cmk --list-hosts alphabetically diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg index 803b4cb..c0a9397 100644 --- a/doc/check_mk_templates.cfg +++ b/doc/check_mk_templates.cfg @@ -259,7 +259,7 @@ define servicedependency { # Calling check_mk with precompiled checks define command { command_name check-mk - command_line python @VARDIR@/precompiled/$HOSTNAME$ + command_line python @VARDIR@/precompiled/"$HOSTNAME$" } # Use this variant of if you are working without precompiled @@ -272,7 +272,7 @@ define command { # Inventory check define command { command_name check-mk-inventory - command_line @BINDIR@/check_mk --cache --check-inventory $HOSTNAME$ + command_line @BINDIR@/check_mk --cache --check-inventory "$HOSTNAME$" } define command { diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index f1060f8..781fcf5 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -64,7 +64,7 @@ def action_reschedule(): html.live.set_only_sites([site]) row = html.live.query_row( "GET %ss\n" - "WaitObject: %s %s\n" + "WaitObject: %s;%s\n" "WaitCondition: last_check >= %d\n" "WaitTimeout: %d\n" "WaitTrigger: check\n"

13 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits