Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: Reserved 1 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22a5937171afdef4baf1a79ff5adf71debd40ad4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22a5937171afde… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 09:23:48 2011 +0100 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 84796bf..21fbd2e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -432 +433

12 years, 7 months

Check_MK Git: check_mk: FIX: Remove WATO Folder filter if WATO is disabled

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 522b3e9d288aaaa7f09cc9f3a4fa1112c8d90d7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=522b3e9d288aaa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 10:33:24 2011 +0100 FIX: Remove WATO Folder filter if WATO is disabled --- ChangeLog | 3 +++ web/htdocs/views.py | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 661397c..60a1bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,9 @@ * New columns num_hosts and num_services in status table * New aggregation functions suminv and avginv (see Documentation) +1.1.12p2: + * FIX: Do not show WATO button in views if WATO is disabled + * FIX: Remove WATO Folder filter if WATO is disabled 1.1.12p1: Core, Setup, etc.: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 74e9fa0..7a1b648 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1151,6 +1151,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # add ubiquitary_filters that are possible for this datasource for fn in ubiquitary_filters: + # Disable 'filename' filter, if WATO is disabled + if fn == "filename" and not config.wato_enabled: + continue filter = multisite_filters[fn] if not filter.info or filter.info in datasource["infos"]: show_filters.append(filter) @@ -1558,6 +1561,9 @@ def view_title(view): title = view["title"] + " " + ", ".join(extra_titles) for fn in ubiquitary_filters: + # Disable 'filename' filter, if WATO is disabled + if fn == "filename" and not config.wato_enabled: + continue filt = multisite_filters[fn] heading = filt.heading_info(tablename) if heading:

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0433

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd40b1ec007339fb977c2d5b570d0644a2b327bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd40b1ec007339… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 11:53:52 2011 +0100 Updated bug entries #0433 --- .bugs/433 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/433 b/.bugs/433 new file mode 100644 index 0000000..814494a --- /dev/null +++ b/.bugs/433 @@ -0,0 +1,13 @@ +Title: cmk -II should keep services on error +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-11-10 11:52:56 +Targetversion: future +Class: nastiness + +If you do a cmk -II on a host and no data can be +fetched from the agent, then all services are removed +anyway. Better would be to abort with an error and +keep the services.

12 years, 7 months

Check_MK Git: check_mk: FIX: mem.win: Default levels now works, check not always OK

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8153def74dc4898c0ad094c0fb5b0696874bd35a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8153def74dc489… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 10 10:44:14 2011 +0100 FIX: mem.win: Default levels now works, check not always OK --- ChangeLog | 4 ++++ checks/mem | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60a1bd5..cb898e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,10 @@ * Windows agent: new config variable "host" in all sections that restricts the folling entries to certain hosts. +1.1.12p2: + Checks & Agents: + * FIX: mem.win: Default levels now works, check not always OK + Multisite: * New nifty sidebar snapin "Speed-O-Meter" * FIX: Fixed encoding problem when opening dashboard diff --git a/checks/mem b/checks/mem index a0f928a..a8b4c4f 100644 --- a/checks/mem +++ b/checks/mem @@ -140,8 +140,8 @@ checkgroup_of["mem.used"] = "memory" # Special memory and page file check for Windows check_default_levels['mem.win'] = "memory_win_default_levels" factory_settings["memory_win_default_levels"] = { - "memory" : ( "80.0", "90.0" ), - "pagefile" : ( "50.0", "70.0" ), + "memory" : ( 80.0, 90.0 ), + "pagefile" : ( 50.0, 70.0 ), } def inventory_mem_win(info):

12 years, 7 months

Check_MK Git: check_mk: WATO: Fixed only_hosts rule generated in distributed mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9682a33e0fda189eac609af623a14ce06de448d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9682a33e0fda18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 10 10:33:37 2011 +0100 WATO: Fixed only_hosts rule generated in distributed mode --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0741b3b..d202562 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6859,7 +6859,7 @@ def create_only_hosts_file(siteid): "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") out.write("if only_hosts == None:\n only_hosts = []\n\n") - out.write("only_hosts += [( ['site:%s'], ALL_HOSTS )]\n" % siteid) + out.write("only_hosts += [(NEGATE, ['!site:%s'], ALL_HOSTS )]\n" % siteid) def delete_only_hosts_file(): p = defaults.check_mk_configdir + "/only_hosts.mk"

