Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 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: 3852a40fca91dc30f5c338da70991d96af10db14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3852a40fca91dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 13 14:52:13 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 11 months

Check_MK Git: check_mk: Added: install guides for HP-UX and FreeBSD based on my install notes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dab664c7790ff9f1014f2b0921c39c124298264b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dab664c7790ff9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Sep 12 09:59:51 2011 +0200 Added: install guides for HP-UX and FreeBSD based on my install notes --- doc/agent/Readme.FreeBSD | 57 ++++++++++++++++++++++++++++++++++++++++++++++ doc/agent/Readme.HP-UX | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) diff --git a/doc/agent/Readme.FreeBSD b/doc/agent/Readme.FreeBSD new file mode 100644 index 0000000..ef1da49 --- /dev/null +++ b/doc/agent/Readme.FreeBSD @@ -0,0 +1,57 @@ + + +Setup of check_MK agent on FreeBSD: +----------------------------------- + +The check_mk agent is not available as a port so far. +This means you have to manually downloadf and install it. + + +First we'll be installing a few small ports that allow us to access more +monitoring data: + +sysutils/muse +sysutils/ipmitool +devel/libstatgrab + + +Then we'll enable inetd in rc.conf: + +inetd_enable=yes +inetd_flags=-wW + + +We download the most current agent: + +cd /usr/local/bin +fetch 'http://git.mathias-kettner.de/git/?p=check_mk.git;a=blob_plain;f=agents/che…' + +-rwx------ 1 root wheel 11599 Mar 15 15:59 /usr/local/bin/check_mk + + +We make it resolveable by adding it to the service names list in /etc/services: + +check_mk 6556/tcp #check_mk agent + + +We add an entry to the inetd configuration that ensures it will be run if someone connects to the port. + +check_mk stream tcp nowait root /usr/local/bin/check_mk check_mk + + +And we set up minimum security in /etc/hosts.allow + +# Allow nagios server to access us +check_mk : ip_of_nagios_server : allow + + +# At last,we restart inetd to read in the new config and bring it up +/etc/rc.d/inetd start + + + +If access doesn't work right away you can test the tcp wrapper settings using +tcpdchk. +Alternatively you can of course also use key-based ssh or any other more secure +means of transportation. + diff --git a/doc/agent/Readme.HP-UX b/doc/agent/Readme.HP-UX new file mode 100644 index 0000000..8c9e9c0 --- /dev/null +++ b/doc/agent/Readme.HP-UX @@ -0,0 +1,48 @@ + + +Setup of check_mk agent on HP-UX +-------------------------------- + +Note: This is written without access to a HP-UX server. +Please carefully review and test the changes. + + +: add an entry /etc/services for HP-UX so inetd will know which tcp port: +# to listen on. +check_mk 6556/tcp #check_mk nagios agent + + +: add check mk to inetd config : +# check_mk agent support for remote monitoring +# +check_mk stream tcp6 nowait root /usr/local/nagios/check_mk_agent check_mk_agent + + +: inetd security +# HP-UX does -by default- not use standard TCPWrappers and has a configuration +# differnt from standard /etc/hosts.allow /etc/hosts.deny +# +# The config file is optional and called /var/adm/inetd.sec +# It has the following syntax: +# +# service name { allow | deny } +# { hostaddrs | hostnames | netaddrs | netnames } +# +# please note that in standard setups even very critical services like +# MC/SG are using inetd for their communications. You should test changes +# to the TCP security carefully. +# (We noticed inetd got hung by a misconfiguration, causing cluster warnings. +# After getting everything right, it worked without issues. + +# to allow your nagios servers: + +# only allow nagios servers to access the check_mk agent +check_mk allow NAGIOS-SRV01 NAGIOS-SRV02 + +# reconfigure inetd to read in the changes. +inetd -c + + +# to verify configuration and / or check for issues, have a look at tcpdchk(1) +# http://nixdoc.net/man-pages/hp-ux/man1/tcpdchk.1.html +# but this might only work if you installed tcpwrappers, which is not commonple.

12 years, 12 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 415abf06300d280450119ca5aa61af3dda23e702 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=415abf06300d28… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Sep 12 09:55:37 2011 +0200 Add new bug entry --- .bugs/318 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/318 b/.bugs/318 new file mode 100644 index 0000000..40032b6 --- /dev/null +++ b/.bugs/318 @@ -0,0 +1,9 @@ +Title: smart.temp levels are off by one degree +Component: checks +Benefit: 3 +State: open +Cost: 2 +Date: 2011-09-12 09:53:17 +Class: bug + +The check does not give WARN crit states at the configured level but one at one degree less than the level

12 years, 12 months

Check_MK Git: check_mk: Added "Administration" snapin to default sidebar

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dfdd4bfe2bdd36a0b73a135495ecebfc4ef657c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfdd4bfe2bdd36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 15:40:16 2011 +0200 Added "Administration" snapin to default sidebar --- ChangeLog | 1 + web/htdocs/config.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e876a7..ad7c924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * Added some missing i18n strings in general HTML functions * Added display_option "w" to disable limit messages and livestatus errors in views * Service Perfdata Sorters are sorting correctly now + * Added "Administration" snapin to default sidebar WATO: * FIX: "bulk move to" at the top of wato hostlists works again diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 547b341..0994832 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -351,6 +351,7 @@ sidebar = \ ('wato', 'open'), ('views', 'open'), ('bookmarks', 'open'), + ('admin', 'open'), ('master_control', 'closed')] # _ _ _ _

12 years, 12 months

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: 88f066a68c07946cc3abe5aeffb759bff24fbc31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88f066a68c0794… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 15:40:19 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 12 months

Check_MK Git: check_mk: Write messages after initialization into an own livestatus.log

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfda5bd548d5b2188d25c9120311fe54cacd1920 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfda5bd548d5b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 9 15:30:16 2011 +0200 Write messages after initialization into an own livestatus.log --- ChangeLog | 3 ++ livestatus/src/logger.c | 60 ++++++++++++++++++++++++++++++----------- livestatus/src/logger.h | 6 ++-- livestatus/src/module.c | 69 ++++++++++++++++++++++++++++------------------- 4 files changed, 91 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4192dfb..6b94ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * Added display_option "w" to disable limit messages and livestatus errors in views * Service Perfdata Sorters are sorting correctly now + Livestatus: + * Write messages after initialization into an own livestatus.log + 1.1.11i4: Core, Setup, etc.: * FIX: use hostgroups instead of host_groups in Nagios configuration. diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 471370c..c422ae4 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -27,26 +27,54 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <time.h> +#include <pthread.h> -void logger(int priority, const char *loginfo, ...) +extern char g_logfile_path[]; +pthread_t g_mainthread_id; +FILE *g_logfile = 0; + +void open_logfile() +{ + g_logfile = fopen(g_logfile_path, "a"); + g_mainthread_id = pthread_self(); /* needed to determine main thread later */ + if (!g_logfile) + logger(LG_WARN, "Cannot open logfile %s: %s", g_logfile_path, strerror(errno)); +} + +void close_logfile() { - char buffer[8192]; - snprintf(buffer, 20, "livestatus: "); + if (g_logfile) + fclose(g_logfile); +} +void logger(int priority, const char *loginfo, ...) +{ va_list ap; va_start(ap, loginfo); - vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), loginfo, ap); - va_end(ap); - write_to_all_logs(buffer, priority); - - /* DEBUGING - FILE *x = fopen("/tmp/hirn.log", "a+"); - va_start(ap, loginfo); - vfprintf(x, loginfo, ap); - fputc('\n', x); - va_end(ap); - fclose(x); - */ -} + /* Only the main process may use the Nagios log methods */ + if (g_mainthread_id == pthread_self()) { + char buffer[8192]; + snprintf(buffer, 20, "livestatus: "); + vsnprintf(buffer + strlen(buffer), + sizeof(buffer) - strlen(buffer), loginfo, ap); + va_end(ap); + write_to_all_logs(buffer, priority); + } else { + if (g_logfile) { + /* write date/time */ + char timestring[64]; + time_t now_t = time(0); + struct tm now; localtime_r(&now_t, &now); + strftime(timestring, 64, "%F %T ", &now); fputs(timestring, g_logfile); + + /* write log message */ + vfprintf(g_logfile, loginfo, ap); + fputc('\n', g_logfile); + fflush(g_logfile); + va_end(ap); + } + } +} diff --git a/livestatus/src/logger.h b/livestatus/src/logger.h index 29ef47a..b80c65a 100644 --- a/livestatus/src/logger.h +++ b/livestatus/src/logger.h @@ -39,9 +39,9 @@ extern "C" { #endif - - - void logger(int priority, const char *loginfo, ...); +void logger(int priority, const char *loginfo, ...); +void open_logfile(); +void close_logfile(); #ifdef __cplusplus } diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 49a23e8..b28aa8a 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -63,36 +63,38 @@ #endif NEB_API_VERSION(CURRENT_NEB_API_VERSION) - extern int event_broker_options; +extern int event_broker_options; +extern char *log_file; - int g_idle_timeout_msec = 300 * 1000; /* maximum idle time for connection in keep alive state */ - int g_query_timeout_msec = 10 * 1000; /* maximum time for reading a query */ +int g_idle_timeout_msec = 300 * 1000; /* maximum idle time for connection in keep alive state */ +int g_query_timeout_msec = 10 * 1000; /* maximum time for reading a query */ - unsigned g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ - size_t g_thread_stack_size = 65536; /* stack size of threads */ +unsigned g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ +size_t g_thread_stack_size = 65536; /* stack size of threads */ #define false 0 #define true 1 - void *g_nagios_handle; - int g_unix_socket = -1; - int g_max_fd_ever = 0; - char g_socket_path[4096]; - char g_pnp_path[4096]; - int g_debug_level = 0; - int g_should_terminate = false; - pthread_t g_mainthread_id; - pthread_t *g_clientthread_id; - unsigned long g_max_cached_messages = 500000; - unsigned long g_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB - int g_thread_running = 0; - int g_thread_pid = 0; - int g_service_authorization = AUTH_LOOSE; - int g_group_authorization = AUTH_STRICT; - int g_data_encoding = ENCODING_UTF8; - - void* voidp; +void *g_nagios_handle; +int g_unix_socket = -1; +int g_max_fd_ever = 0; +char g_socket_path[4096]; +char g_pnp_path[4096]; +char g_logfile_path[4096]; +int g_debug_level = 0; +int g_should_terminate = false; +pthread_t g_mainthread_id; +pthread_t *g_clientthread_id; +unsigned long g_max_cached_messages = 500000; +unsigned long g_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB +int g_thread_running = 0; +int g_thread_pid = 0; +int g_service_authorization = AUTH_LOOSE; +int g_group_authorization = AUTH_STRICT; +int g_data_encoding = ENCODING_UTF8; + +void* voidp; void livestatus_count_fork() { @@ -193,7 +195,6 @@ void *client_thread(void *data __attribute__ ((__unused__))) void start_threads() { - logger(LG_INFO, "Going to open socket and starting threads"); if (!g_thread_running) { /* start thread that listens on socket */ pthread_atfork(livestatus_count_fork, NULL, livestatus_cleanup_after_fork); @@ -511,7 +512,15 @@ void check_pnp_path() void livestatus_parse_arguments(const char *args_orig) { /* set default socket path */ - strncpy(g_socket_path, DEFAULT_SOCKET_PATH, sizeof(g_socket_path) - 1); + strncpy(g_socket_path, DEFAULT_SOCKET_PATH, sizeof(g_socket_path)); + + /* set default path to our logfile to be in the same path as nagios.log */ + strncpy(g_logfile_path, log_file, sizeof(g_logfile_path) - 16 /* len of "livestatus.log" */); + char *slash = strrchr(g_logfile_path, '/'); + if (!slash) + strcpy(g_logfile_path, "/tmp/livestatus.log"); + else + strcpy(slash + 1, "livestatus.log"); /* there is no default PNP path */ g_pnp_path[0] = 0; @@ -528,13 +537,16 @@ void livestatus_parse_arguments(const char *args_orig) char *left = next_token(&part, '='); char *right = next_token(&part, 0); if (!right) { - strncpy(g_socket_path, left, sizeof(g_socket_path) - 1); + strncpy(g_socket_path, left, sizeof(g_socket_path)); } else { if (!strcmp(left, "debug")) { g_debug_level = atoi(right); logger(LG_INFO, "Setting debug level to %d", g_debug_level); } + else if (!strcmp(left, "log_file")) { + strncpy(g_logfile_path, right, sizeof(g_logfile_path)); + } else if (!strcmp(left, "max_cached_messages")) { g_max_cached_messages = strtoul(right, 0, 10); logger(LG_INFO, "Setting max number of cached log messages to %lu", g_max_cached_messages); @@ -643,6 +655,7 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han { g_nagios_handle = handle; livestatus_parse_arguments(args); + open_logfile(); logger(LG_INFO, "Livestatus %s by Mathias Kettner. Socket: '%s'", VERSION, g_socket_path); logger(LG_INFO, "Please visit us at http://mathias-kettner.de/"); @@ -669,8 +682,7 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han thread the first time one of our callbacks is called. Before that happens, we haven't got any data anyway... */ - if (g_debug_level > 0) - logger(LG_INFO, "successfully finished initialization"); + logger(LG_INFO, "Finished initialization. Further log messages go to %s", g_logfile_path); return 0; } @@ -682,6 +694,7 @@ int nebmodule_deinit(int flags __attribute__ ((__unused__)), int reason __attrib close_unix_socket(); store_deinit(); deregister_callbacks(); + close_logfile(); return 0; }

