Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: Livecheck: drop root priviledges

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57cda41a66bdd7c90d465ed861ff33a55f9beaec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57cda41a66bdd7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 12 14:55:26 2011 +0100 Livecheck: drop root priviledges After start, if we run setuid root, we create an icmp socket and drop priviledges. Later we use inline check_icmp only if the socket had been created. That way the user can decide whether to use inline check_icmp by setting suid root or not. --- livestatus/src/check_icmp.c | 135 +++---------------------------------------- livestatus/src/livecheck.c | 13 ++++- 2 files changed, 20 insertions(+), 128 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57cda41a66…

12 years, 7 months

Check_MK Git: check_mk: Livecheck: fix compiling with diet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d6fced88137ef35c9857574cfa85e973a6aa26e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d6fced88137ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 13 20:27:55 2011 +0100 Livecheck: fix compiling with diet --- livestatus/.f12 | 5 +- livestatus/configure.ac | 2 +- livestatus/src/Makefile.am | 10 +- livestatus/src/check_icmp.c | 600 ++++++++++++++++++----------------------- livestatus/src/livecheck.c | 8 +- livestatus/src/livechecking.c | 3 +- 6 files changed, 282 insertions(+), 346 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d6fced881…

12 years, 7 months

Check_MK Git: check_mk: Livecheck: optimize stack size

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d8672458f9021c24ee430d8e35cc4b59c909cb2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8672458f9021c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 13 20:52:23 2011 +0100 Livecheck: optimize stack size --- livestatus/src/check_icmp.c | 2 +- livestatus/src/livecheck.c | 7 +++++++ livestatus/src/livechecking.c | 7 +++++++ modules/check_mk_base.py | 4 ++++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/livestatus/src/check_icmp.c b/livestatus/src/check_icmp.c index b5ee572..fd29a7c 100644 --- a/livestatus/src/check_icmp.c +++ b/livestatus/src/check_icmp.c @@ -808,7 +808,7 @@ finish(int sig) if(hosts_ok >= min_hosts_alive) status = STATE_OK; else if((hosts_ok + hosts_warn) >= min_hosts_alive) status = STATE_WARNING; } - do_output(0, "%s -- ", status_string[status]); + do_output(0, "%s - ", status_string[status]); host = list; while(host) { diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 89131c8..693c539 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -112,6 +112,13 @@ int main(int argc, char **argv) int f = open("/dev/null", O_RDONLY); dup2(f, 0); + // Allow for larger stack size + struct rlimit rl; + getrlimit(RLIMIT_STACK, &rl); + rl.rlim_cur = 32 * 1024 * 1024; + rl.rlim_max = 32 * 1024 * 1024; + setrlimit(RLIMIT_STACK, &rl); + // Optimization(2): // if Command begins / and command line does not // contain any ', /, < or >, split by spaces and diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index b706cdf..534132c 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <errno.h> +#include <sys/resource.h> #include "nagios.h" #include "logger.h" @@ -182,6 +183,12 @@ void init_livecheck() snprintf(ht, sizeof(ht), "%u", host_check_timeout); char st[32]; snprintf(st, sizeof(st), "%u", service_check_timeout); + // reduce stack size in order to save memory + struct rlimit rl; + getrlimit(RLIMIT_STACK, &rl); + logger(LG_INFO, "Stacksize is %d", rl.rlim_cur); + rl.rlim_cur = 32768; + setrlimit(RLIMIT_STACK, &rl); execl(g_livecheck_path, "livecheck", check_result_path, ht, st, (char *)0); logger(LG_INFO, "ERROR: Cannot start livecheck helper: %s", strerror(errno)); exit(1); diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 92a2646..a7a1765 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -673,6 +673,10 @@ def save_counters(hostname): # This is the main check function - the central entry point to all and # everything def do_check(hostname, ipaddress): +# HIRN + import time + time.sleep(30) + if opt_verbose: sys.stderr.write("Check_mk version %s\n" % check_mk_version)

12 years, 7 months

Check_MK Git: check_mk: Integrate ICMP checking into livecheck

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84aaa8b64b0d877f135cb86b301c4a68c15fbd84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84aaa8b64b0d87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 12 13:27:24 2011 +0100 Integrate ICMP checking into livecheck --- livestatus/.f12 | 3 +- livestatus/src/Makefile.am | 15 +- livestatus/src/check_icmp.c | 1282 +++++++++++++++++++++++++++++++++++++++++++ livestatus/src/livecheck.c | 221 ++++---- 4 files changed, 1413 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=84aaa8b64b…

12 years, 7 months

Check_MK Git: check_mk: Added missing files

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f583c3aa2328d0d67f511730650d47e091c76fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f583c3aa2328d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 11 15:36:36 2011 +0100 Added missing files --- web/htdocs/images/sidebar_logout_hi.png | Bin 0 -> 825 bytes web/htdocs/images/sidebar_logout_lo.png | Bin 0 -> 885 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/sidebar_logout_hi.png b/web/htdocs/images/sidebar_logout_hi.png new file mode 100644 index 0000000..7a78431 Binary files /dev/null and b/web/htdocs/images/sidebar_logout_hi.png differ diff --git a/web/htdocs/images/sidebar_logout_lo.png b/web/htdocs/images/sidebar_logout_lo.png new file mode 100644 index 0000000..60fc590 Binary files /dev/null and b/web/htdocs/images/sidebar_logout_lo.png differ

12 years, 7 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: 95db0e07898554b794085a67d5cebe2baf1fce1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95db0e07898554… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 11 15:33:38 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

12 years, 7 months

Check_MK Git: check_mk: Implemented logout functionality in OMD environments

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff1d13b3d6252ae8e2e61273558c061a14e552d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff1d13b3d6252a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 11 15:31:39 2011 +0100 Implemented logout functionality in OMD environments --- ChangeLog | 1 + web/htdocs/check_mk.css | 29 +++++++++++++++++++++++++---- web/htdocs/sidebar.py | 7 +++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 661397c..346535d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ Multisite: * New nifty sidebar snapin "Speed-O-Meter" + * Implemented logout functionality in OMD environments * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index f7891a6..a13539b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -247,17 +247,24 @@ body.side { background-image: url("images/sidebar_bottom.png"); } -#side_footer div.button { - width: 75px; +#side_footer ul.buttons { height: 20px; z-index: 20; position: absolute; top: 10px; left: 15px; + margin: 0; + padding: 0; +} + +#side_footer ul.buttons li { + list-style-type: none; float: left; + display: inline; + margin-left: none; } -#side_footer div.button a { +#side_footer ul.buttons a { width: 75px; height: 17px; display: block; @@ -271,10 +278,24 @@ body.side { margin: 0; } -#side_footer div.button a:hover { +#side_footer ul.buttons a:hover { background-image: url("images/sidebar_button_hi.png"); } +#side_footer ul.buttons a.logout { + width: 20px; + margin-left: 15px; + background-image: url("images/sidebar_logout_lo.png"); +} + +#side_footer ul.buttons a.logout:hover { + background-image: url("images/sidebar_logout_hi.png"); +} + +#side_footer div.buttons a { + float: left; +} + #side_footer div.copyright { color: #fff; position: relative; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 37e463c..c3958d7 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -124,9 +124,12 @@ def sidebar_head(): def sidebar_foot(): html.write('<div id="side_footer">') + html.write('<ul class=buttons>\n') if config.may("configure_sidebar"): - html.write('<div class=button>\n') - html.write('<a target="main" href="sidebar_add_snapin.py">Add snapin</a></div>') + html.write('<li><a target="main" href="sidebar_add_snapin.py">Add snapin</a></li>') + if html.omd_mode != (None, None): + html.write('<li><a class=logout target="_top" href="../omd/logout.php" title="%s"></a></li>' % _('Logout')) + html.write('</ul>') html.write("<div class=copyright>© <a target=\"main\" href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>\n") html.write('</div>')

12 years, 7 months

Check_MK Git: check_mk: Livecheck: handle service timeout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d65bae87d9fd8e8f6b02e09d19d08a20a84b03e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d65bae87d9fd8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 14:37:21 2011 +0100 Livecheck: handle service timeout --- livestatus/src/livecheck.c | 73 +++++++++++++++++++++++++++++++++++------ livestatus/src/livechecking.c | 8 ++++- 2 files changed, 70 insertions(+), 11 deletions(-) diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 40ad282..1a95574 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -32,9 +32,20 @@ #include "strutil.h" +pid_t g_pid; +void alarm_handler(int); +void term_handler(int); + +// This program must be called with two arguments: +// 1. Path to check result directory +// 2. timeout for host checks +// 3. timeout for service checks int main(int argc, char **argv) { char *check_result_path = argv[1]; + int host_check_timeout = atoi(argv[2]); + int service_check_timeout = atoi(argv[3]); + char host[256]; char service[512]; char latency[16]; @@ -42,6 +53,11 @@ int main(int argc, char **argv) int pid; int check_result; + signal(SIGALRM, alarm_handler); // handler for check timeout + signal(SIGINT, term_handler); + signal(SIGQUIT, term_handler); + signal(SIGTERM, term_handler); + while (1) { write(1, "*", 1); // Signal Nagios that we are finished if (NULL == fgets(host, sizeof(host), stdin) @@ -51,6 +67,8 @@ int main(int argc, char **argv) { exit(0); } + + int is_host_check = service[0] == '\n'; int fd[2]; pipe(fd); @@ -76,6 +94,7 @@ int main(int argc, char **argv) && NULL == strchr(command, '\'') && NULL == strchr(command, '>') && NULL == strchr(command, '<') + && NULL == strchr(command, ';') && NULL == strchr(command, '|')) { char *c = command; @@ -99,19 +118,36 @@ int main(int argc, char **argv) } else { - char output[1024]; + g_pid = pid; + unsigned timeout = is_host_check ? host_check_timeout : service_check_timeout; + if (timeout) + alarm(timeout); + + char output[8192]; int bytes_read = read(fd[0], output, sizeof(output)); int ret; waitpid(pid, &ret, 0); - int return_code; + g_pid = 0; + alarm(0); // cancel timeout - if (WIFEXITED(ret)) - return_code = WEXITSTATUS(ret); + int return_code; + if (WIFSIGNALED(ret)) { + int signum = WTERMSIG(ret); + if (signum == SIGKILL) { + snprintf(output, sizeof(output), "(Check Timed Out After %d Seconds)\n", timeout); + return_code = 3; + } + else { + snprintf(output, sizeof(output), "(Check Plugin Died With Signal %d)\n", signum); + return_code = 3; + } + } else { - if (0 == bytes_read) - sprintf(output, "Error executing %s\n", command); - return_code = 3; + return_code = WEXITSTATUS(ret); + if (0 == bytes_read || output[0] == '\n') + snprintf(output, sizeof(output), "(No output returned from plugin)\n"); } + struct timeb end; ftime(&end); char template[256]; @@ -119,7 +155,7 @@ int main(int argc, char **argv) char *foo = mktemp(template); FILE *checkfile = fopen(template, "w"); fprintf(checkfile, "host_name=%s", host); - if (service[0] != '\n') + if (!is_host_check) fprintf(checkfile, "service_description=%s", service); fprintf(checkfile, "check_type=%d\n" @@ -130,8 +166,8 @@ int main(int argc, char **argv) "start_time=%d.%03u\n" "finish_time=%d.%03u\n" "return_code=%d\n" - "output=%s\n", - service[0] == '\n' ? 0 : 1, + "output=CL: %s\n", + is_host_check ? 0 : 1, latency, (int)start.time, start.millitm, @@ -145,3 +181,20 @@ int main(int argc, char **argv) } } } + +// Propagate signal to child, if we are killed +void term_handler(int signum) +{ + if (g_pid) { + kill(g_pid, signum); + } + exit(0); +} + +// handle check timeout +void alarm_handler(int signum) +{ + if (g_pid) { + kill(g_pid, SIGKILL); + } +} diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index b5a1a59..8a348a0 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -34,6 +34,8 @@ extern int g_debug_level; extern int currently_running_host_checks; extern int currently_running_service_checks; extern char *check_result_path; +extern int host_check_timeout; +extern int service_check_timeout; int g_num_livehelpers = 20; int g_livecheck_enabled = 0; @@ -175,7 +177,11 @@ void init_livecheck() dup2(fd[1], 1); dup2(fd[1], 2); close(fd[0]); - execl("/omd/versions/default/lib/livecheck", "livecheck", check_result_path, (char *)0); + char ht[32]; + snprintf(ht, sizeof(ht), "%u", host_check_timeout); + char st[32]; + snprintf(st, sizeof(st), "%u", service_check_timeout); + execl("/omd/versions/default/lib/livecheck", "livecheck", check_result_path, ht, st, (char *)0); logger(LG_INFO, "ERROR: Cannot start livecheck helper: %s", strerror(errno)); exit(1); }

12 years, 7 months

Check_MK Git: check_mk: Livestatus: experimental livecheck

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41d04319c98da26ddab6afeee8a905588c38d236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41d04319c98da2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 12:29:40 2011 +0100 Livestatus: experimental livecheck --- ChangeLog | 6 + livestatus/.f12 | 1 + livestatus/src/.gitignore | 1 + livestatus/src/Makefile.am | 9 ++- livestatus/src/livecheck.c | 144 +++++++++++++++++++++++++++++ livestatus/src/livechecking.c | 205 +++++++++++++++++++++++++++++++++++++++++ livestatus/src/livechecking.h | 37 ++++++++ livestatus/src/module.c | 32 ++++++- livestatus/src/nagios.h | 1 + 9 files changed, 433 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=41d04319c9…

12 years, 7 months

Check_MK Git: check_mk: livecheck: install, compile without diet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6ac0442018758a2fc79676bf784f333cc3d4a49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6ac0442018758… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 13:41:35 2011 +0100 livecheck: install, compile without diet --- livestatus/src/Makefile.am | 7 ++++++- livestatus/src/livecheck.c | 13 ++++++++----- livestatus/src/strutil.cc | 2 +- scripts/setup.sh | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 6ee10cf..d44d961 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -52,7 +52,12 @@ livestatus_so_SOURCES = \ ContactgroupsColumn.cc opids.cc auth.cc livechecking.c livecheck: livecheck.c strutil.cc - diet gcc -I.. -s -o $@ $^ + @if type diet >/dev/null 2>&1 ; then \ + echo "You have no dietlibc install. We won't be able to create a static binary." ; \ + diet $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \ + else \ + $(CC) $(CFLAGS) -I.. -s -o $@ $^ ; \ + fi livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 9d79dfd..40ad282 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -28,6 +28,8 @@ #include <sys/timeb.h> #include <stdlib.h> #include <fcntl.h> +#include <string.h> + #include "strutil.h" int main(int argc, char **argv) @@ -42,12 +44,13 @@ int main(int argc, char **argv) while (1) { write(1, "*", 1); // Signal Nagios that we are finished - if (NULL == fgets(host, sizeof(host), stdin)) { + if (NULL == fgets(host, sizeof(host), stdin) + || NULL == fgets(service, sizeof(service), stdin) + || NULL == fgets(latency, sizeof(latency), stdin) + || NULL == fgets(command, sizeof(command), stdin)) + { exit(0); } - fgets(service, sizeof(service), stdin); - fgets(latency, sizeof(latency), stdin); - fgets(command, sizeof(command), stdin); int fd[2]; pipe(fd); @@ -113,7 +116,7 @@ int main(int argc, char **argv) ftime(&end); char template[256]; snprintf(template, sizeof(template), "%s/cXXXXXX", check_result_path); - mktemp(template); + char *foo = mktemp(template); FILE *checkfile = fopen(template, "w"); fprintf(checkfile, "host_name=%s", host); if (service[0] != '\n') diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index feceb37..24cada2 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -93,7 +93,7 @@ char *save_next_token(char **c, char delim) { char *result = next_token(c, delim); if (result == 0) - return ""; + return (char *)""; else return result; } diff --git a/scripts/setup.sh b/scripts/setup.sh index 6e9215a..52ee58d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -556,7 +556,7 @@ EOF make -j 8 2>&1 && strip src/livestatus.o && mkdir -p $DESTDIR$libdir && - install -m 755 src/livestatus.o $DESTDIR$libdir/livestatus.o && + install -m 755 src/livecheck src/livestatus.o $DESTDIR$libdir/livestatus.o && mkdir -p $DESTDIR$bindir && install -m 755 src/unixcat $DESTDIR$bindir && popd

12 years, 7 months

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