Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Reserved 50 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44cfa2dba3415b4d768b2fc0201084a581b6c6a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44cfa2dba3415b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 24 09:49:12 2012 +0200 Reserved 50 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index ae645ab..6966b4b 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -817 +867

11 years, 10 months

Check_MK Git: check_mk: FIX: if check doesn't check warn/ crit error levels if they're set to None

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d671a1165d77601a13ce9d13f1b30e6e1877e112 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d671a1165d7760… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 23 16:32:50 2012 +0200 FIX: if check doesn't check warn/crit error levels if they're set to None --- checks/if.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/if.include b/checks/if.include index e088cd9..4bc4e0d 100644 --- a/checks/if.include +++ b/checks/if.include @@ -304,10 +304,10 @@ def check_if_common(item, params, info): if errperc > 0: infotext += ", %s-errors: %.2f%%" % (what, errperc) - if errperc >= err_crit: + if err_crit != None and errperc >= err_crit: state = 2 infotext += "(!!) >= " + str(err_crit) - elif errperc >= err_warn: + elif err_warn != None and errperc >= err_warn: state = max(state, 1) infotext += "(!) >= " + str(err_warn)

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cf0ab61b751571e6f548f165eb19312e8c01e5dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf0ab61b751571… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 23 16:28:58 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 79c297ac1893017d3ed525d6afb967176e913200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79c297ac189301… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Oct 23 15:37:47 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e815e78bef38f5291c63d5696847742d410bdc5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e815e78bef38f5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Oct 12 15:43:57 2012 +0200 Add new bug entry --- .bugs/810 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/.bugs/810 b/.bugs/810 new file mode 100644 index 0000000..810f5e7 --- /dev/null +++ b/.bugs/810 @@ -0,0 +1,43 @@ +Title: Active check results mixed up with Livecheck enabled +Component: livecheck +State: open +Date: 2012-10-12 15:35:38 +Targetversion: 1.2.0 +Class: bug + +Two hosts were in hoststatus down but working in reality +Both hosts showed the correct check command, but the check output was +corrupted. +First, it is cut off, like this: +OK - Agent 20: rta na +OK - 172. +OK - symc + +Another sympton is that the last check age goes stale. + + +lsof output of one of the livecheck processes: + +COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME +livecheck 6271 root cwd DIR 8,17 4096 2 / +livecheck 6271 root rtd DIR 8,17 4096 2 / +livecheck 6271 root txt REG 8,33 23456 1970083 /opt/omd/versions/1.2.0-2012.10.11.mk/lib/mk-livestatus/livecheck +livecheck 6271 root mem REG 8,17 156872 1187180 /lib64/ld-2.12.so +livecheck 6271 root mem REG 8,17 1918016 1187181 /lib64/libc-2.12.so +livecheck 6271 root 0u unix 0xffff8802389490c0 0t0 1184204333 socket +livecheck 6271 root 1u unix 0xffff8802389490c0 0t0 1184204333 socket +livecheck 6271 root 2u unix 0xffff8802389490c0 0t0 1184204333 socket +livecheck 6271 root 3w REG 8,33 198769 2361360 /opt/omd/sites/prod/var/pnp4nagios/spool/perfdata.1349948997-PID-29917 (deleted) +livecheck 6271 root 4w REG 8,33 865944 2362213 /opt/omd/sites/prod/var/pnp4nagios/spool/perfdata.1349970584-PID-10329 (deleted) +livecheck 6271 root 5w REG 8,33 423682 2360928 /opt/omd/sites/prod/var/pnp4nagios/spool/perfdata.1349973657-PID-20265 (deleted) +livecheck 6271 root 7u FIFO 0,20 0t0 1122431069 /opt/omd/sites/prod/tmp/run/nagios.cmd +livecheck 6271 root 8w REG 8,33 176694 2360168 /opt/omd/sites/prod/var/pnp4nagios/spool/perfdata.1350043381-PID-9448 (deleted) +livecheck 6271 root 9w REG 8,33 4680734059 2361297 /opt/omd/sites/prod/var/nagios/livestatus.log +livecheck 6271 root 54r REG 8,33 26268786 2362455 /opt/omd/sites/prod/var/nagios/archive/nagios-08-04-2012-00.log +livecheck 6271 root 61u unix 0xffff8802389490c0 0t0 1184204333 socke + + +Most important there: Livecheck must drop inherited FDs as it will keep that +open until nagios restarts. + +It's not sure if both things are related, but this must be fixed in any case

