Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: liveproxyd: try to avoid 100% CPU situation where errno is not defined

by Mathias Kettner

Module: check_mk Branch: master Commit: 60b93ac3dd03d0cf839733b9f9cc059b3527bcb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b93ac3dd03d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 15:56:14 2014 +0100 liveproxyd: try to avoid 100% CPU situation where errno is not defined --- doc/treasures/liveproxy/liveproxyd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index afc4ff6..db0f64a 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -121,6 +121,11 @@ def initiate_connections(): try: s.connect(siteconf["socket"]) except socket.error, e: + try: + errno = e.errno + except: + errno = None + if e.errno != 115: # "Operation now in progress" sitestate["last_failed_connect"] = time.time() if opt_debug:

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2225

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a5edb052892bc32b912c58e03c6876aeccfa7ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a5edb052892bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 15:27:27 2014 +0100 Updated bug entries #2225 --- .bugs/2225 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2225 b/.bugs/2225 new file mode 100644 index 0000000..ce19421 --- /dev/null +++ b/.bugs/2225 @@ -0,0 +1,10 @@ +Title: Host diagnostics partially broken +Component: wato +State: open +Date: 2014-11-17 15:26:35 +Targetversion: 1.2.5i1 +Class: bug + +The host diagnostics in WATO only refreshes two of the five boxes. Always +the first and by random one of the others. By clicking on the arrows you +can force updates - however.

9 years, 7 months

Check_MK Git: check_mk: #1513 FIX Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22

by Mathias Kettner

Module: check_mk Branch: master Commit: 53942579195e0eca5aff72a25e888ac85ee1076a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53942579195e0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 15:26:15 2014 +0100 #1513 FIX Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22 This firmware sometimes responds with duplicate OIDs on a bulk walk. This has been fixed by ignoring consecutive answers for the same OID. --- .werks/1513 | 11 +++++++++++ ChangeLog | 1 + modules/snmp.py | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/1513 b/.werks/1513 new file mode 100644 index 0000000..fe089cb --- /dev/null +++ b/.werks/1513 @@ -0,0 +1,11 @@ +Title: Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416234308 +Class: fix + +This firmware sometimes responds with duplicate OIDs on a bulk walk. This has +been fixed by ignoring consecutive answers for the same OID. + diff --git a/ChangeLog b/ChangeLog index 2eb70db..a1d651a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ NOTE: Please refer to the migration notes! * 1437 FIX: veeam_jobs: fixed incorrect state for BackupSync job... * 1511 FIX: oracle_jobs: avoid broken checks, make compatible with old version... + * 1513 FIX: Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/modules/snmp.py b/modules/snmp.py index c45ff46..159e2a4 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -133,7 +133,6 @@ def get_snmp_table(hostname, ip, check_type, oid_info): index_format = column continue - if opt_use_snmp_walk or is_usewalk_host(hostname): rowinfo = get_stored_snmpwalk(hostname, fetchoid) elif has_inline_snmp and use_inline_snmp: @@ -141,6 +140,15 @@ def get_snmp_table(hostname, ip, check_type, oid_info): else: rowinfo = snmpwalk_on_suboid(hostname, ip, fetchoid) + # I've seen a broken device (Mikrotik Router), that broke after an + # update to RouterOS v6.22. It would return 9 time the same OID when + # .1.3.6.1.2.1.1.1.0 was being walked. We try to detect these situations + # by removing any duplicate OID information + if len(rowinfo) > 1 and rowinfo[0][0] == rowinfo[1][0]: + if opt_verbose: + sys.stderr.write("Detected broken SNMP agent. Ignoring duplicate OID %s.\n" % rowinfo[0][0]) + rowinfo = rowinfo[:1] + columns.append((fetchoid, rowinfo)) number_rows = len(rowinfo) if len(rowinfo) > max_len:

9 years, 7 months

Check_MK Git: check_mk: Fix SNMP host diagnostics: was recenty broken due to new OID range limits

by Mathias Kettner

Module: check_mk Branch: master Commit: b3d0920163de7ce8e3fd3d8cfd78037e9352afd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d0920163de7c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 15:25:03 2014 +0100 Fix SNMP host diagnostics: was recenty broken due to new OID range limits --- modules/automation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 6dffd46..4a84981 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -877,7 +877,7 @@ def automation_diag_host(args): else: return 1, "SNMP command not implemented" - data = get_snmp_table(hostname, ipaddress, ('.1.3.6.1.2.1.1', ['1.0', '4.0', '5.0', '6.0'])) + data = get_snmp_table(hostname, ipaddress, None, ('.1.3.6.1.2.1.1', ['1.0', '4.0', '5.0', '6.0'])) if data: return 0, 'sysDescr:\t%s\nsysContact:\t%s\nsysName:\t%s\nsysLocation:\t%s\n' % tuple(data[0]) else: @@ -887,6 +887,8 @@ def automation_diag_host(args): return 1, "Command not implemented" except Exception, e: + if opt_debug: + raise return 1, str(e) # WATO calls this automation when a host has been renamed. We need to change

9 years, 7 months

Check_MK Git: check_mk: Fix invalid path to inventory files after reload

by Mathias Kettner

Module: check_mk Branch: master Commit: 66ce1c93deb902381606e265abd049297e112966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66ce1c93deb902… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 14:45:20 2014 +0100 Fix invalid path to inventory files after reload --- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/HostFileColumn.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index d38b92d..b876313 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -65,7 +65,7 @@ char *HostFileColumn::getBlob(void *data, int *size) #endif char path[4096]; - snprintf(path, sizeof(path), "%s/%s%s", _base_dir, host_name, _suffix); + snprintf(path, sizeof(path), "%s/%s%s", _base_dir.c_str(), host_name, _suffix.c_str()); int fd = open(path, O_RDONLY); if (fd < 0) { return 0; diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index 04fdadd..11ae20a 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -29,10 +29,10 @@ class HostFileColumn : public BlobColumn { - const char *_base_dir; - const char *_suffix; + string _base_dir; + string _suffix; public: - HostFileColumn(string name, string description, const char *base_dir, + HostFileColumn(string name, string description, const char *base_dir, const char *suffice, int indirect_offset); // returns a buffer to be freed afterwards!!

9 years, 7 months

Check_MK Git: check_mk: #1512 Bulk notification can now be grouped according to custom macro values

by Mathias Kettner

Module: check_mk Branch: master Commit: b796073e9a6c5545b38bc28c8d8e21b1b93dfbf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b796073e9a6c55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 12:23:51 2014 +0100 #1512 Bulk notification can now be grouped according to custom macro values When you configure notification bulking you can now let the value of one or several host/service custom macros decide in which bulk a notification email goes. For example you can select the variable <tt>FOO</tt> to be used for grouping. Then for each different value of this macro a separate bulk will be created. --- .werks/1512 | 13 +++++++++++++ ChangeLog | 1 + modules/notify.py | 9 ++++++++- web/htdocs/wato.py | 14 ++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.werks/1512 b/.werks/1512 new file mode 100644 index 0000000..398292b --- /dev/null +++ b/.werks/1512 @@ -0,0 +1,13 @@ +Title: Bulk notification can now be grouped according to custom macro values +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1416223329 +Class: feature + +When you configure notification bulking you can now let the value of +one or several host/service custom macros decide in which bulk a +notification email goes. For example you can select the variable <tt>FOO</tt> +to be used for grouping. Then for each different value of this macro +a separate bulk will be created. diff --git a/ChangeLog b/ChangeLog index 0fe476a..2eb70db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 1498 FIX: Fixed displaying of global settings titles / help texts... Notifications: + * 1512 Bulk notification can now be grouped according to custom macro values... * 1168 FIX: HTML mails can now be configured to display graphs among each other... BI: diff --git a/modules/notify.py b/modules/notify.py index 3c0d063..f9d6164 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1443,7 +1443,7 @@ def do_bulk_notify(contact, plugin, params, plugin_context, bulk): # 2. plugin # 3. time horizon (interval) in seconds # 4. max bulked notifications - # 5. elements specified in bulk["groupby"] + # 5. elements specified in bulk["groupby"] and bulk["groupby_custom"] # We first create a bulk path constructed as a tuple of strings. # Later we convert that to a unique directory name. # Note: if you have separate bulk rules with exactly the same @@ -1468,6 +1468,13 @@ def do_bulk_notify(contact, plugin, params, plugin_context, bulk): state = plugin_context.get(what + "STATE", "") bulk_path += ("state", state) + # User might have specified _FOO instead of FOO + bulkby_custom = bulk.get("groupby_custom", []) + for macroname in bulkby_custom: + macroname = macroname.lstrip("_").upper() + value = plugin_context.get(what + "_" + macroname, "") + bulk_path += (macroname.lower(), value) + notify_log(" --> storing for bulk notification %s" % "|".join(bulk_path)) bulk_dirname = create_bulk_dirname(bulk_path) uuid = fresh_uuid() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5d4ca8e..5b68ffe 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8511,6 +8511,20 @@ def vs_notification_rule(userid = None): ( "groupby", vs_notification_bulkby(), ), + ( "groupby_custom", + ListOfStrings( + valuespec = ID(), + orientation = "horizontal", + title = _("Create separate notification bulks for different values of the following custom macros"), + help = _("If you enter the names of host/service-custom macros here then for each different " + "combination of values of those macros a separate bulk will be created. This can be used " + "in combination with the grouping by folder, host etc. Omit any leading underscore. " + "Note: If you are using " + "Nagios as a core you need to make sure that the values of the required macros are " + "present in the notification context. This is done in <tt>check_mk_templates.cfg</tt>. If you " + "macro is <tt>_FOO</tt> then you need to add the variables <tt>NOTIFY_HOST_FOO</tt> and " + "<tt>NOTIFY_SERVICE_FOO</tt>."), + )), ], columns = 1, optional_keys = False,

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2224

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f528a7ed38b997b250e4ac80be5e735073e698b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f528a7ed38b99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 17 11:36:54 2014 +0100 Updated bug entries #2224 --- .bugs/2224 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2224 b/.bugs/2224 new file mode 100644 index 0000000..e273344 --- /dev/null +++ b/.bugs/2224 @@ -0,0 +1,11 @@ +Title: Options for Email notification not visible when entering rule +Component: wato +State: open +Date: 2014-11-17 11:35:35 +Targetversion: 1.2.5i1 +Class: bug + +When you go to the default rule in the RBN then the method +is set to HTML Email, but the actual options are not visible. +When you switch back and forth between Cancel, then they +become visible. Seems to be a bug in the valuespec.

9 years, 7 months

Check_MK Git: check_mk: New command option for expiration of acknowledgments

by Mathias Kettner

Module: check_mk Branch: master Commit: 3aa6dd04bc9263d1cd6543e191669d8202396c2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aa6dd04bc9263… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 14 16:59:02 2014 +0100 New command option for expiration of acknowledgments This only works with the CMC. --- web/plugins/icons/builtin.py | 2 +- web/plugins/views/builtin.py | 2 ++ web/plugins/views/commands.py | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 4ff1809..47be9e7 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -375,7 +375,7 @@ multisite_icons.append({ # +----------------------------------------------------------------------+ def paint_comments(what, row, tags, custom_vars): - comments = row[what+ "_comments_with_extra_info"] + comments = row[what + "_comments_with_extra_info"] if len(comments) > 0: text = "" for c in comments: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 24725f5..efa9c92 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -323,6 +323,7 @@ multisite_builtin_views.update({ 'painters': [('comment_author', None), ('comment_comment', None), ('comment_time', None), + ('comment_expires', None), ('comment_entry_type', None)], 'public': True, 'show_filters': [], @@ -348,6 +349,7 @@ multisite_builtin_views.update({ 'painters': [('comment_author', None), ('comment_comment', None), ('comment_time', None), + ('comment_expires', None), ('comment_entry_type', None)], 'public': True, 'show_filters': [], diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 19d2605..493500f 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -270,12 +270,23 @@ def command_acknowledgement(cmdtag, spec, row): comment = html.var_utf8("_ack_comment") if not comment: raise MKUserError("_ack_comment", _("You need to supply a comment.")) + if ";" in comment: + raise MKUserError("_ack_comment", _("The comment must not contain semicolons.")) sticky = html.var("_ack_sticky") and 2 or 0 sendnot = html.var("_ack_notify") and 1 or 0 perscomm = html.var("_ack_persistent") and 1 or 0 + + expire_secs = Age().from_html_vars("_ack_expire") + if expire_secs: + expire = int(time.time()) + expire_secs + else: + expire = 0 + command = "ACKNOWLEDGE_" + cmdtag + "_PROBLEM;%s;%d;%d;%d;%s" % \ - (spec, sticky, sendnot, perscomm, config.user_id) + (";%s" % lqencode(comment)) - title = _("acknowledge the problems of") + (spec, sticky, sendnot, perscomm, config.user_id) + (";%s" % lqencode(comment)) \ + + (";%d" % expire) + title = _("acknowledge the problems%s of") % \ + (expire and (_(" for a period of %s") % Age().value_to_text(expire_secs)) or "") return command, title elif html.var("_remove_ack"): @@ -296,6 +307,9 @@ multisite_commands.append({ html.checkbox("_ack_notify", True, label=_("send notification")) == \ html.checkbox("_ack_persistent", False, label=_('persistent comment')) == \ html.write("<hr>") == \ + Age(display=["days", "hours", "minutes"], label=_("Expire acknowledgement after")).render_input("_ack_expire", 0) == \ + html.help(_("Note: Expiration of acknowledgements only works when using the Check_MK Micro Core.")) == \ + html.write("<hr>") == \ html.write(_("Comment") + ": ") == \ html.text_input("_ack_comment", size=48, submit="_acknowledge"), "action" : command_acknowledgement,

9 years, 7 months

Check_MK Git: check_mk: liveproxyd: create inventory dir if it does not exist

by Andreas Boesl

Module: check_mk Branch: master Commit: 618d0b1294d7787f3d9dce9b4063d88d8787c8d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=618d0b1294d778… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 14 15:01:31 2014 +0100 liveproxyd: create inventory dir if it does not exist --- doc/treasures/liveproxy/liveproxyd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 4f6d6f4..afc4ff6 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -716,6 +716,9 @@ def check_inventory_update(mk_inventory_last, sitename): if not opt_inventory_dir: return # only works if this is set + if not os.path.exists(opt_inventory_dir): + os.makedirs(opt_inventory_dir) + sitestatus = g_sites[sitename] if sitestatus["inventory_pid"]: return # Sync already running

9 years, 7 months

Check_MK Git: check_mk: Internal code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: f7f29f888f09736ccc933f218d5bb7c54a42b063 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7f29f888f0973… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 14 12:31:14 2014 +0100 Internal code cleanup --- agents/special/agent_activemq | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/special/agent_activemq b/agents/special/agent_activemq index 902604d..77c87a7 100755 --- a/agents/special/agent_activemq +++ b/agents/special/agent_activemq @@ -28,19 +28,19 @@ from lxml import etree import sys if len(sys.argv) > 3: - piggybag_mode = True + piggyback_mode = True else: - piggybag_mode = False + piggyback_mode = False address = "http://%s:%s/admin/xml/queues.jsp" % (sys.argv[1], sys.argv[2]) attributes = [ 'size', 'consumerCount', 'enqueueCount', 'dequeueCount' ] data = etree.parse(address).getroot() count = 0 -if not piggybag_mode: +if not piggyback_mode: print "<<<mq_queues>>>" for line in data: count += 1 - if piggybag_mode: + if piggyback_mode: print "<<<<%s>>>>" % line.get('name') print "<<<mq_queues>>>" print "[[%s]]" % line.get('name') @@ -50,7 +50,7 @@ for line in data: values +="%s " % stats[0].get(job) print values -if piggybag_mode: +if piggyback_mode: print "<<<<>>>>" print "<<<local>>>" print "0 Actice_MQ - Found %s Queues in total" % count

9 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014