Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

Check_MK Git: check_mk: FIX: close inherited unused filedescriptors after fork()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05a9ffb48aea11996c4682d26b3aa296ce572d4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05a9ffb48aea11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 11:47:31 2012 +0200 FIX: close inherited unused filedescriptors after fork() --- ChangeLog | 1 + livestatus/src/livechecking.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9741e98..29fad82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * FIX: added /0 termination to strings * FIX: changed check_type to be always active (0) * FIX: fix bug in assignment of livecheck helpers + * FIX: close inherited unused filedescriptors after fork() Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index a1e7023..1acd9e5 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -66,6 +66,13 @@ void start_livecheck_helper(struct live_helper *lh) dup2(fd[1], 1); dup2(fd[1], 2); close(fd[0]); + + // close all other inherited filedescriptiors + unsigned i; + for (i=3; i<1024; i++) { + close(i); + } + char ht[32]; snprintf(ht, sizeof(ht), "%u", host_check_timeout); char st[32];

11 years, 11 months

Check_MK Git: check_mk: livecheck: internal code cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b523dece2e796176078838da6e6e947cfc829379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b523dece2e7961… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 11:32:19 2012 +0200 livecheck: internal code cleanup --- livestatus/src/livechecking.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index 60ac1cb..2441613 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -43,7 +43,7 @@ extern int service_check_timeout; int g_num_livehelpers = 20; int g_livecheck_enabled = 0; -#define LH_WAITING 0 +#define LH_BUSY 0 #define LH_READY 1 #define LH_DEAD 2 @@ -89,7 +89,7 @@ void start_livecheck_helper(struct live_helper *lh) lh->pid = pid; lh->sock = fd[0]; lh->fsock = fdopen(fd[0], "r+"); - lh->status = LH_WAITING; // wait until helper sends "ready" byte. + lh->status = LH_BUSY; // wait until helper sends "ready" byte. } void terminate_livecheck_helper(struct live_helper *lh) { @@ -153,7 +153,7 @@ struct live_helper *get_free_live_helper() unsigned i; for (i=0; i<g_num_livehelpers; i++) { if (g_live_helpers[i].status == LH_READY) { - g_live_helpers[i].status = LH_WAITING; + g_live_helpers[i].status = LH_BUSY; return &g_live_helpers[i]; } } @@ -165,7 +165,7 @@ struct live_helper *get_free_live_helper() FD_ZERO(&fds); int max_fd = 0; for (i=0; i<g_num_livehelpers; i++) { - if (g_live_helpers[i].status != LH_WAITING) { + if (g_live_helpers[i].status != LH_BUSY) { continue; } if (g_live_helpers[i].status != LH_DEAD) {

11 years, 11 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: 1b56f34b5d0e7efed0ea8518929c12f56342c8f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b56f34b5d0e7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 11:38:53 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 11 months

Check_MK Git: check_mk: FIX: fix bug in assignment of livecheck helpers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 218598e26e2504d4d3297b4f12ec3b2831cb5f26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=218598e26e2504… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 11:36:20 2012 +0200 FIX: fix bug in assignment of livecheck helpers Conflicts: ChangeLog --- ChangeLog | 6 ++++++ livestatus/src/livechecking.c | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 710c8ea..9741e98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,12 @@ Livestatus * FIX: comments_with_info in service table was always empty + + Livecheck + * FIX: fixed problem with long plugin output + * FIX: added /0 termination to strings + * FIX: changed check_type to be always active (0) + * FIX: fix bug in assignment of livecheck helpers Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index 2441613..a1e7023 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -168,33 +168,34 @@ struct live_helper *get_free_live_helper() if (g_live_helpers[i].status != LH_BUSY) { continue; } - if (g_live_helpers[i].status != LH_DEAD) { - int fd = g_live_helpers[i].sock; - FD_SET(fd, &fds); - if (fd >= max_fd) - max_fd = fd; - } + int fd = g_live_helpers[i].sock; + FD_SET(fd, &fds); + if (fd >= max_fd) + max_fd = fd; } struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; int r = select(max_fd + 1, &fds, 0, 0, &tv); + + // No filedescriptor readable -> all livecheck helpers are busy! if (r == 0) return 0; struct live_helper *free_helper = 0; for (i=0; i<g_num_livehelpers; i++) { if (FD_ISSET(g_live_helpers[i].sock, &fds)) - if (g_live_helpers[i].status == LH_DEAD) { - logger(LG_INFO, "ARGL: dead livehelper found by select()!"); - return 0; - } g_live_helpers[i].status = LH_READY; - free_helper = &g_live_helpers[i]; + free_helper = &g_live_helpers[i]; // could be a candidate } + + // use last found free helper. Do not forget to set this to BUSY! + // (this was a bug in previous versions) + free_helper->status = LH_BUSY; return free_helper; } + int broker_host_livecheck(int event_type __attribute__ ((__unused__)), void *data) { nebstruct_host_check_data *hstdata = (nebstruct_host_check_data *)data;

11 years, 11 months

Check_MK Git: check_mk: livecheck:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2fcf191c353492095f8f718074107a7e96a00b26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fcf191c353492… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 17 18:22:11 2012 +0200 livecheck: FIX: fixed problem with long plugin output FIX: added /0 termination to strings FIX: changed check_type to be always active (0) --- ChangeLog | 5 +++++ livestatus/src/livecheck.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 710c8ea..d63b008 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,11 @@ Livestatus * FIX: comments_with_info in service table was always empty + + Livecheck + * FIX: fixed problem with long plugin output + * FIX: added /0 termination to strings + * FIX: changed check_type to be always active (0) Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 958fbf3..ff3f369 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -150,7 +150,17 @@ int main(int argc, char **argv) if (timeout) alarm(timeout); - int bytes_read = read(fd[0], output, sizeof(output)); + + int bytes_read = 0; + char *ptr_output = output; + const char *ptr_end = output + sizeof(output) - 1; + while ((bytes_read = read(fd[0], ptr_output, ptr_end - ptr_output)) != 0) { + ptr_output += bytes_read; + if (ptr_output == ptr_end) + break; + } + *ptr_output = 0; + close(fd[0]); int ret; waitpid(pid, &ret, 0); @@ -170,7 +180,7 @@ int main(int argc, char **argv) } else { return_code = WEXITSTATUS(ret); - if (0 == bytes_read || output[0] == '\n') + if (*output == 0 || *output == '\n') snprintf(output, sizeof(output), "(No output returned from plugin)\n"); } } @@ -195,16 +205,31 @@ int main(int argc, char **argv) "start_time=%d.%03u\n" "finish_time=%d.%03u\n" "return_code=%d\n" - "output=%s\n", + "output=", getpid(), - is_host_check ? 0 : 1, + 0, latency, (int)start.time, start.millitm, (int)end.time, end.millitm, - return_code, - output); + return_code); + + char *ptr_output = output; + char *ptr_walk = output; + while (*ptr_walk != 0) { + if (*ptr_walk == '\n') { + *ptr_walk = 0; + fputs(ptr_output, checkfile); + fputs("\\n", checkfile); + ptr_output = ptr_walk + 1; + if (*ptr_output == 0) + break; + } + ptr_walk++; + } + fputs("\n", checkfile); + fchown(fd, real_uid, real_gid); fclose(checkfile); strcat(template, ".ok");

11 years, 11 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: 103f98b0605a73df739b28b63047a40bf54a49c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=103f98b0605a73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 17 14:32:17 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: doc/treasures: added script for printing RRD statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a635714f39f9a4f027438117b5f018bfe3d5208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a635714f39f9a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 17 14:32:01 2012 +0200 doc/treasures: added script for printing RRD statistics --- ChangeLog | 1 + doc/treasures/get_rrd_cache_stats | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6daced3..710c8ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * Improved validation of inventory data reported by checks * Added -d option to precompiled checks to enable debug mode + * doc/treasures: added script for printing RRD statistics Event Console: * Moved source of Event Console into Check_MK project diff --git a/doc/treasures/get_rrd_cache_stats b/doc/treasures/get_rrd_cache_stats new file mode 100755 index 0000000..b03e2ef --- /dev/null +++ b/doc/treasures/get_rrd_cache_stats @@ -0,0 +1,28 @@ +#!/usr/bin/env python +# +# Run this script within a (started) OMD site in order to +# retrieve cache statistics of the RRD cache. + +import socket,os,sys + +try: + omdhome = os.environ['OMD_ROOT'] + + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(omdhome + "/tmp/run/rrdcached.sock") + s.send('STATS\n') + data = s.recv(1024) + s.close() + + lines = data.splitlines()[1:] + stats = {} + for line in lines: + key, value = line.split(" ", 1) + stats[key[:len(key)-1]] = int(value) + + for key, value in stats.items(): + print "%-15s :%15d" %(key, value) + +except: + sys.stderr.write("Unable to retrieve statistics.\n") + sys.exit(1)

11 years, 11 months

Check_MK Git: check_mk: doc/treasures: added script for printing RRD statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68d126499067daa89eced6ef2c0f7db9ac1c7189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68d126499067da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 17 14:32:01 2012 +0200 doc/treasures: added script for printing RRD statistics --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6daced3..710c8ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * Improved validation of inventory data reported by checks * Added -d option to precompiled checks to enable debug mode + * doc/treasures: added script for printing RRD statistics Event Console: * Moved source of Event Console into Check_MK project

11 years, 11 months

Check_MK Git: check_mk: Try to avoid compile problems of livecheck with diet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35563d68726efa88023e20b5af635f80f956a1db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35563d68726efa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 17 14:23:30 2012 +0200 Try to avoid compile problems of livecheck with diet --- agents/waitmax | Bin 9956 -> 13216 bytes livestatus/src/Makefile.am | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/waitmax b/agents/waitmax index cb77121..f3b0788 100755 Binary files a/agents/waitmax and b/agents/waitmax differ diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index f0cb6a9..b498b67 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -54,7 +54,7 @@ livestatus_so_SOURCES = \ livecheck$(EXEEXT): livecheck.c strutil.cc check_icmp.c if HAVE_DIET - diet -v $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ + diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ else $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ endif

11 years, 11 months

Check_MK Git: check_mk: FIX: fix inheritation of contactgroups from folder to hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e63fa372b0d8561f542c6ffbf9408ca41774b8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e63fa372b0d85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 17 13:41:30 2012 +0200 FIX: fix inheritation of contactgroups from folder to hosts --- ChangeLog | 1 + web/htdocs/wato.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ad9b44..6daced3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * FIX: Removed focus of "Full name" attribute on editing a contact * FIX: fix layout bug in ValueSpec ListOfStrings (e.g. used in list of explicit host/services in rules) + * FIX: fix inheritation of contactgroups from folder to hosts BI: * FIX: Correct representation of (!), (!!) and (?) markers in check output diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a25c98..a64a224 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -747,8 +747,10 @@ def save_hosts(folder = None): # If the contact groups of the host are set to be used for the monitoring, # we create an according rule for the folder and an according rule for # each host that has an explicit setting for that attribute. - use, cgs = effective.get("contactgroups", (False, [])) + effective_folder_attributes = effective_attributes(None, folder) + use, cgs = effective_folder_attributes.get("contactgroups", (False, [])) if use and cgs: + html.debug(effective_folder_attributes) out.write("\nhost_contactgroups.append(\n" " ( %r, [ '/' + FOLDER_PATH + '/' ], ALL_HOSTS ))\n" % cgs)

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits