Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: a3582070d19d5a325f1e6acd3e16ef8416251dba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3582070d19d5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 25 09:42:42 2015 +0100 Addition to inline comment --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 268316b..d845301 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2518,7 +2518,7 @@ class Alternative(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] - self._match = kwargs.get("match") # custom match function + self._match = kwargs.get("match") # custom match function, returns index in elements self._style = kwargs.get("style", "radio") # alternative: "dropdown" self._show_alternative_title = kwargs.get("show_alternative_title")

8 years, 10 months

#2744 FIX waitmax now kills the whole process group and is a bit more robust.

by Sven Panne

Module: check_mk Branch: master Commit: 2007c71a5211f6b07b66ee02f414d51f89eb71b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2007c71a5211f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 25 09:22:19 2015 +0100 #2744 FIX waitmax now kills the whole process group and is a bit more robust. --- .werks/2744 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2744 b/.werks/2744 new file mode 100644 index 0000000..128fb00 --- /dev/null +++ b/.werks/2744 @@ -0,0 +1,9 @@ +Title: waitmax now kills the whole process group and is a bit more robust. +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448439662 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fb2d1f4..fbba25e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 2799 FIX: check_mail_loop: "Use TLS over SMTP" option did not work * 2777 FIX: check_mk_agent.linux: avoid execution of .deb temporary files as plugins * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... + * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. Multisite: * 2684 Added icons for downloading agent data / walks of hosts...

8 years, 10 months

Make the 'setversion' target a tiny bit less fragile.

by Sven Panne

Module: check_mk Branch: master Commit: cdfde1f8ae81817b4afb282c1ebb838695bebf48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdfde1f8ae8181… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 25 08:56:37 2015 +0100 Make the 'setversion' target a tiny bit less fragile. --- Makefile | 2 +- agents/Makefile | 2 +- agents/windows/Makefile | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 56786f3..b190dc8 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ version: if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi setversion: - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ diff --git a/agents/Makefile b/agents/Makefile index 6dc685d..8a713b7 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -56,7 +56,7 @@ setversion: if [ -d ../.git ]; then \ git rm -f *.rpm *.deb || true ; \ fi - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ if [ "$$agent" != windows -a "$$agent" != plugins -a "$$agent" != hpux ] ; then \ diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 39f62f3..51d40ca 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -46,7 +46,7 @@ all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe install setversion: sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' installer*.nsi ; \ - sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; \ make install_agent.exe install_agent-64.exe msi_installer @@ -124,7 +124,6 @@ check_mk_agent-64.exe.versioned: %.exe: %.unversioned.exe %.exe.versioned - # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer

8 years, 10 months

Small refacturing needed for agent deployment

by Mathias Kettner

Module: check_mk Branch: master Commit: 577f993623973f5d63a097cf9933ef311cfdd863 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=577f993623973f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 24 16:51:13 2015 +0100 Small refacturing needed for agent deployment --- web/htdocs/wato.css | 10 ++++++++++ web/htdocs/wato.py | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index f5da987..f49bebf 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -55,6 +55,16 @@ Boston, MA 02110-1301 USA. background-color: #73a1b4; } +/* Tables renderes in forms. */ +.wato table.nform table.data { + box-shadow: 1px 1px 2px #444; +} + +.wato table.nform table.data th { + background-color: #527280; +} + + .wato th.left { border-left-style: none; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 16f294b..2e3a405 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9252,8 +9252,7 @@ def vs_notification_rule(userid = None): validate = validate_notification_rule, ) - -def generic_rule_match_conditions(): +def simple_host_rule_match_conditions(): return [ ( "match_folder", FolderChoice( @@ -9289,6 +9288,11 @@ def generic_rule_match_conditions(): orientation = "horizontal", ) ), + ] + + +def generic_rule_match_conditions(): + simple_host_rule_match_conditions() + [ ( "match_servicegroups", GroupChoice("service", title = _("Match Service Groups"),

8 years, 10 months

added bug entry #2403

by Sebastian Herbord

Module: check_mk Branch: master Commit: 25fbaea4657281d9654d009f0278b52d6fb499c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25fbaea4657281… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 24 16:11:13 2015 +0100 added bug entry #2403 --- .bugs/2403 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2403 b/.bugs/2403 new file mode 100644 index 0000000..dde6158 --- /dev/null +++ b/.bugs/2403 @@ -0,0 +1,12 @@ +Title: Get rid of itemless services +Component: checks +State: open +Date: 2015-11-24 16:09:27 +Targetversion: future +Class: cleanup + +The current concept of services with and without items requires special treatment in various places and causes unnecessary technical issues, i.e. making it impossible to have rules apply to both types of services. +specifying that all checks shall use items - even if they use only one - could get rid of some non-obvious complexity. +To make porting of the configuration and manual configuration easier it could be defined that a missing item will be handled as an empty string for the item name. +Further a parameter for wato rules could be introduced to remove the option to filter by item where this isn't required. +This would probably reduce the amount of code and number of rules without losing functionality.

8 years, 10 months

Make iwyu happy for CMC compilation, too.

by Sven Panne

Module: check_mk Branch: master Commit: ce243c61f1db5e966cb99f3adaff9961d8c77c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce243c61f1db5e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 15:57:54 2015 +0100 Make iwyu happy for CMC compilation, too. --- livestatus/src/HostFileColumn.cc | 3 ++- livestatus/src/LogEntry.h | 4 +++- livestatus/src/Logfile.cc | 3 ++- livestatus/src/TableLog.cc | 5 ++++- livestatus/src/TableStateHistory.cc | 3 ++- livestatus/src/nagios.h | 15 +++++++-------- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index 6a08c1e..abd5165 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -28,10 +28,11 @@ #include <stdlib.h> #include <unistd.h> #include "logger.h" -#include "nagios.h" #ifdef CMC #include "Host.h" +#else +#include "nagios.h" #endif using std::string; diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index beac181..99a6459 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -28,7 +28,9 @@ #include "config.h" // IWYU pragma: keep #include <time.h> #include "nagios.h" - +#ifdef CMC +struct command; +#endif #define LOGCLASS_INFO 0 // all messages not in any other class #define LOGCLASS_ALERT 1 // alerts: the change service/host state diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index b6ea0b2..5ac21f9 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -37,7 +37,8 @@ #include "logger.h" #ifdef CMC -#include "Core.h" +#include "cmc.h" +struct Core; extern Core *g_core; #endif diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index bcede94..de47604 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -40,9 +40,12 @@ #include "TableContacts.h" #include "TableHosts.h" #include "TableServices.h" -#include "auth.h" #include "tables.h" +#ifndef CMC +#include "auth.h" +#endif + using mk::lock_guard; using mk::mutex; using std::string; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index b273724..12a6bc4 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -48,7 +48,6 @@ #include "Store.h" #include "TableHosts.h" #include "TableServices.h" -#include "auth.h" #include "logger.h" #include "tables.h" @@ -56,6 +55,8 @@ #include "Host.h" #include "Service.h" #include "Timeperiod.h" +#else +#include "auth.h" #endif using mk::lock_guard; diff --git a/livestatus/src/nagios.h b/livestatus/src/nagios.h index 20e92a1..188ac73 100644 --- a/livestatus/src/nagios.h +++ b/livestatus/src/nagios.h @@ -27,12 +27,12 @@ #include "config.h" // IWYU pragma: keep +// IWYU pragma: begin_exports #ifdef CMC -#include "../cmc.h" + #include "cmc.h" #else - // IWYU pragma: begin_exports - #define NSCORE - #ifdef NAGIOS4 + #define NSCORE + #ifdef NAGIOS4 #include "nagios4/common.h" #include "nagios4/objects.h" #include "nagios4/nagios.h" @@ -44,7 +44,7 @@ #include "nagios4/macros.h" #include "nagios4/downtime.h" #include "nagios4/logging.h" - #else + #else #include "nagios/common.h" #include "nagios/objects.h" #include "nagios/nagios.h" @@ -55,8 +55,7 @@ #include "nagios/nebcallbacks.h" #include "nagios/macros.h" #include "nagios/downtime.h" - #endif // NAGIOS4 - // IWYU pragma: end_exports + #endif // NAGIOS4 #endif // CMC +// IWYU pragma: end_exports #endif // nagios_h -