12 years, 7 months

Check_MK Git: check_mk: Windows: new config vars host and print

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dbbe0ea6ee9e591e7d0f3313dd760dd30b446f6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbbe0ea6ee9e59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 9 16:49:39 2011 +0100 Windows: new config vars host and print --- ChangeLog | 2 + agents/windows/check_mk.ini | 9 ++- agents/windows/check_mk_agent.cc | 118 +++++++++++++++++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 98816 -> 99840 bytes 4 files changed, 121 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b97b6b..661397c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ allows to configure which sections are being output. * Windows agent: in [logwatch] you can now configure which logfiles to process and which levels of messages to send. + * Windows agent: new config variable "host" in all sections that + restricts the folling entries to certain hosts. Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 4c987a9..abf8ac3 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -2,8 +2,13 @@ # Restrict access to certain IP addresses # only_from = 127.0.0.1 192.168.56.0/24 - # Just output certain sections - # sections = check_mk uptime logwatch + # Restrict the following configuration variables + # in [global] to the following hosts + # host = winsrv* zab???ad + + # Just output certain sections (for upper hosts) + # sections = check_mk + [winperf] # Select counters to extract. The following counters diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 427598b..8c22468 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -68,6 +68,7 @@ bool do_tcp = false; bool should_terminate = false; +char g_hostname[256]; #define SECTION_CHECK_MK 0x00000001 #define SECTION_UPTIME 0x00000002 @@ -1210,12 +1211,12 @@ void get_agent_dir(char *buffer, int size) } - void section_check_mk(SOCKET &out) { output(out, "<<<check_mk>>>\n"); output(out, "Version: %s\n", CHECK_MK_VERSION); output(out, "AgentOS: windows\n"); + output(out, "Hostname: %s\n", g_hostname); output(out, "WorkingDirectory: %s\n", g_current_directory); output(out, "ConfigFile: %s\n", g_config_file); output(out, "AgentDirectory: %s\n", g_agent_directory); @@ -1293,15 +1294,22 @@ bool check_only_from(uint32_t ip) return false; } - -void listen_tcp_loop() +void wsa_startup() { WSADATA wsa; if (0 != WSAStartup(MAKEWORD(2, 0), &wsa)) { fprintf(stderr, "Cannot initialize winsock.\n"); exit(1); } + if (0 != (gethostname(g_hostname, sizeof(g_hostname)))) { + strcpy(g_hostname, ""); + } + +} + +void listen_tcp_loop() +{ SOCKET s = socket(AF_INET, SOCK_STREAM, 0); if (s == INVALID_SOCKET) { fprintf(stderr, "Cannot create socket.\n"); @@ -1538,12 +1546,11 @@ void UninstallService() } } - void do_test() { do_tcp = false; SOCKET dummy; - output_data(dummy); + output_data(dummy); } @@ -1630,6 +1637,66 @@ void lowercase(char *s) } } +// .----------------------------------------------------------------------. +// | ____ __ _ _ _ | +// | / ___|___ _ __ / _(_) __ _ _ _ _ __ __ _| |_(_) ___ _ __ | +// | | | / _ \| '_ \| |_| |/ _` | | | | '__/ _` | __| |/ _ \| '_ \ | +// | | |__| (_) | | | | _| | (_| | |_| | | | (_| | |_| | (_) | | | | | +// | \____\___/|_| |_|_| |_|\__, |\__,_|_| \__,_|\__|_|\___/|_| |_| | +// | |___/ | +// '----------------------------------------------------------------------' + + +// Do a simple pattern matching with the jokers * and ?. +// This is case insensitive (windows-like). +bool globmatch(const char *pattern, char *astring) +{ + const char *p = pattern; + char *s = astring; + while (*s) { + if (!*p) + return false; // pattern too short + + // normal character-wise match + if (tolower(*p) == tolower(*s) || *p == '?') { + p++; + s++; + } + + // non-matching charactetr + else if (*p != '*') + return false; + + else { // check * + // If there is more than one asterisk in the pattern, + // we need to try out several variants. We do this + // by backtracking (smart, eh?) + int maxlength = strlen(s); + // replace * by a sequence of ?, at most the rest length of s + char *subpattern = (char *)malloc(strlen(p) + maxlength + 1); + bool match = false; + for (int i=0; i<=maxlength; i++) { + for (int x=0; x<i; x++) + subpattern[x] = '?'; + strcpy(subpattern + i, p + 1); // omit leading '*' + if (globmatch(subpattern, s)) { + match = true; + break; + } + } + free(subpattern); + return match; + } + } + + // string has ended, pattern not. Pattern must only + // contain * now if it wants to match + while (*p == '*') p++; + return *p == 0; +} + + + void add_only_from(char *value) { if (g_num_only_from >= MAX_ONLY_FROM) { @@ -1800,6 +1867,17 @@ bool handle_logwatch_config_variable(char *var, char *value) return false; } +bool check_host_restriction(char *patterns) +{ + char *word; + while ((word = next_word(&patterns))) { + if (globmatch(word, g_hostname)) { + return true; + } + } + return false; +} + /* Example configuration file: [global] @@ -1835,6 +1913,7 @@ void read_config_file() char line[512]; int lineno = 0; bool (*variable_handler)(char *var, char *value) = 0; + bool is_active = true; // false in sections with host restrictions while (!feof(file)) { if (!fgets(line, sizeof(line), file)) @@ -1859,6 +1938,8 @@ void read_config_file() section, g_config_file, lineno); exit(1); } + // forget host-restrictions if new section begins + is_active = true; } else if (!variable_handler) { fprintf(stderr, "Line %d is outside of any section.\r\n", lineno); @@ -1880,7 +1961,21 @@ void read_config_file() rstrip(variable); lowercase(variable); value = strip(value); - if (!variable_handler(variable, value)) { + + // handle host restriction + if (!strcmp(variable, "host")) + is_active = check_host_restriction(value); + + // skip all other variables for non-relevant hosts + else if (!is_active) + continue; + + // Useful for debugging host restrictions + else if (!strcmp(variable, "print")) + fprintf(stderr, "%s\r\n", value); + + + else if (!variable_handler(variable, value)) { fprintf(stderr, "Invalid entry in %s line %d.\r\n", g_config_file, lineno); exit(1); } @@ -1888,8 +1983,19 @@ void read_config_file() } } + +// .----------------------------------------------------------------------. +// | __ __ _ | +// | | \/ | __ _(_)_ __ | +// | | |\/| |/ _` | | '_ \ | +// | | | | | (_| | | | | | | +// | |_| |_|\__,_|_|_| |_| | +// | | +// '----------------------------------------------------------------------' + int main(int argc, char **argv) { + wsa_startup(); determine_directories(); read_config_file(); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4564267..9f04016 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 7 months

Check_MK Git: check_mk: Fix example check_mk.ini for Windows

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cbb3b84310a8cb947064849bc274e0001a86c4ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbb3b84310a8cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 9 14:47:36 2011 +0100 Fix example check_mk.ini for Windows --- agents/windows/check_mk.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 4caf29c..4c987a9 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -3,7 +3,7 @@ # only_from = 127.0.0.1 192.168.56.0/24 # Just output certain sections - sections = check_mk uptime logwatch + # sections = check_mk uptime logwatch [winperf] # Select counters to extract. The following counters

12 years, 7 months

Check_MK Git: check_mk: Windows agent: make more configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00a8b8b5e5a38127b5e0697d2438df27bb4f16e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a8b8b5e5a381… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 9 12:30:45 2011 +0100 Windows agent: make more configurable New variable sections = in [global] New variable logfile ___ = ___ in [logwatch] --- ChangeLog | 4 + agents/windows/check_mk.ini | 14 +++ agents/windows/check_mk_agent.cc | 217 +++++++++++++++++++++++++++++++------ agents/windows/check_mk_agent.exe | Bin 97280 -> 98816 bytes 4 files changed, 200 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=00a8b8b5e5…

12 years, 8 months

Check_MK Git: check_mk: FIX: fix aggregate_check_mk ( Summary host agent status)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8228c64f0895e087a366f5e2dc21bba4c4f48d85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8228c64f0895e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 8 13:58:43 2011 +0100 FIX: fix aggregate_check_mk (Summary host agent status) --- ChangeLog | 3 +++ modules/check_mk_base.py | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b20a03..147b8fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,9 @@ 1.1.12p1: + Core, Setup, etc.: + * FIX: fix aggregate_check_mk (Summary host agent status) + Checks & Agents: * FIX: mk_oracle now also detects XE databases * FIX: printer_alerts: handle 0-entries of Brother printers diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8f71d42..92a2646 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -213,7 +213,7 @@ def submit_check_mk_aggregation(hostname, status, output): return if not opt_dont_submit: - submit_to_nagios(hostname, "Check_MK", status, output) + submit_to_nagios(summary_hostname(hostname), "Check_MK", status, output) if opt_verbose: color = { 0: tty_green, 1: tty_yellow, 2: tty_red, 3: tty_magenta }[status] @@ -714,6 +714,9 @@ def do_check(hostname, ipaddress): if opt_debug: raise + if checkresult_file_fd != None: + close_checkresult_file() + run_time = time.time() - start_time output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) sys.stdout.write(output) @@ -808,8 +811,6 @@ def do_all_checks_on_host(hostname, ipaddress): error_sections.add(infotype) submit_aggregated_results(hostname) - if checkresult_file_fd != None: - close_checkresult_file() try: if is_tcp_host(hostname): @@ -841,9 +842,11 @@ def open_checkresult_file(): def close_checkresult_file(): + global checkresult_file_fd if checkresult_file_fd != None: os.close(checkresult_file_fd) file(checkresult_file_path + ".ok", "w") + checkresult_file_fd = None def nagios_pipe_open_timeout(signum, stackframe):

12 years, 8 months

Check_MK Git: check_mk: FIX: ps.perf: sum up memory usage over all processes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a5856fa7e1d666a60da1a4b594675d5ed8a3713f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5856fa7e1d666… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 8 13:09:31 2011 +0100 FIX: ps.perf: sum up memory usage over all processes --- ChangeLog | 4 ++++ pnp-templates/check_mk-ps.perf.php | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05ffec5..3b20a03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,10 @@ one pie dashlet for host/service stats * FIX: drbd: fixed inventory functions * FIX: printer_supply: handle output of Brother printers + * FIX: ps.perf PNP template: show memory usage per process and not + summed up. This is needed in situations where one process forks itself + in irregular intervals and rates but you are interested just in the + memory usage of the main process. Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index 3b468f8..a1b841e 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -40,11 +40,12 @@ $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" "; $def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; if (isset($DS[2])) { - $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage\" "; - $def[2] = "DEF:vsz=$RRDFILE[2]:$DS[2]:MAX "; + $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage per process\" "; + $def[2] = "DEF:count=$RRDFILE[1]:$DS[1]:MAX "; + $def[2] .= "DEF:vsz=$RRDFILE[2]:$DS[2]:MAX "; $def[2] .= "DEF:rss=$RRDFILE[3]:$DS[3]:MAX "; - $def[2] .= "CDEF:vszmb=vsz,1024,/ "; - $def[2] .= "CDEF:rssmb=rss,1024,/ "; + $def[2] .= "CDEF:vszmb=vsz,1024,/,count,/ "; + $def[2] .= "CDEF:rssmb=rss,1024,/,count,/ "; $def[2] .= "AREA:vszmb#90a0f0:\"Virtual size \" "; $def[2] .= "GPRINT:vszmb:LAST:\"Current\: %5.1lf MB\" "; $def[2] .= "GPRINT:vszmb:MIN:\"Min\: %5.1lf MB\" ";

12 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011