12 years, 12 months

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: ba309b4080f50ad8fa7450f441be93cdd71dd2d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba309b4080f50a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 9 15:30:43 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 12 months

Check_MK Git: check_mk: FIX: IE<9: Fixed problem with checkbox events when editing a host

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ce79c93020b94f84b37f7585512b46a37515e9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ce79c93020b94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 10:11:50 2011 +0200 FIX: IE<9: Fixed problem with checkbox events when editing a host --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 ++++--- web/htdocs/wato.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97eda78..6e876a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ WATO: * FIX: "bulk move to" at the top of wato hostlists works again + * FIX: IE<9: Fixed problem with checkbox events when editing a host 1.1.11i4: Core, Setup, etc.: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index db65988..d62e86d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -384,7 +384,7 @@ class html: (varname, value, checked_text, text)) self.form_vars.append(varname) - def checkbox(self, varname, deflt="", cssclass = '', onchange=None): + def checkbox(self, varname, deflt="", cssclass = '', onclick = None): error = self.user_errors.get(varname) if error: html = "<x class=inputerror>" @@ -404,8 +404,9 @@ class html: checked = "" if cssclass: cssclass = ' class="%s"' % cssclass - onchange_code = onchange and " onchange=\"%s\"" % (onchange) or "" - self.write("<input type=checkbox name=\"%s\"%s%s%s>" % (varname, checked, cssclass, onchange_code)) + onclick_code = onclick and " onclick=\"%s\"" % (onclick) or "" + self.write("<input type=checkbox name=\"%s\"%s%s%s>" % + (varname, checked, cssclass, onclick_code)) self.form_vars.append(varname) if error: html += "</x>" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f14a742..93536bc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3192,7 +3192,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute html.hidden_field(checkbox_name, "on") else: html.checkbox(checkbox_name, active, - onchange="wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique + onclick = "wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique html.write("</td>") # Now comes the input fields and the inherited / default values

12 years, 12 months

Check_MK Git: check_mk: Handling special refesh display_options correctly internal

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 018533c89747be57362d64f3089870d17ffcfcbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018533c89747be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 09:54:58 2011 +0200 Handling special refesh display_options correctly internal --- web/htdocs/views.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7147b0f..8e54353 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1098,9 +1098,10 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if html.has_var('_display_options'): display_options = html.var("_display_options", "") display_options = apply_display_option_defaults(display_options) + html.display_options = display_options # Below we have the following display_options vars: - # htmk.display_options - Use this when rendering the current view + # html.display_options - Use this when rendering the current view # html.var("display_options") - Use this for linking to other views # If display option 'M' is set, then all links are targetet to the 'main'

12 years, 12 months

Check_MK Git: check_mk: Also suppressing warning messages during page reloads when set via display options

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fb8a9a4886721bd89b174516e3bba8e0ad2b24f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb8a9a4886721… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 9 09:45:22 2011 +0200 Also suppressing warning messages during page reloads when set via display options --- web/htdocs/js/check_mk.js | 2 +- web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 76d2fb6..0439168 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -713,7 +713,7 @@ function handleReload(url) { } else { // Enforce specific display_options to get only the content data var display_options = getUrlParam('display_options'); - var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r' ]; + var opts = [ 'h', 't', 'b', 'f', 'c', 'o', 'd', 'e', 'r', 'w' ]; for(var i = 0; i < opts.length; i++) { if(display_options.indexOf(opts[i].toUpperCase()) > -1) display_options = display_options.replace(opts[i].toUpperCase(), opts[i]); diff --git a/web/htdocs/views.py b/web/htdocs/views.py index abf7518..7147b0f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1675,7 +1675,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l html.live.set_prepend_site(True) if limit != None: html.live.set_limit(limit + 1) # + 1: We need to know, if limit is exceeded - if config.debug and html.output_format == "html": + if config.debug and html.output_format == "html" and 'W' in html.display_options: html.write("<div class=message><tt>%s</tt></div>\n" % (query.replace('\n', '<br>\n'))) if only_sites:

12 years, 12 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011