Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Sven Panne

Module: check_mk Branch: master Commit: c3c6c71c04f9b13cb61b17ef0787564f083f99c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c6c71c04f9b1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:33:35 2015 +0100 Restrict visibility. --- agents/waitmax.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index 54d71be..cb861bd 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -31,7 +31,7 @@ #include <sys/wait.h> #include <unistd.h> -void out(const char *buf) +static void out(const char *buf) { size_t bytes_to_write = strlen(buf); while (bytes_to_write > 0) { @@ -45,16 +45,16 @@ void out(const char *buf) } } -int g_pid; -int g_timeout = 0; -int g_signum = 15; +static int g_pid; +static int g_timeout = 0; +static int g_signum = 15; -struct option long_options[] = {{"version", no_argument, 0, 'V'}, - {"help", no_argument, 0, 'h'}, - {"signal", required_argument, 0, 's'}, - {0, 0, 0, 0}}; +static struct option long_options[] = {{"version", no_argument, 0, 'V'}, + {"help", no_argument, 0, 'h'}, + {"signal", required_argument, 0, 's'}, + {0, 0, 0, 0}}; -void version() +static void version() { out( "waitmax version 1.1\n" @@ -66,7 +66,7 @@ void version() exit(0); } -void usage() +static void usage() { out( "Usage: waitmax [-s SIGNUM] MAXTIME PROGRAM [ARGS...]\n" @@ -81,7 +81,7 @@ void usage() exit(1); } -void signalhandler(int signum __attribute__((__unused__))) +static void signalhandler(int signum __attribute__((__unused__))) { if (kill(g_pid, g_signum) == 0) g_timeout = 1; }

8 years, 7 months

Reordered stuff.

by Sven Panne

Module: check_mk Branch: master Commit: 14d6b648893ccc6bd0bc735786ec2f30e36ea0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d6b648893ccc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:34:54 2015 +0100 Reordered stuff. --- agents/waitmax.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index cb861bd..9d14f84 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -31,6 +31,10 @@ #include <sys/wait.h> #include <unistd.h> +static int g_pid; +static int g_timeout = 0; +static int g_signum = 15; + static void out(const char *buf) { size_t bytes_to_write = strlen(buf); @@ -45,15 +49,6 @@ static void out(const char *buf) } } -static int g_pid; -static int g_timeout = 0; -static int g_signum = 15; - -static struct option long_options[] = {{"version", no_argument, 0, 'V'}, - {"help", no_argument, 0, 'h'}, - {"signal", required_argument, 0, 's'}, - {0, 0, 0, 0}}; - static void version() { out( @@ -86,6 +81,11 @@ static void signalhandler(int signum __attribute__((__unused__))) if (kill(g_pid, g_signum) == 0) g_timeout = 1; } +static struct option long_options[] = {{"version", no_argument, 0, 'V'}, + {"help", no_argument, 0, 'h'}, + {"signal", required_argument, 0, 's'}, + {0, 0, 0, 0}}; + int main(int argc, char **argv) { int indexptr = 0;

8 years, 7 months

Setup signal handlers in a way that we can forward signals for ourselves.

by Sven Panne

Module: check_mk Branch: master Commit: dfa3c0d685cdb308a92e797e0b7d260b21c55001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfa3c0d685cdb3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:47:00 2015 +0100 Setup signal handlers in a way that we can forward signals for ourselves. --- agents/waitmax.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index 0a1cf4c..c4205c8 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -92,6 +92,29 @@ static void signalhandler(int signum __attribute__((__unused__))) if (kill(g_pid, g_signum) == 0) g_timeout = 1; } +static void setup_signal_handlers() +{ + struct sigaction sa; + sigemptyset(&sa.sa_mask); + sa.sa_handler = signalhandler; + sa.sa_flags = SA_RESTART; /* just to be sure... */ + sigaction(g_signum, &sa, NULL); + sigaction(SIGALRM, &sa, NULL); + sigaction(SIGHUP, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGQUIT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); + + /* Guard against a background child doing I/O on the tty. */ + sa.sa_handler = SIG_IGN; + sigaction(SIGTTIN, &sa, NULL); + sigaction(SIGTTOU, &sa, NULL); + + /* We do not want the parent's CHLD handling. */ + sa.sa_handler = SIG_IGN; + sigaction(SIGCHLD, &sa, NULL); +} + static void unblock_signal(int signum) { sigset_t signals_to_unblock; @@ -132,18 +155,26 @@ int main(int argc, char **argv) int maxtime = atoi(argv[optind]); if (maxtime <= 0) usage(1); + /* Setting up signal handlers before forking avoids race conditions with the + child. */ + setup_signal_handlers(); + g_pid = fork(); if (g_pid == -1) exit_with("fork() failed", errno, 1); if (g_pid == 0) { - signal(SIGALRM, signalhandler); + /* Restore tty behavior in the child. */ + struct sigaction sa; + sa.sa_handler = SIG_DFL; + sigaction(SIGTTIN, &sa, NULL); + sigaction(SIGTTOU, &sa, NULL); + execvp(argv[optind + 1], argv + optind + 1); exit_with(argv[optind + 1], errno, 253); } /* Make sure SIGALRM is not blocked (e.g. by parent). */ unblock_signal(SIGALRM); - signal(SIGALRM, signalhandler); alarm(maxtime); int status;

8 years, 7 months

Added fresh version of waitmax 32bit static executable.

by Sven Panne

Module: check_mk Branch: master Commit: 10a1a92ade3235e20fb5725be3068f455711ed5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a1a92ade3235… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 14:34:33 2015 +0100 Added fresh version of waitmax 32bit static executable. --- agents/waitmax | Bin 13224 -> 11604 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/waitmax b/agents/waitmax index b956084..96950c9 100755 Binary files a/agents/waitmax and b/agents/waitmax differ

8 years, 7 months

Make sure SIGALRM can be delivered. Check fork() for errors.

by Sven Panne

Module: check_mk Branch: master Commit: 84730d34a011306f3f7495c2eecd042113b65474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84730d34a01130… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:43:40 2015 +0100 Make sure SIGALRM can be delivered. Check fork() for errors. --- agents/waitmax.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/agents/waitmax.c b/agents/waitmax.c index c4ce4c7..0a1cf4c 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -92,6 +92,15 @@ static void signalhandler(int signum __attribute__((__unused__))) if (kill(g_pid, g_signum) == 0) g_timeout = 1; } +static void unblock_signal(int signum) +{ + sigset_t signals_to_unblock; + sigemptyset(&signals_to_unblock); + sigaddset(&signals_to_unblock, signum); + if (sigprocmask(SIG_UNBLOCK, &signals_to_unblock, NULL) == -1) + exit_with("sigprocmask failed", errno, 1); +} + static struct option long_options[] = {{"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, {"signal", required_argument, 0, 's'}, @@ -124,12 +133,16 @@ int main(int argc, char **argv) if (maxtime <= 0) usage(1); g_pid = fork(); + if (g_pid == -1) exit_with("fork() failed", errno, 1); + if (g_pid == 0) { signal(SIGALRM, signalhandler); execvp(argv[optind + 1], argv + optind + 1); exit_with(argv[optind + 1], errno, 253); } + /* Make sure SIGALRM is not blocked (e.g. by parent). */ + unblock_signal(SIGALRM); signal(SIGALRM, signalhandler); alarm(maxtime);

8 years, 7 months

Compile with -O3. Warning police.

by Sven Panne

Module: check_mk Branch: master Commit: 8b58f4b8249aa17c8896c367861b35f0654937fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b58f4b8249aa1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 14:33:10 2015 +0100 Compile with -O3. Warning police. --- agents/Makefile | 4 ++-- agents/waitmax.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index f8096e7..6dc685d 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -40,8 +40,8 @@ usage: waitmax: waitmax.c @if type diet >/dev/null ; then \ - echo "Compiling with diet (please ignore diet-warnings)..." ; \ - diet gcc -s -o waitmax waitmax.c ; \ + echo "Compiling with diet..." ; \ + diet gcc -s -Wall -Wextra -O3 -o waitmax waitmax.c ; \ else \ echo "WARNING: your binary is not portable. Please compile " ; \ echo "with dietlibc on 32-Bit to get portable statically " ; \ diff --git a/agents/waitmax.c b/agents/waitmax.c index 3dab79d..fa5abd0 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -219,4 +219,5 @@ int main(int argc, char **argv) if (WIFEXITED(status)) return WEXITSTATUS(status); if (WIFSIGNALED(status)) return g_timeout ? 255 : 128 + WTERMSIG(status); exit_with("Program did neither exit nor was signalled.", 0, 254); + return 0; /* Make GCC happy. */ }

8 years, 7 months

Create a new process group and deliver signal to all processes in it.

by Sven Panne

Module: check_mk Branch: master Commit: c53e5502be58986e8a9599545c114242ec3a2a9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c53e5502be5898… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:47:55 2015 +0100 Create a new process group and deliver signal to all processes in it. --- agents/waitmax.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index c4205c8..3dab79d 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -87,9 +87,36 @@ static void usage(int status) 0, status); } -static void signalhandler(int signum __attribute__((__unused__))) +static void kill_group(pid_t pid, int signum) { - if (kill(g_pid, g_signum) == 0) g_timeout = 1; + /* The child might have become a process group leader itself, so send the + signal directly to it. */ + kill(pid, signum); + + /* Guard against harakiri... */ + signal(signum, SIG_IGN); + + /* Send the signal to all processes in our fresh process group. */ + kill(0, signum); +} + +static void signalhandler(int signum) +{ + if (signum == SIGALRM) { + /* The child took too long, so remember that we timed out and send the + configured signal instead of SIGALRM. */ + g_timeout = 1; + signum = g_signum; + } + + /* Are we the child process or has the child not been execvp'd yet? */ + if (g_pid == 0) exit(signum + 128); + + /* Send the configure signal to our process group. */ + kill_group(g_pid, signum); + + /* Make sure the children actually react on the signal. */ + if (signum != SIGKILL && signum != SIGCONT) kill_group(g_pid, SIGCONT); } static void setup_signal_handlers() @@ -110,8 +137,8 @@ static void setup_signal_handlers() sigaction(SIGTTIN, &sa, NULL); sigaction(SIGTTOU, &sa, NULL); - /* We do not want the parent's CHLD handling. */ - sa.sa_handler = SIG_IGN; + /* Make sure that waitpid won't fail. */ + sa.sa_handler = SIG_DFL; sigaction(SIGCHLD, &sa, NULL); } @@ -155,6 +182,13 @@ int main(int argc, char **argv) int maxtime = atoi(argv[optind]); if (maxtime <= 0) usage(1); + /* Create a new process group with ourselves as the process group + leader. This way we can send a signal to all subprocesses later (unless + some non-direct descendant creates its own process group). Doing this in + the parent process already simplifies things, because we don't have to + worry about foreground/background groups then. */ + setpgid(0, 0); + /* Setting up signal handlers before forking avoids race conditions with the child. */ setup_signal_handlers();

8 years, 7 months

omd_status: avoid crash in case of missing OMD site

by Mathias Kettner

Module: check_mk Branch: master Commit: 694b1863debfd87398f685e7dca0f3f283a6f8c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=694b1863debfd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 24 13:40:07 2015 +0100 omd_status: avoid crash in case of missing OMD site --- checks/omd_status | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/checks/omd_status b/checks/omd_status index f2764ec..a9e08b8 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -73,9 +73,12 @@ def parse_omd_status(info): return parsed -def check_omd_status(item, _no_params, info): +def check_omd_status(item, _no_params, parsed): - parsed_site = info[item] + if item not in parsed: + return + + parsed_site = parsed[item] number_nodes = len(parsed_site) stopped_nodes = 0

8 years, 7 months

check_mk.agent_updates: avoid crash in case of not-yet-updated agent

by Mathias Kettner

Module: check_mk Branch: master Commit: b518bbb233756620508dd91c95f6b4237da62a40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b518bbb2337566… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 24 13:39:47 2015 +0100 check_mk.agent_updates: avoid crash in case of not-yet-updated agent --- checks/check_mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/checks/check_mk b/checks/check_mk index ffe938f..42de18d 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -139,6 +139,8 @@ def check_cmk_agent_update(_no_item, _no_params, info): parts = [] else: value = parts[1] + if value == "None": + value = None parts = parts[2:] parsed[key] = value @@ -167,9 +169,10 @@ def check_cmk_agent_update(_no_item, _no_params, info): except: yield 1, "no successful connect to server yet" - yield 0, "last agent update: %s" % get_timestamp_human_readable(parsed["last_update"]) + if parsed["last_update"]: + yield 0, "last agent update: %s" % get_timestamp_human_readable(parsed["last_update"]) - if parsed["aghash"] != "None": + if parsed["aghash"]: yield 0, "agent configuration: %s" % parsed["aghash"][:8] return

8 years, 7 months

Fixed border styling in table layouts with multiple columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 1819dc2027cdd7b2459706bbecb2cf5e1bb278ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1819dc2027cdd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 24 13:33:42 2015 +0100 Fixed border styling in table layouts with multiple columns --- web/htdocs/views.css | 6 ++++++ web/htdocs/views.py | 19 +++++++++++++++---- web/plugins/views/layouts.py | 14 ++++++++------ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index f30ab00..a3aeee6 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -231,6 +231,12 @@ td.groupheader { padding: 0; } +table.data tr.data > td.gap, +table.data tr > td.last_col, +table.data tr > th.last_col { + border-right: 0; +} + td.gap, table.data .checkbox_hover.gap { background-image: url("images/contentframe_background.jpg"); background-attachment: fixed; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c132678..fd9d9c1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2058,9 +2058,15 @@ def execute_hooks(hook): else: pass -def paint(p, row, tdattrs=""): +def paint(p, row, tdattrs="", is_last_painter=False): tdclass, content = prepare_paint(p, row) + if is_last_painter: + if tdclass == None: + tdclass = "last_col" + else: + tdclass += " last_col" + if tdclass: html.write("<td %s class=\"%s\">%s</td>\n" % (tdattrs, tdclass, content)) else: @@ -2288,7 +2294,7 @@ def sort_url(view, painter, join_index): return ','.join(p) -def paint_header(view, p): +def paint_header(view, p, is_last_column_header=False): # The variable p is a tuple with the following components: # p[0] --> painter object, from multisite_painters[] # p[1] --> view name to link to or None (not needed here) @@ -2309,7 +2315,7 @@ def paint_header(view, p): # Important for links: # - Add the display options (Keeping the same display options as current) # - Link to _self (Always link to the current frame) - thclass = '' + classes = [] onclick = '' title = '' if 'L' in html.display_options \ @@ -2321,10 +2327,15 @@ def paint_header(view, p): if hasattr(html, 'title_display_options'): params.append(('display_options', html.title_display_options)) - thclass = ' class="sort %s"' % get_primary_sorter_order(view, painter) + classes += [ "sort", get_primary_sorter_order(view, painter) ] onclick = ' onclick="location.href=\'%s\'"' % html.makeuri(params, 'sort') title = ' title="%s"' % (_('Sort by %s') % t) + if is_last_column_header: + classes.append("last_col") + + thclass = classes and (" class=\"%s\"" % " ".join(classes)) or "" + html.write("<th%s%s%s>%s</th>" % (thclass, onclick, title, t)) def register_events(row): diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 567ca53..923cbdf 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -377,8 +377,11 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ else: html.write('<th></th>') - for p in painters: - paint_header(view, p) + last_painter = painters[-1] + for painter in painters: + is_last_column_header = painter == last_painter + paint_header(view, painter, is_last_column_header) + if n < num_columns: html.write('<td class=gap></td>') @@ -401,7 +404,6 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ return members - index = 0 visible_row_number = 0 for row in rows: register_events(row) # needed for playing sounds @@ -481,11 +483,11 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ if show_checkboxes: render_checkbox_td(view, row, num_painters) - for p in painters: - paint(p, row) + last_painter = painters[-1] + for painter in painters: + paint(painter, row, is_last_painter=last_painter==painter) column += 1 - index += 1 if group_open: for i in range(column-1, num_columns):

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015