Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: check_mkevents now allows specification of a UNIX socket

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ef979e277401035557e34ccbe6175beaaf704a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef979e2774010… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 3 11:16:09 2013 +0200 check_mkevents now allows specification of a UNIX socket --- ChangeLog | 2 + mkeventd/checks/check_mkevents | 6 ++++- mkeventd/web/plugins/wato/mkeventd.py | 42 ++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6b6826..7ae071e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,8 @@ Event Console: * FIX: check_mkevents: fix usage help if called with illegal options + * check_mkevents now allows specification of a UNIX socket + This is needed in non-OMD environments * setup.py now tries to setup Event Console even in non-OMD world 1.2.2b5: diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents index 3f54b74..1f322ca 100644 --- a/mkeventd/checks/check_mkevents +++ b/mkeventd/checks/check_mkevents @@ -4,7 +4,11 @@ def check_mkevents_arguments(params): args = "" if "remote" in params: - args += "-H %s:%d " % (params["remote"]) + remote = params["remote"] + if type(remote) == tuple: + args += "-H %s:%d " % (quote_shell_string(remote[0]), remote[1]) + else: + args += "-H %s " % quote_shell_string(remote) if params.get("ignore_acknowledged"): args += "-a " args += params.get("hostspec", "$HOSTADDRESS$") diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index cd7fb7c..f3ec445 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1732,24 +1732,38 @@ register_rule( ) ), ( "remote", - Tuple( + Alternative( + title = _("Access to the Event Console"), elements = [ + Tuple( + elements = [ + TextAscii( + title = _("Hostname/IP address of Event Console:"), + allow_empty = False, + ), + Integer( + title = _("TCP Port number:"), + minvalue = 1, + maxvalue = 65535, + default_value = 6558, + ), + ], + title = _("Access via TCP"), + help = _("In a distributed setup where the Event Console is not running in the same " + "site as the host is monitored you need to access the remote Event Console " + "via TCP. Please make sure that this is activated in the global settings of " + "the event console. The default port number is 6558."), + ), TextAscii( - title = _("Hostname/IP address of Event Console:"), + title = _("Access via UNIX socket"), allow_empty = False, + size = 64, ), - Integer( - title = _("TCP Port number:"), - minvalue = 1, - maxvalue = 65535, - default_value = 6558, - ), - ], - title = _("Access Event Console via TCP"), - help = _("In a distributed setup where the Event Console is not running in the same " - "site as the host is monitored you need to access the remote Event Console " - "via TCP. Please make sure that this is activated in the global settings of " - "the event console. The default port number is 6558."), + + ], + default_value = defaults.omd_root + and defaults.omd_root + "/tmp/run/mkeventd/status" + or defaults.livestatus_unix_socket.split("/",1)[0] + "/mkeventd/status" ) ), ],

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0906

by Lars Michelsen

Module: check_mk Branch: master Commit: ac51f4db6d7c8f696c57b871aa0db22fff25edee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac51f4db6d7c8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 10:43:55 2013 +0200 Updated bug entries #0906 Conflicts: .bugs/906 --- .bugs/917 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/917 b/.bugs/917 new file mode 100644 index 0000000..768e435 --- /dev/null +++ b/.bugs/917 @@ -0,0 +1,14 @@ +Title: Make ssl cert check possible on custom port +Component: wato +State: open +Date: 2013-04-03 10:43:07 +Targetversion: future +Class: feature + +wir haben viele HTTPS-Sites auf Ports ab vom Standard (443). + +Es waere echt klasse, wenn wir das in den WATO-Rules der aktiven HTTP-Checks so konfigurieren koennten, dass das Zertifikat auf diesem Port geprueft wird - und noch besser waere es, wenn wir das in der kommenden 1.2.2 tun koennten ;-) + +Aktuell machen wir das ueber manuelle .mk-Rules, die zwar funktionieren, im WATO allerdings als "invalid" angezeigt werden und dort nicht nutzbar sind. + +Wenn mehr Infos benoetigt werden koennte ich die natuerlich auch liefern.

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a24cbb7c21d00664fee569529ef9d0bcdc0c65d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a24cbb7c21d00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 10:46:22 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: livecheck: now able to handle check output up to 16kB

by Andreas Boesl

Module: check_mk Branch: master Commit: 7a4603e13f2252687f12887a5207b109d32bac4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a4603e13f2252… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 3 10:42:30 2013 +0200 livecheck: now able to handle check output up to 16kB --- ChangeLog | 1 + livestatus/src/livecheck.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d02c57..f6b6826 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * FIX: setup: detect check_icmp also on 64-Bit CentOS (thanks to あきら) * FIX: setup.sh: create auth.serials, fix permissions of htpasswd + * FIX: livecheck: now able to handle check output up to 16kB Checks & Agents: * FIX: apc_symmetra_power: resurrect garble PNP template for diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index de6a790..0527b58 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -82,7 +82,7 @@ int main(int argc, char **argv) int is_host_check = service[0] == '\n'; struct timeb start; ftime(&start); - char output[8192]; + char output[16384]; int return_code; // Optimization(1): // If it's check_icmp, we use our inline version

11 years, 2 months

Check_MK Git: check_mk: FIX: jolokia_metrics.mem: error when missing max values

by Andreas Boesl

