Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db2823f21ece4f5a436420b6a525bb1c3ce51165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db2823f21ece4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:42:29 2011 +0100 Recompile agent --- agents/windows/check_mk_agent.exe | Bin 100864 -> 100864 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index db8025b..0d943cc 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: Windows agent: fix bug, plugins would not be executed

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6585f1448a17dd16311bcb14eaeaa7d33f371730 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6585f1448a17dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:40:56 2011 +0100 Windows agent: fix bug, plugins would not be executed --- agents/windows/check_mk_agent.cc | 10 +++++++--- agents/windows/check_mk_agent.exe | Bin 100864 -> 100864 bytes 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 8474df5..c2f2046 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1263,9 +1263,9 @@ bool banned_exec_name(char *name) return false; char *extension = name + strlen(name) - 4; - return ( - strcasecmp(extension, ".dir") - || strcasecmp(extension, ".txt")); + return (!( + !strcasecmp(extension, ".dir") + || !strcasecmp(extension, ".txt"))); } void run_plugin(SOCKET &out, char *path) @@ -2086,6 +2086,10 @@ void listen_tcp_loop() addr.sin_port = htons(CHECK_MK_AGENT_PORT); addr.sin_addr.s_addr = ADDR_ANY; + // int optval = 1; + // setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&optval, sizeof(optval)); + + if (SOCKET_ERROR == bind(s, (SOCKADDR *)&addr, sizeof(SOCKADDR_IN))) { fprintf(stderr, "Cannot bind socket to port %d\n", CHECK_MK_AGENT_PORT); exit(1); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 18f97ba..db8025b 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: Windows agent: better example for MRPE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ef51c6277e6c1e57d7ab7db90f012f61b6a0cc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ef51c6277e6c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:07:57 2011 +0100 Windows agent: better example for MRPE --- agents/windows/check_mk.ini | 3 ++- agents/windows/mrpe/check_crit.bat | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 189059d..9c02959 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -31,5 +31,6 @@ # Run classical Nagios plugins. The word before the command # line is the service description for Nagios. Use backslashes # in Windows-paths. + # check = Dummy mrpe\check_crit # check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 - # check = IP_Configuration c:\myplugins\check_whatever -w 10 -c 20 + # check = Whatever c:\myplugins\check_whatever -w 10 -c 20 diff --git a/agents/windows/mrpe/check_crit.bat b/agents/windows/mrpe/check_crit.bat new file mode 100644 index 0000000..91f515e --- /dev/null +++ b/agents/windows/mrpe/check_crit.bat @@ -0,0 +1,2 @@ +@echo CRIT - This check is always critical +@exit 2

12 years, 7 months

Check_MK Git: check_mk: Winwows agent: finally implement MRPE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0d4fea00f0a79f961a8f0b2600e927e41297bc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0d4fea00f0a79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:03:44 2011 +0100 Winwows agent: finally implement MRPE This feature was not paid by any customer but a free gift from MK :-) --- ChangeLog | 4 ++ agents/windows/check_mk.ini | 12 ++++- agents/windows/check_mk_agent.cc | 101 ++++++++++++++++++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 99840 -> 100864 bytes 4 files changed, 114 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72425f5..f9ec8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,10 @@ 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. + * Windows agent: finally implemented <<<mrpe>>. See check_mk.ini + for examples. + * Windows agent: do not execute *.txt and *.dir in <<<plugins>>> and + <<<local>>> * logwatch: allow to classify messages based on their count (see man page of logwatch for details) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index abf8ac3..189059d 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -6,8 +6,8 @@ # in [global] to the following hosts # host = winsrv* zab???ad - # Just output certain sections (for upper hosts) - # sections = check_mk + # Just output certain sections (e.g. for upper hosts) + # sections = check_mk local mrpe [winperf] @@ -25,3 +25,11 @@ # Switch all other logfiles off. Default is warn: # send messages of type warn or crit # logfile * = off + + +[mrpe] + # Run classical Nagios plugins. The word before the command + # line is the service description for Nagios. Use backslashes + # in Windows-paths. + # check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 + # check = IP_Configuration c:\myplugins\check_whatever -w 10 -c 20 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ed62e27..8474df5 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -58,6 +58,7 @@ #include <unistd.h> #include <sys/types.h> #include <dirent.h> +#include <sys/types.h> #include <ctype.h> // isspace() @@ -88,11 +89,13 @@ #define SECTION_SYSTEMTIME 0x00000100 #define SECTION_PLUGINS 0x00000200 #define SECTION_LOCAL 0x00000400 +#define SECTION_MRPE 0x00000800 // Limits for static global arrays #define MAX_EVENTLOGS 128 #define MAX_ONLY_FROM 32 #define MAX_WINPERF_COUNTERS 64 +#define MAX_MRPE_COMMANDS 64 // Default buffer size for reading performance counters #define DEFAULT_BUFFER_SIZE 40960L @@ -116,6 +119,13 @@ struct eventlog_config_entry { int level; }; +// Command definitions for MRPE +struct mrpe_entry { + char command_line[256]; + char plugin_name[64]; + char service_description[256]; +}; + // Forward declarations of functions void listen_tcp_loop(); void output(SOCKET &out, const char *format, ...); @@ -178,6 +188,9 @@ unsigned int g_num_only_from = 0; struct winperf_counter g_winperf_counters[MAX_WINPERF_COUNTERS]; unsigned int g_num_winperf_counters = 0; +struct mrpe_entry g_mrpe_entries[MAX_MRPE_COMMANDS]; +unsigned int g_num_mrpe_entries = 0; + // .----------------------------------------------------------------------. // | _ _ _ | @@ -1299,7 +1312,35 @@ void run_external_programs(SOCKET &out, char *dirname) void section_mrpe(SOCKET &out) { output(out, "<<<mrpe>>>\n"); - // YET DO BE DONE + for (unsigned i=0; i<g_num_mrpe_entries; i++) + { + mrpe_entry *entry = &g_mrpe_entries[i]; + output(out, "(%s) %s ", entry->plugin_name, entry->service_description); + + FILE *f = _popen(entry->command_line, "r"); + if (!f) { + output(out, "3 Unable to execute - plugin may be missing.\n"); + continue; + } + + if (f) { + char buffer[8192]; + int bytes = fread(buffer, 1, sizeof(buffer) - 1, f); + buffer[bytes] = 0; + rstrip(buffer); + char *plugin_output = lstrip(buffer); + // Replace \n with Ascii 1 and \r with spaces + for (char *x = plugin_output; *x; x++) { + if (*x == '\n') + *x = (char)1; + else if (*x == '\r') + *x = ' '; + } + int status = _pclose(f); + int nagios_code = status; + output(out, "%d %s\n", nagios_code, plugin_output); + } + } } @@ -1333,6 +1374,8 @@ void section_plugins(SOCKET &out) } + + // .----------------------------------------------------------------------. // | ______ ____ _ _ __ __ _ __ ______ | // | / / / / / ___| |__ ___ ___| | __ | \/ | |/ / \ \ \ \ | @@ -1667,6 +1710,9 @@ void add_only_from(char *value) char *next_word(char **line) { + if (*line == 0) // allow subsequent calls without checking + return 0; + char *end = *line + strlen(*line); char *value = *line; while (value < end) { @@ -1725,6 +1771,8 @@ bool handle_global_config_variable(char *var, char *value) enabled_sections |= SECTION_PLUGINS; else if (!strcmp(word, "local")) enabled_sections |= SECTION_LOCAL; + else if (!strcmp(word, "mrpe")) + enabled_sections |= SECTION_MRPE; else { fprintf(stderr, "Invalid section '%s'.\r\n", word); return false; @@ -1819,6 +1867,49 @@ bool check_host_restriction(char *patterns) return false; } + +bool handle_mrpe_config_variable(char *var, char *value) +{ + if (!strcmp(var, "check")) { + if (g_num_mrpe_entries >= MAX_MRPE_COMMANDS) { + fprintf(stderr, "Sorry, we are limited to %u MRPE commands\r\n", MAX_MRPE_COMMANDS); + return false; + } + + // First word: service description + // Rest: command line + fprintf(stderr, "VALUE: [%s]\r\n", value); + char *service_description = next_word(&value); + char *command_line = value; + if (!command_line || !command_line[0]) { + fprintf(stderr, "Invalid command specification for mrpe:\r\n" + "Format: SERVICEDESC COMMANDLINE\r\n"); + return false; + } + fprintf(stderr, "CMD: [%s]\r\n", command_line); + + strncpy(g_mrpe_entries[g_num_mrpe_entries].command_line, command_line, + sizeof(g_mrpe_entries[g_num_mrpe_entries].command_line)); + strncpy(g_mrpe_entries[g_num_mrpe_entries].service_description, service_description, + sizeof(g_mrpe_entries[g_num_mrpe_entries].service_description)); + + // compute plugin name, drop directory part + char *plugin_name = next_word(&value); + char *p = strrchr(plugin_name, '/'); + if (!p) + p = strrchr(plugin_name, '\\'); + if (p) + plugin_name = p + 1; + strncpy(g_mrpe_entries[g_num_mrpe_entries].plugin_name, plugin_name, + sizeof(g_mrpe_entries[g_num_mrpe_entries].plugin_name)); + + g_num_mrpe_entries++; + return true; + } + return false; +} + + /* Example configuration file: [global] @@ -1840,6 +1931,10 @@ bool check_host_restriction(char *patterns) logfile system = off logfile application = info logfile * = off + +[mrpe] + check = DISK_C: mrpe/check_disk -w C: + check = MEM mrpe/check_mem -w 10 -c 20 */ void read_config_file() @@ -1874,6 +1969,8 @@ void read_config_file() variable_handler = handle_winperf_config_variable; else if (!strcmp(section, "logwatch")) variable_handler = handle_logwatch_config_variable; + else if (!strcmp(section, "mrpe")) + variable_handler = handle_mrpe_config_variable; else { fprintf(stderr, "Invalid section [%s] in %s in line %d.\r\n", section, g_config_file, lineno); @@ -2158,6 +2255,8 @@ void output_data(SOCKET &out) section_plugins(out); if (enabled_sections & SECTION_LOCAL) section_local(out); + if (enabled_sections & SECTION_MRPE) + section_mrpe(out); if (enabled_sections & SECTION_SYSTEMTIME) section_systemtime(out); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ff8c033..18f97ba 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: Windows agent: do not execute .txt or .dir

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81e1d41e7a2774ceca516dfa42a6a13bef56a1a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81e1d41e7a2774… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 10:53:00 2011 +0100 Windows agent: do not execute .txt or .dir --- agents/windows/check_mk_agent.cc | 13 ++++++++++++- agents/windows/check_mk_agent.exe | Bin 99840 -> 99840 bytes 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 78d2639..ed62e27 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1244,6 +1244,17 @@ char *add_interpreter(char *path, char *newpath) } } +bool banned_exec_name(char *name) +{ + if (strlen(name) < 5) + return false; + + char *extension = name + strlen(name) - 4; + return ( + strcasecmp(extension, ".dir") + || strcasecmp(extension, ".txt")); +} + void run_plugin(SOCKET &out, char *path) { char newpath[256]; @@ -1267,7 +1278,7 @@ void run_external_programs(SOCKET &out, char *dirname) struct dirent *de; while (0 != (de = readdir(dir))) { char *name = de->d_name; - if (name[0] != '.') { + if (name[0] != '.' && !banned_exec_name(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 4cf9402..ff8c033 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: figheader: correct shell quoting

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e10e2e3aa972e0d097c221f5cc82aa97bc724ff5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e10e2e3aa972e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 10:46:30 2011 +0100 figheader: correct shell quoting --- doc/helpers/figheader | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/figheader b/doc/helpers/figheader index 643e662..ed36a9d 100755 --- a/doc/helpers/figheader +++ b/doc/helpers/figheader @@ -6,7 +6,7 @@ septop = "# ." + '-' * (width - 6) + '.' sepmid = "# +" + '-' * (width - 6) + '+' sepbot = "# '" + '-' * (width - 6) + "'" print septop -for line in os.popen("figlet -c -w %d %s" % (width - 7, " ".join(sys.argv[1:])), "r"): +for line in os.popen("figlet -c -w %d '%s'" % (width - 7, " ".join(sys.argv[1:])), "r"): line = line[:-1] print ("# |%-" + str(width - 6) + "s|") % line print sepmid

12 years, 7 months

Check_MK Git: check_mk: Windows agent: Cleaned up code a bit

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc5984c27f33492f96ab4d9f905df03effffa63a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc5984c27f3349… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 10:46:19 2011 +0100 Windows agent: Cleaned up code a bit --- agents/windows/check_mk_agent.cc | 986 ++++++++++++++++++++++--------------- agents/windows/check_mk_agent.exe | Bin 99840 -> 99840 bytes 2 files changed, 588 insertions(+), 398 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc5984c27f…

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0436

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5adf8dca0e6495ff231fee19acb566488ffad941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5adf8dca0e6495… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 09:13:40 2011 +0100 Updated bug entries #0436 --- .bugs/436 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.bugs/436 b/.bugs/436 new file mode 100644 index 0000000..f3813c4 --- /dev/null +++ b/.bugs/436 @@ -0,0 +1,15 @@ +Title: sounds/ URL create Popup on Windows 7 +Component: multisite +Benefit: 1 +State: open +Cost: 2 +Date: 2011-11-15 09:09:22 +Targetversion: 1.1.12 +Class: bug + +In Windows 7 when you Multisite plays a sound file (e.g. +due to a problem shown in the dashboard), a HTTP +auth window pops up. The reason seems to be that +the sounds URL is excluded from Auth via the +apache config of Multisite. IE seems to think that +it can log out.

12 years, 7 months

Check_MK Git: check_mk: Reserved 30 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1364fd95b799d19ac22c5a6eca18f159c3a3380 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1364fd95b799d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 09:09:14 2011 +0100 Reserved 30 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1e6fd03..5f3bb98 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -444 +474

12 years, 7 months

Check_MK Git: check_mk: FIX: Disallow settings downtimes that end in the past

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d4cbfafedcf5f1306a8aabe7360e64222fb0dd66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4cbfafedcf5f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 17:16:26 2011 +0100 FIX: Disallow settings downtimes that end in the past --- ChangeLog | 1 + web/htdocs/htmllib.py | 5 +++++ web/htdocs/views.py | 4 ++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9dafa4..a301df6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ Multisite: * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers + * FIX: Disallow settings downtimes that end in the past Livestatus: * New columns num_hosts and num_services in status table diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 68f10a8..8f1a1d8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -462,6 +462,11 @@ class html: except: t = default_value + if varname in self.user_errors: + self.add_user_error(varname + "_date", self.user_errors[varname]) + self.add_user_error(varname + "_time", self.user_errors[varname]) + self.set_focus(varname + "_date") + br = time.localtime(t) self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday) self.write(" ") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5f0d6c8..f663e03 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2176,6 +2176,10 @@ def nagios_host_service_action_command(what, dataset): elif html.var("_down_custom") and config.may("action.downtimes"): down_from = html.get_datetime_input("_down_from") down_to = html.get_datetime_input("_down_to") + if down_to < time.time(): + raise MKUserError("_down_to", _("You cannot set a downtime that ends in the past. " + "This incident will be reported.")) + title = _("<b>schedule a downtime from %s to %s</b> on ") % ( time.asctime(time.localtime(down_from)), time.asctime(time.localtime(down_to)))

12 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
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