11 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5000a1c9250b229d8eb9c8302841f10049603da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5000a1c9250b2… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Oct 22 16:36:53 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Added new Checks for Gude PDU Units

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ad1e4e2a80a1fe438c8e0829c37eb150335da6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad1e4e2a80a1f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 23 16:20:30 2012 +0200 Added new Checks for Gude PDU Units --- ChangeLog | 1 + checkman/pdu_gude_8301 | 22 +++++++++ checkman/pdu_gude_8310 | 22 +++++++++ checks/pdu_gude.include | 79 ++++++++++++++++++++++++++++++++++ checks/pdu_gude_8301 | 42 ++++++++++++++++++ checks/pdu_gude_8310 | 42 ++++++++++++++++++ web/plugins/wato/check_parameters.py | 67 +++++++++++++++++++++++++---- 7 files changed, 266 insertions(+), 9 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ad1e4e2a8…

11 years, 10 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: e25b238b3e7c3035a1c82b5d0ae7b470bae6d817 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e25b238b3e7c30… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 23 16:20:52 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: New columns livestatus_threads, livestatus_{active, queued}_connections

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8936d654c873e36ddedadbef142474ee317b417a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8936d654c873e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 23 16:00:19 2012 +0200 New columns livestatus_threads, livestatus_{active,queued}_connections --- ChangeLog | 1 + livestatus/src/TableStatus.cc | 10 ++++++++++ livestatus/src/module.c | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 350990f..e04bd90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * Added new table statehist, used for SLA queries * Added new column check_command_expanded in table hosts * Added new column check_command_expanded in table services + * New columns livestatus_threads, livestatus_{active,queued}_connections BI: * Added missing localizations diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index ca6aa91..213911f 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -58,6 +58,9 @@ extern int g_num_hosts; extern int g_num_services; extern int livechecks_performed; extern int livecheck_overflows; +extern int g_num_clientthreads; +extern int g_num_queued_connections; +extern int g_num_active_connections; extern circular_buffer external_command_buffer; extern int external_command_buffer_slots; @@ -177,6 +180,13 @@ TableStatus::TableStatus() "The current number of log messages MK Livestatus keeps in memory", &num_cached_log_messages )); addColumn(new StringPointerColumn("livestatus_version", "The version of the MK Livestatus module", (char *)VERSION)); + addColumn(new IntPointerColumn("livestatus_active_connections", + "The current number of active connections to MK Livestatus", &g_num_active_connections)); + addColumn(new IntPointerColumn("livestatus_queued_connections", + "The current number of queued connections to MK Livestatus (that wait for a free thread)", &g_num_queued_connections)); + addColumn(new IntPointerColumn("livestatus_threads", + "The maximum number of connections to MK Livestatus that can be handled in parallel", &g_num_clientthreads)); + // Livecheck } diff --git a/livestatus/src/module.c b/livestatus/src/module.c index acef1ff..73bdcd8 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -73,7 +73,9 @@ 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 */ -unsigned g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ +int g_num_clientthreads = 10; /* allow 10 concurrent connections per default */ +int g_num_queued_connections = 0; /* current number of queued connections (for statistics) */ +int g_num_active_connections = 0; /* current number of active connections (for statistics) */ size_t g_thread_stack_size = 65536; /* stack size of threads */ #define false 0 @@ -195,6 +197,7 @@ void *main_thread(void *data __attribute__ ((__unused__))) if (0 < fcntl(cc, F_SETFD, FD_CLOEXEC)) logger(LG_INFO, "Cannot set FD_CLOEXEC on client socket: %s", strerror(errno)); queue_add_connection(cc); // closes fd + g_num_queued_connections++; g_counters[COUNTER_CONNECTIONS]++; } } @@ -209,6 +212,8 @@ void *client_thread(void *data __attribute__ ((__unused__))) while (!g_should_terminate) { int cc = queue_pop_connection(); + g_num_queued_connections--; + g_num_active_connections++; if (cc >= 0) { if (g_debug_level >= 2) logger(LG_INFO, "Accepted client connection on fd %d", cc); @@ -225,6 +230,7 @@ void *client_thread(void *data __attribute__ ((__unused__))) } close(cc); } + g_num_active_connections--; } delete_outputbuffer(output_buffer); delete_inputbuffer(input_buffer);

11 years, 10 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: 969f3f9d7b79a6fa45904ed054ab45fd4d6d6830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969f3f9d7b79a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 23 16:00:22 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012