Module: check_mk Branch: master Commit: d969e3be3722d8f29d4acf73b939801a55e6c0ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d969e3be3722d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 3 10:27:52 2013 +0200 FIX: jolokia_metrics.mem: error when missing max values --- ChangeLog | 1 + checks/jolokia_metrics | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5672c3..2d02c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * check_http: now support the option -L (urlizing the result) * Added mem section to Mac OSX agent (Thanks to Brad Davis) * FIX: mssql.vbs (agent plugin) now sets auth options for each instance + * FIX: jolokia_metrics.mem: error when missing max values Multisite: * FIX: fix localization in non-OMD environment diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index ce2cd0e..f6040a7 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -202,40 +202,45 @@ def check_jolokia_metrics_mem(item, params, info): ("total", total, totalmax), ]: param_state = 0 - level_info = "" + level_info = "" + used_info = "" if params.get(what): + warn_level = "" + crit_level = "" if type(params[what][0]) == int: if what != "total": - warn_level = ("", value_max - params[what][0])[value_max != ""] - crit_level = ("", value_max - params[what][1])[value_max != ""] + if value_max: + warn_level = value_max - params[what][0] + crit_level = value_max - params[what][1] perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 - elif value_max - value <= params[what][1]: + elif value >= crit_level: param_state = 2 level_info = "%s(crit at %sMB free)" % (state_sign[2], params[what][1]) - elif value_max - value <= params[what][0]: + elif value >= warn_level: param_state = 1 level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) else: if what != "total": - warn_level = ("", value_max * params[what][0] / 100.0)[value_max != ""] - crit_level = ("", value_max * params[what][1] / 100.0)[value_max != ""] + if value_max: + warn_level = value_max * params[what][0] / 100.0 + crit_level = value_max * params[what][1] / 100.0 perfdata.append((what, value, warn_level, crit_level, "", value_max)) if not value_max: param_state = 0 - elif value >= value_max * params[what][1] / 100.0: + elif value >= crit_level: param_state = 2 level_info = "%s(crit at %s%%)" % (state_sign[2], params[what][1]) - elif value >= value_max * params[what][0] / 100.0: + elif value >= warn_level: param_state = 1 level_info = "%s(warn at %s%%)" % (state_sign[1], params[what][0]) else: if what != "total": perfdata.append((what, value, "", "", "", value_max)) - - used_info = ("", "/%.1f%% used" % (value / value_max * 100))[value_max != ""] + if value_max: + used_info = "/%.1f%% used" % (value / value_max * 100) info_list.append("%s: %0.fMB%s%s" % (what.title(), value, used_info, level_info)) worst_state = max(param_state, worst_state)

11 years, 2 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 4dc5601990ac851c9a58cb687273bfa539f7a7fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dc5601990ac85… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 3 10:03:21 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: notify.py: fixed syntax error

by Andreas Boesl

Module: check_mk Branch: master Commit: c63621cb795d8b23c87532543519e02ff4e6a106 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c63621cb795d8b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 3 10:03:17 2013 +0200 notify.py: fixed syntax error --- modules/notify.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index ee5df78..1a1762f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -450,7 +450,7 @@ def should_notify(context, entry): if skip: notify_log(" - Skipping: service '%s' matches non of %s" % ( servicedesc, ", ".join(entry["only_services"]))) - continue + return False # Check notification type event, allowed_events = check_notification_type(context, entry["host_events"], entry["service_events"])

11 years, 2 months

Check_MK Git: check_mk: Also populating empty auth serials file in page hook

by Lars Michelsen

Module: check_mk Branch: master Commit: e6f9219acdfa54110e790ede47afed433ae7107a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f9219acdfa54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 09:57:25 2013 +0200 Also populating empty auth serials file in page hook --- web/htdocs/userdb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 075a467..2d2853a 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -556,7 +556,7 @@ def general_page_hook(): # Create initial auth.serials file, same issue as auth.php above serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) - if not os.path.exists(serials_file): + if not os.path.exists(serials_file) or os.path.getsize(serials_file) == 0: save_users(load_users()) # Hook function can be registered here to execute actions on a "regular" base without

11 years, 2 months

Check_MK Git: check_mk: FIX: Escaping html entities when displaying comment fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 34ac703f9d5fa68a52c497fae0185b1244dfdeff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34ac703f9d5fa6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 09:53:41 2013 +0200 FIX: Escaping html entities when displaying comment fields --- ChangeLog | 1 + web/plugins/views/painters.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dacbce..b2736d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * Add $SERVICEOUTPUT$ and $HOSTOUTPUT$ to allowed macros for custom notes * FIX: Writing one clean message to webserver error_log when write fails + * FIX: Escaping html entities when displaying comment fields Notifications: * FIX: fix event type for recoveries diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index afa2242..08368f0 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -686,7 +686,7 @@ multisite_painters["check_manpage"] = { def paint_comments(prefix, row): comments = row[ prefix + "comments_with_info"] - text = ", ".join(["<i>%s</i>: %s" % (a,c) for (id,a,c) in comments ]) + text = ", ".join(["<i>%s</i>: %s" % (a, htmllib.attrencode(c)) for (id, a, c) in comments ]) return "", text multisite_painters["svc_comments"] = { @@ -1402,7 +1402,7 @@ multisite_painters["comment_author"] = { multisite_painters["comment_comment"] = { "title" : _("Comment text"), "columns" : ["comment_comment"], - "paint" : lambda row: (None, row["comment_comment"]), + "paint" : lambda row: (None, htmllib.attrencode(row["comment_comment"])), } multisite_painters["comment_what"] = { @@ -1481,7 +1481,7 @@ multisite_painters["downtime_comment"] = { "title" : _("Downtime comment"), "short" : _("Comment"), "columns" : ["downtime_comment"], - "paint" : lambda row: (None, row["downtime_comment"]), + "paint" : lambda row: (None, htmllib.attrencode(row["downtime_comment"])), } multisite_painters["downtime_fixed"] = {

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 534fbef3ec83c453bbcfc5d642865eaf5efc891f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=534fbef3ec83c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 3 09:58:13 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013