8 years, 10 months

We should better iniialize more of struct sigaction. Thanks, valgrind! :-)

by Sven Panne

Module: check_mk Branch: master Commit: 018f73892928f035bafd9769439385c7df6c1ce5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=018f73892928f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 15:31:13 2015 +0100 We should better iniialize more of struct sigaction. Thanks, valgrind! :-) --- agents/waitmax | Bin 11604 -> 11604 bytes agents/waitmax.c | 2 ++ 2 files changed, 2 insertions(+) diff --git a/agents/waitmax b/agents/waitmax index 96950c9..9e2097b 100755 Binary files a/agents/waitmax and b/agents/waitmax differ diff --git a/agents/waitmax.c b/agents/waitmax.c index fa5abd0..12cbd19 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -199,6 +199,8 @@ int main(int argc, char **argv) if (g_pid == 0) { /* Restore tty behavior in the child. */ struct sigaction sa; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; /* just to be sure... */ sa.sa_handler = SIG_DFL; sigaction(SIGTTIN, &sa, NULL); sigaction(SIGTTOU, &sa, NULL);

8 years, 10 months

#1306 mkeventd: The Recent event history can you be filtered by extended regexes

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9bf5505612ce0ab4109cc0ceda6513dd756db821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf5505612ce0a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 24 15:18:16 2015 +0100 #1306 mkeventd: The Recent event history can you be filtered by extended regexes --- .werks/1306 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1306 b/.werks/1306 new file mode 100644 index 0000000..f04f93f --- /dev/null +++ b/.werks/1306 @@ -0,0 +1,9 @@ +Title: mkeventd: The Recent event history can you be filtered by extended regexes +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1448374649 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f6fd98a..fb2d1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,6 +151,7 @@ Event Console: * 2733 Visibility of Event Console events more flexible now... + * 1306 mkeventd: The Recent event history can you be filtered by extended regexes * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix search instead of full match)... * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f25ab57..fc79159 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -847,7 +847,7 @@ def parse_history_file(path, headers, filters, greptexts, limit): # Revert lines from the log file to have the newer lines processed first cmd = 'tac "%s"' % path if greptexts: - cmd += " | grep -i -e %s" % quote_shell_string(".*".join(greptexts)) + cmd += " | egrep -i -e %s" % quote_shell_string(".*".join(greptexts)) grep = subprocess.Popen(cmd, shell=True, close_fds=True, stdout=subprocess.PIPE) for line in grep.stdout:

8 years, 10 months

Added exit_with helper, reducing copy-n-paste.

by Sven Panne

Module: check_mk Branch: master Commit: 698b8b19a59055747374e1db0f4d443b9b5512dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=698b8b19a59055… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:39:52 2015 +0100 Added exit_with helper, reducing copy-n-paste. --- agents/waitmax.c | 60 ++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index 9d14f84..2c21ed9 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -49,21 +49,32 @@ static void out(const char *buf) } } +static void exit_with(const char *message, int err, int status) +{ + out(message); + if (err != 0) { + out(": "); + out(strerror(errno)); + } + out("\n"); + exit(status); +} + static void version() { - out( + exit_with( "waitmax version 1.1\n" "Copyright Mathias Kettner 2008\n" "This is free software; see the source for copying conditions. " "There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " - "PURPOSE.\n"); - exit(0); + "PURPOSE.", + 0, 0); } -static void usage() +static void usage(int status) { - out( + exit_with( "Usage: waitmax [-s SIGNUM] MAXTIME PROGRAM [ARGS...]\n" "\n" "Execute PROGRAM as a subprocess. If PROGRAM does not exit before " @@ -72,8 +83,8 @@ static void usage() "\n" " -s, --signal SIGNUM kill with SIGNUM on timeout\n" " -h, --help this help\n" - " -V, --version show version an exit\n\n"); - exit(1); + " -V, --version show version an exit\n", + 0, status); } static void signalhandler(int signum __attribute__((__unused__))) @@ -94,37 +105,30 @@ int main(int argc, char **argv) while (0 <= (ret = getopt_long(argc, argv, "Vhs:", long_options, &indexptr))) { switch (ret) { - case 'V': version(); + case 'V': version(); break; - case 'h': usage(); + case 'h': usage(0); break; case 's': - g_signum = strtoul(optarg, 0, 10); - if (g_signum < 1 || g_signum > 32) { - out("Signalnumber must be between 1 and 32.\n"); - exit(1); - } + g_signum = atoi(optarg); + if (g_signum < 1 || g_signum > 32) + exit_with("Signalnumber must be between 1 and 32.", 0, 1); break; - default: usage(); exit(1); + default: usage(1); break; } } - if (optind + 1 >= argc) usage(); + if (optind + 1 >= argc) usage(1); int maxtime = atoi(argv[optind]); - if (maxtime <= 0) usage(); + if (maxtime <= 0) usage(1); g_pid = fork(); if (g_pid == 0) { signal(SIGALRM, signalhandler); execvp(argv[optind + 1], argv + optind + 1); - out("Cannot execute "); - out(argv[optind + 1]); - out(": "); - out(strerror(errno)); - out("\n"); - exit(253); + exit_with(argv[optind + 1], errno, 253); } signal(SIGALRM, signalhandler); @@ -132,16 +136,10 @@ int main(int argc, char **argv) int status; while (waitpid(g_pid, &status, 0) == -1) { - if (errno != EINTR) { - out("Strange: waitpid() fails: "); - out(strerror(errno)); - out("\n"); - exit(1); - } + if (errno != EINTR) exit_with("waitpid() failed", errno, 1); } if (WIFEXITED(status)) return WEXITSTATUS(status); if (WIFSIGNALED(status)) return g_timeout ? 255 : 128 + WTERMSIG(status); - out("Strange: program did neither exit nor was signalled.\n"); - return 254; + exit_with("Program did neither exit nor was signalled.", 0, 254); }

8 years, 10 months

Avoid warnings from diet. Fixed types and initialization.

by Sven Panne

Module: check_mk Branch: master Commit: 2f07f6bd1bf567694a41ec6cb2067062e055ff93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f07f6bd1bf567… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 24 13:41:22 2015 +0100 Avoid warnings from diet. Fixed types and initialization. --- agents/waitmax.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/agents/waitmax.c b/agents/waitmax.c index 2c21ed9..c4ce4c7 100644 --- a/agents/waitmax.c +++ b/agents/waitmax.c @@ -31,9 +31,9 @@ #include <sys/wait.h> #include <unistd.h> -static int g_pid; +static pid_t g_pid = 0; static int g_timeout = 0; -static int g_signum = 15; +static int g_signum = SIGTERM; static void out(const char *buf) { @@ -99,11 +99,10 @@ static struct option long_options[] = {{"version", no_argument, 0, 'V'}, int main(int argc, char **argv) { - int indexptr = 0; + /* Note: setenv calls malloc, and 'diet' warns about that. */ + if (getenv("POSIXLY_CORRECT") == NULL) putenv("POSIXLY_CORRECT=true"); int ret; - setenv("POSIXLY_CORRECT", "true", 0); - while (0 <= - (ret = getopt_long(argc, argv, "Vhs:", long_options, &indexptr))) { + while ((ret = getopt_long(argc, argv, "Vhs:", long_options, NULL)) != -1) { switch (ret) { case 'V': version(); break;

8 years, 10 months

← Newer
1
2
3
4
5
6
7
...
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