Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64645 discussions

Check_MK Git: check_mk: Fix some coding style issues

by Mathias Kettner

Module: check_mk Branch: master Commit: db85ba04e632f72bce51d9c923aeebf646b32267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db85ba04e632f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 16:05:48 2014 +0200 Fix some coding style issues --- mkeventd/lib/check_mkevents.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index ca4b769..f9401c5 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -64,7 +64,8 @@ int main(int argc, char** argv) remote_host = argv[i+1]; i++; argc_count -= 2; - } else if (!strcmp("-a", argv[i])) { + } + else if (!strcmp("-a", argv[i])) { ignore_acknowledged = true; argc_count--; } @@ -72,7 +73,8 @@ int main(int argc, char** argv) host = argv[i]; application = argv[i+1]; break; - } else if (argc_count > 1) { + } + else if (argc_count > 1) { host = argv[i]; break; } @@ -104,9 +106,9 @@ int main(int argc, char** argv) int sock; struct timeval tv; if (remote_host) { - sock = socket(AF_INET ,SOCK_STREAM ,0); + sock = socket(AF_INET, SOCK_STREAM, 0); tv.tv_sec = 10; - setsockopt(sock, SOL_SOCKET,SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); + setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); @@ -114,12 +116,14 @@ int main(int argc, char** argv) inet_aton(remote_hostaddress, &addr.sin_addr); addr.sin_port = htons(remote_port); - if(0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))){ + if (0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))) + { printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d (%s)\n", remote_hostaddress, remote_port, strerror(errno)); exit(3); } - } else { + } + else { sock = socket(PF_LOCAL, SOCK_STREAM , 0); if (sock < 0) { printf("UNKNOWN - Cannot create client socket: %s\n", strerror(errno));

10 years, 3 months

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 3554332a136390f5fc35e3d6fbd617aabbfd1de1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3554332a136390… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:40:28 2014 +0200 Updated werk description --- .werks/1012 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1012 b/.werks/1012 index 98744fe..8c268cb 100644 --- a/.werks/1012 +++ b/.werks/1012 @@ -1,4 +1,4 @@ -Title: Fix quoting of \ in custom checks with nagios core +Title: Fix quoting of backslashes in custom checks with nagios core Level: 2 Component: core Version: 1.2.5i5 diff --git a/ChangeLog b/ChangeLog index c4938ff..f73ccc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 1.2.5i5: Core & Setup: - * 1012 Fix quoting of \ in custom checks with nagios core... + * 1012 Fix quoting of backslashes in custom checks with nagios core... NOTE: Please refer to the migration notes! Checks & Agents:

10 years, 3 months

Check_MK Git: check_mk: Fix quoting of \ in custom checks with nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b64aa2fedc8448c7ea4b48ff0f30a1b04d0b266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b64aa2fedc844… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:39:03 2014 +0200 Fix quoting of \ in custom checks with nagios core When you are using Nagios as montitoring core then backslashes contained in <tt>custom_checks</tt> (Classical active and passive Nagios checks) would be interpreted by Nagios. That way single backslashes would usually vanish und you would have to duplicate them. The Check_MK Micro Core never interpreted these backslashes so it was transparent for the user. This fix changes the behaviour of Check_MK in a way that also with the Nagios core you need only one backslash. Backslashes are transparent now. NOTE: If you have custom checks that contain backslashes (for example as part of names or passwords) then you need to remove duplicate backslashes after this update! --- .werks/1012 | 22 ++++++++++++++++++++++ ChangeLog | 4 ++++ modules/check_mk.py | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.werks/1012 b/.werks/1012 new file mode 100644 index 0000000..98744fe --- /dev/null +++ b/.werks/1012 @@ -0,0 +1,22 @@ +Title: Fix quoting of \ in custom checks with nagios core +Level: 2 +Component: core +Version: 1.2.5i5 +Date: 1403786142 +Class: incomp + +When you are using Nagios as montitoring core then backslashes contained +in <tt>custom_checks</tt> (Classical active and passive Nagios checks) would +be interpreted by Nagios. That way single backslashes would usually vanish +und you would have to duplicate them. + +The Check_MK Micro Core never interpreted these backslashes so it was +transparent for the user. + +This fix changes the behaviour of Check_MK in a way that also with the +Nagios core you need only one backslash. Backslashes are transparent +now. + +NOTE: If you have custom checks that contain backslashes (for +example as part of names or passwords) then you need to remove +duplicate backslashes after this update! diff --git a/ChangeLog b/ChangeLog index 488d804..c4938ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.5i5: + Core & Setup: + * 1012 Fix quoting of \ in custom checks with nagios core... + NOTE: Please refer to the migration notes! + Checks & Agents: * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... diff --git a/modules/check_mk.py b/modules/check_mk.py index 86dfb29..78c4403 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2411,7 +2411,7 @@ define service { continue if command_line: - command_line = autodetect_plugin(command_line) + command_line = autodetect_plugin(command_line).replace("\\", "\\\\") if "freshness" in entry: freshness = " check_freshness\t\t1\n" + \

10 years, 3 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: eae44a1a16de0999eb5198158f57145a3673da57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eae44a1a16de09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:35:28 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c778141..4ac943d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1022 +1032

10 years, 3 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f817579589910c5467df03747341d57086bc661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f817579589910… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:35:22 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2d1420d..c778141 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1012 +1022

10 years, 3 months

Check_MK Git: check_mk: FIX oracle_tablespaces: fixed calculation of space left and number of remaining increments

by Andreas Boesl

Module: check_mk Branch: master Commit: 8fc47589b3ccb0eee4d450222b580f2125ae2004 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc47589b3ccb0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 26 14:21:20 2014 +0200 FIX oracle_tablespaces: fixed calculation of space left and number of remaining increments The remaining increments and space left was not correctly calculated when the remaining memory space was not a multiple of the increment size. For example: C+: Tablespace 900 MB used 100 MB free space for autoincrement 200 MB increment size C-: The previous version calculated 900 MB as maximum size, because the increment size was greater than the remaining autoincrement space. This was wrong. The last increment also uses the remaining space, even if the remaining size is smaller than the increment size. As a result, this fix actually increases the amount of available free space, so it should not have any negative side effects for already configured limits. --- .werks/944 | 26 ++++++++++++++++++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 11 ++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.werks/944 b/.werks/944 new file mode 100644 index 0000000..981ada8 --- /dev/null +++ b/.werks/944 @@ -0,0 +1,26 @@ +Title: oracle_tablespaces: fixed calculation of space left and number of remaining increments +Level: 2 +Component: checks +Version: 1.2.5i5 +Date: 1403784236 +Class: fix + +The remaining increments and space left was not correctly calculated when the +remaining memory space was not a multiple of the increment size. +For example: + +C+: +Tablespace +900 MB used +100 MB free space for autoincrement + +200 MB increment size +C-: + +The previous version calculated 900 MB as maximum size, because the increment size was greater +than the remaining autoincrement space. This was wrong. The last increment also uses the remaining +space, even if the remaining size is smaller than the increment size. + +As a result, this fix actually increases the amount of available free space, +so it should not have any negative side effects for already configured limits. + diff --git a/ChangeLog b/ChangeLog index 52ba5bc..488d804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... + * 0944 FIX: oracle_tablespaces: fixed calculation of space left and number of remaining increments... WATO: * 0990 FIX: Fix HTTP error handling in bulk inventory... diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 05cb437..f4971b0 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -202,10 +202,15 @@ def check_oracle_tablespaces(item, params, info): incsize = int(line[8]) # size of next increment in blocks if incsize == 1: uses_default_increment = True - incs = free_bl / incsize + + incs, rest = divmod(free_bl, incsize) + if rest: + incs += 1 + num_increments += incs - increment_size += blocksize * incsize * incs - free_space += blocksize * (incsize * incs + (int(line[12]))) + increment_size += blocksize * incsize * incs - rest * blocksize + free_space += blocksize * (incsize * incs + (int(line[12]))) - rest * blocksize + # not autoextensible: take current size as maximum else: my_max_size = blocksize * int(line[5])

10 years, 3 months

Check_MK Git: check_mk: Fixed debug log message

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d20d5284f6fa615e3311e6fae74648026cff54f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d20d5284f6fa6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 14:01:36 2014 +0200 Fixed debug log message --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index d29808a..b39c8da 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1232,7 +1232,7 @@ def call_notification_script(plugin, plugin_context): # Existing vars are replaced, some already existing might remain for key in plugin_context: if type(plugin_context[key]) == bool: - notify_log("MIST: %s=%s ist bool" % (key, plugin_context[key])) + notify_log("INTERNAL ERROR: %s=%s is of type bool" % (key, plugin_context[key])) os.putenv('NOTIFY_' + key, plugin_context[key].encode('utf-8')) notify_log(" executing %s" % path)

10 years, 3 months

Check_MK Git: check_mk: availability: fix problem where chaos periods are not being shown

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f08cdda23a1187beef49d3f7a0c742f63e726ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f08cdda23a118… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 13:43:26 2014 +0200 availability: fix problem where chaos periods are not being shown --- web/plugins/views/availability.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index de80cf4..96183f7 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -903,6 +903,8 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" ' 'style="width: %.3f%%" title="%s" class="%s"></td>' % ( row_nr, row_nr, width, html.attrencode(title), css)) + if chaos_count > 1: + output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width) html.write('</tr></table>') if style == "inline":

10 years, 3 months

Check_MK Git: check_mk: Remove one trailing space

by Mathias Kettner

Module: check_mk Branch: master Commit: b9384c790570470e29aba23319d2a386eda0472e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9384c79057047… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 26 10:57:17 2014 +0200 Remove one trailing space --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index fa92e88..de80cf4 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -839,7 +839,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, def render_date(ts): if avoptions["dateformat"] == "epoch": return str(int(ts)) - else: + else: return time.strftime(format, time.localtime(ts)) if type(timeline) == tuple:

10 years, 3 months

Check_MK Git: check_mk: AV: rename column to "Last Known Plugin Output"

by Mathias Kettner

Module: check_mk Branch: master Commit: 08a23dbfa59e2f55e2af5f026f145451eb99500a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08a23dbfa59e2f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 25 16:49:48 2014 +0200 AV: rename column to "Last Known Plugin Output" --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 93dd5a9..fa92e88 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -940,7 +940,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, break else: table.cell(_("State"), "(%s/%s)" % (sid,sname)) - table.cell(_("Additional information"), row["log_output"]) + table.cell(_("Last Known Plugin Output"), row["log_output"]) table.end()

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits