Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64685 discussions

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, 11 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, 11 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, 11 months

Check_MK Git: check_mk: #1438 FIX quicksearch: fixed various non-working quicksearch filters

by Andreas Boesl

Module: check_mk Branch: master Commit: 554e56aa8233c4d547eaff7b80fddaede60e7629 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554e56aa8233c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 14 12:02:54 2014 +0100 #1438 FIX quicksearch: fixed various non-working quicksearch filters Some of the view filters got renamed in the latest releases. These changes were not considered in the quicksearch plugins which refer to these filters. As a result the hostgroup (hg:) search did not work properly. Also the some multiple search filters (e.g. h: test s: cpu hg: testgroup) did omit the specified host- and servicegroup patterns. --- .werks/1438 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- web/plugins/sidebar/search.py | 16 ++++++++-------- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.werks/1438 b/.werks/1438 new file mode 100644 index 0000000..090a7e5 --- /dev/null +++ b/.werks/1438 @@ -0,0 +1,15 @@ +Title: quicksearch: fixed various non-working quicksearch filters +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415962691 + +Some of the view filters got renamed in the latest releases. +These changes were not considered in the quicksearch plugins which refer to these filters. + +As a result the hostgroup (hg:) search did not work properly. +Also the some multiple search filters (e.g. h: test s: cpu hg: testgroup) did omit the +specified host- and servicegroup patterns. diff --git a/ChangeLog b/ChangeLog index eebd7e1..0fe476a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 1494 FIX: Fixed error in NagVis Maps snapin when some users had no contact groups assigned * 1496 FIX: Fixed exception after editing a dashboard as user without permission to publish dashboards... * 1436 FIX: quicksearch: search with multiple patterns (h: / s:) no longer discards the host pattern... + * 1438 FIX: quicksearch: fixed various non-working quicksearch filters... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 4f4e212..faf8b34 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -783,7 +783,7 @@ def search_url_tmpl(used_filters, row, exact = True): if ty == 'hosts': return 'view.py?view_name=searchhost&host_regex=%(name)s&filled_in=filter' elif ty == 'hostgroups': - return 'view.py?view_name=hostgroups&hostgroup_name=%(name)s&site=%(site)s' + return 'view.py?view_name=hostgroups&hostgroup_regex=%(name)s&site=%(site)s' elif ty == 'servicegroups': return 'view.py?view_name=svcgroups&servicegroup_name=%(name)s&site=%(site)s' elif ty == 'services': diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 9b7aae8..7494ab6 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -211,17 +211,17 @@ def search_host_service_filter(filters, host_is_ip = False): def match_host_service_url_tmpl(used_filters, row_dict, host_is_ip = False): tmpl = 'view.py?view_name=searchsvc&filled_in=filter' - # Sorry, no support for multiple host- or servicegroups filters in match templates + # Sorry, no support for multiple host- or servicegroups filters in match templates (yet) for ty, entry in [ ("hostgroup", "host_groups"), ("servicegroup", "service_groups")]: if row_dict.get(entry): if type(row_dict[entry]) == list: row_dict[entry] = row_dict[entry][0] - for param, key in [ ("service_regex", "service_description"), - (host_is_ip and "host_address" or "host", "host_name"), - ("opthostgroup", "host_groups"), - ("optservicegroup", "service_groups"), - ("site", "site")]: + for param, key in [ ("service_regex", "service_description"), + (host_is_ip and "host_address" or "host_regex", "host_name"), + ("opthost_group", "host_groups"), + ("optservice_group", "service_groups"), + ("site", "site")]: if row_dict.get(key): tmpl_pre = "&%s=%%(%s)s" % (param, key) tmpl += tmpl_pre % row_dict @@ -245,8 +245,8 @@ def search_host_service_url_tmpl(used_filters, data, host_is_ip = False): for url_param, qs_name in [ ("service_regex", "services" ), host_is_ip and ("host_address", "host" )\ or ("host_regex", "hosts" ), - ("opthostgroup", "hostgroups" ), - ("optservicegroup", "servicegroups")]: + ("opthost_group", "hostgroups" ), + ("optservice_group", "servicegroups")]: if filters_combined.get(qs_name): tmpl_pre = "&%s=%%(%s)s" % (url_param, qs_name) tmpl += tmpl_pre % filters_combined

9 years, 11 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Goetz Golla

Module: check_mk Branch: master Commit: 8747e43aa8e2706cdda060b706c4a8ccabc7b006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8747e43aa8e270… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:54:39 2014 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1e51a82..7f8dea7 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2232 +2252

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1016, #1015

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b433023b7a23e64a759c21bf29d7f9784c6b6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b433023b7a23e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 17:44:36 2014 +0100 Updated bug entries #1016, #1015 --- .bugs/1015 | 17 +++++++++++++---- .bugs/1016 | 16 +++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.bugs/1015 b/.bugs/1015 index 7534a2c..76b0a83 100644 --- a/.bugs/1015 +++ b/.bugs/1015 @@ -1,9 +1,18 @@ -Title: HW/SW Inventory Check should not be applied to clusters +Title: HW/SW-Inventory Check should not be applied to clusters Component: inv State: open Date: 2014-11-13 17:11:09 Targetversion: future -Class: bug +Class: nastiness -When HW/SW Inventory is set to be applied to a group of hosts, clusters should be automatically excluded -since it does not make sense to include themn in the inventory +When HW/SW-Inventory is set to be applied to a group of hosts, +clusters should be automatically excluded +since it does not make sense to include them in the inventory. + +Problem: it is not clear of how to implement this. Check_MK rules +always apply to all hosts. Inventory is just one active check - +like many others. We would need a general enhancement for all +rules. Or we might restrict all active checks to physical +nodes. It could be helpful, however, to place something +like HTTP checks to cluster nodes that have IP-addresses, +though. diff --git a/.bugs/1016 b/.bugs/1016 index d28f5fc..4903548 100644 --- a/.bugs/1016 +++ b/.bugs/1016 @@ -3,9 +3,15 @@ Component: inv State: open Date: 2014-11-13 17:20:46 Targetversion: future -Class: nastiness +Class: cleanup -the inventory data stored in var/check_mk/inventory are stored in a regular text file as well as a gzipped version -for the file. This is redundant, and also may lead to problems when a hostname itself contains the postfix ".gz". -It also makes using scripts on the stored data inconvenient. -Data should be stored either in gzip format, or in text files, not both +the inventory data stored in var/check_mk/inventory are stored in a regular +text file as well as a gzipped version for the file. This is redundant, and +also may lead to problems when a hostname itself contains the postfix ".gz". +It also makes using scripts on the stored data inconvenient. Data should +be stored either in gzip format, or in text files, not both. + +On the other hand we need the gzipped file for fast replication. And we +need the unpacked files for fast access by the local Web-GUI. + +A solution could be to use two different directories.

9 years, 11 months

Check_MK Git: check_mk: Minor cleanup of code documentation

by Mathias Kettner

Module: check_mk Branch: master Commit: 12b44c36ce718e793ab999f366d4de2bc2fcbc27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12b44c36ce718e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 13 17:35:42 2014 +0100 Minor cleanup of code documentation --- web/htdocs/wato.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e2db49..5d4ca8e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17160,7 +17160,8 @@ def link_to_host(hostname): [("mode", "edithost"), ("host", hostname)]) -# .--API HELPERS---------------------------------------------------------. +#. +# .--API Helpers---------------------------------------------------------. # | _ ____ ___ _ _ _____ _ ____ _____ ____ ____ | # | / \ | _ \_ _| | | | | ____| | | _ \| ____| _ \/ ___| | # | / _ \ | |_) | | | |_| | _| | | | |_) | _| | |_) \___ \ | @@ -17308,6 +17309,7 @@ def delete_host(host): call_hook_hosts_changed(folder) +#. # .--WEB API-------------------------------------------------------------. # | __ _______ ____ _ ____ ___ | # | \ \ / / ____| __ ) / \ | _ \_ _| |

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1016

by Goetz Golla

Module: check_mk Branch: master Commit: 5750c3855869722b9f6015a9a4bdce06e8745cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5750c385586972… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:33:32 2014 +0100 Updated bug entries #1016 --- .bugs/1016 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1016 b/.bugs/1016 new file mode 100644 index 0000000..d28f5fc --- /dev/null +++ b/.bugs/1016 @@ -0,0 +1,11 @@ +Title: inventory data are stored in both a regular file and a gzipped file +Component: inv +State: open +Date: 2014-11-13 17:20:46 +Targetversion: future +Class: nastiness + +the inventory data stored in var/check_mk/inventory are stored in a regular text file as well as a gzipped version +for the file. This is redundant, and also may lead to problems when a hostname itself contains the postfix ".gz". +It also makes using scripts on the stored data inconvenient. +Data should be stored either in gzip format, or in text files, not both

9 years, 11 months

Check_MK Git: check_mk: extract_inventory.py: adapt script to the presence of extra files in var/check_mk/inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 28ffbdf09df2afdce4b1e32f7967dfd98ca65c80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ffbdf09df2af… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:31:17 2014 +0100 extract_inventory.py: adapt script to the presence of extra files in var/check_mk/inventory --- doc/treasures/inventory/extract_inventory.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/treasures/inventory/extract_inventory.py b/doc/treasures/inventory/extract_inventory.py index 9b53aae..5055f4a 100755 --- a/doc/treasures/inventory/extract_inventory.py +++ b/doc/treasures/inventory/extract_inventory.py @@ -224,6 +224,9 @@ def list_get(hostname, list_start): all_data = {} inventory_date = {} for hostname in os.listdir(inv_dir): + # ignore gziped files and invisible files in directory for now + if hostname.endswith(".gz") or hostname.startswith("."): + continue fn = inv_dir + hostname if os.path.isfile(fn): a = eval(open(fn,'r').read())

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1015

by Goetz Golla

Module: check_mk Branch: master Commit: fc7b3887188940311c7b29e6b18d6a738d72dd0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7b3887188940… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Nov 13 17:13:51 2014 +0100 Updated bug entries #1015 --- .bugs/1015 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1015 b/.bugs/1015 new file mode 100644 index 0000000..7534a2c --- /dev/null +++ b/.bugs/1015 @@ -0,0 +1,9 @@ +Title: HW/SW Inventory Check should not be applied to clusters +Component: inv +State: open +Date: 2014-11-13 17:11:09 +Targetversion: future +Class: bug + +When HW/SW Inventory is set to be applied to a group of hosts, clusters should be automatically excluded +since it does not make sense to include themn in the inventory

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits