Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3310 New dashlet which shows user notifications

by Simon Betz

Module: check_mk Branch: master Commit: e9f69b692a94a1587748ebdbf1de886d42c2808a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9f69b692a94a1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 4 09:53:18 2016 +0200 3310 New dashlet which shows user notifications --- .werks/3310 | 9 +++++ ChangeLog | 1 + web/htdocs/images/dashlet_notify_users.png | Bin 0 -> 3972 bytes web/htdocs/js/sidebar.js | 2 +- web/htdocs/notify.py | 4 ++ web/plugins/dashboard/dashlets.py | 60 +++++++++++++++++++++++++++- web/plugins/pages/shipped.py | 1 + 7 files changed, 75 insertions(+), 2 deletions(-) diff --git a/.werks/3310 b/.werks/3310 new file mode 100644 index 0000000..b5fb304 --- /dev/null +++ b/.werks/3310 @@ -0,0 +1,9 @@ +Title: New dashlet which shows user notifications +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1459756320 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 482918c..a439e94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 3288 Implemented grouping of services in table views... * 3297 SEC: Fixes possible XSS in views sidebar snapin... * 2237 Unique name for columns of Host Groups and Service Groups... + * 3310 New dashlet which shows user notifications * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/images/dashlet_notify_users.png b/web/htdocs/images/dashlet_notify_users.png new file mode 100644 index 0000000..74b9891 Binary files /dev/null and b/web/htdocs/images/dashlet_notify_users.png differ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 4b199cd..134281e 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -1004,7 +1004,7 @@ function read_message() { if (!c) return; - // extract message from teh message container + // extract message from the message container var hints = get_hint_messages(c); var msg = hints[0]; c.removeChild(msg); diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index 727ba3e..f49a599 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -85,6 +85,10 @@ def load_plugins(force): 'title': _('Send an E-Mail'), 'handler': notify_mail, }, + 'dashlet': { + 'title': _('Send hint to dashlet'), + 'handler': notify_gui_msg, + }, } dest_choices = [ diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 61fdad7..0af2067 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -29,7 +29,7 @@ try: except ImportError: import json -import sites +import sites, notify, table # .--Overview------------------------------------------------------------. # | ___ _ | @@ -818,3 +818,61 @@ dashlet_types["snapin"] = { )), ], } + + +#. +# .--Notify users--------------------------------------------------------. +# | _ _ _ _ __ | +# | | \ | | ___ | |_(_)/ _|_ _ _ _ ___ ___ _ __ ___ | +# | | \| |/ _ \| __| | |_| | | | | | | / __|/ _ \ '__/ __| | +# | | |\ | (_) | |_| | _| |_| | | |_| \__ \ __/ | \__ \ | +# | |_| \_|\___/ \__|_|_| \__, | \__,_|___/\___|_| |___/ | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Dashlet for notify user pop up messages | +# '----------------------------------------------------------------------' + + +def ajax_delete_user_notification(): + msg_id = html.var("id") + notify.delete_gui_message(msg_id) + + +def dashlet_notify_users(nr, dashlet): + + html.write('<div class="notify_users">') + table.begin("notify_users", sortable=False, searchable=False, omit_if_empty=True) + + + + for entry in sorted(notify.get_gui_messages(), key=lambda e: e["time"], reverse=True): + if "dashlet" in entry["methods"]: + table.row() + + msg_id = entry["id"] + datetime = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(entry['time'])) + message = entry["text"].replace("\n", " ") + + table.cell(_("Actions"), css="buttons", sortable=False) + html.icon_button("", _("Delete"), "delete", onclick="delete_user_notification('%s', this);" % msg_id) + + table.cell(_("Message"), html.attrencode(message)) + table.cell(_("Date"), datetime) + + table.end() + html.javascript('function delete_user_notification(msg_id, btn) {' + 'post_url("ajax_delete_user_notification.py", "id=" + msg_id);' + 'var row = btn.parentNode.parentNode;' + 'row.parentNode.removeChild(row);}') + + html.write("</div>") + + +dashlet_types["notify_users"] = { + "title" : _("User notifications"), + "description" : _("Display GUI notifications sent to users."), + "render" : dashlet_notify_users, + "sort_index" : 75, + "allowed" : config.builtin_role_ids, + "styles" : ".notify_users { width: 100%; height: 100%; overflow: auto; }" +} diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index bc01a31..797c99d 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -95,6 +95,7 @@ pagehandlers.update({ "create_view_dashlet" : dashboard.page_create_view_dashlet, "create_view_dashlet_infos": dashboard.page_create_view_dashlet_infos, "ajax_dashlet_pos" : dashboard.ajax_dashlet_pos, + "ajax_delete_user_notification" : lambda: dashboard.ajax_delete_user_notification(), "ajax_popup_add_visual" : visuals.ajax_popup_add, "ajax_add_visual" : visuals.ajax_add_visual,

8 years, 5 months

3017 FIX Fixed missing host/ vms inventory information when having multiple datacenters

by Andreas Boesl

Module: check_mk Branch: master Commit: 5c4084b22076a92be187da5de26dca554cc2d878 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c4084b22076a9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 4 09:25:00 2016 +0200 3017 FIX Fixed missing host/vms inventory information when having multiple datacenters The inventory data was incomplete when more than one datacenter was available. --- .werks/3017 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 31 ++++++++++++++++--------------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.werks/3017 b/.werks/3017 new file mode 100644 index 0000000..ef6650b --- /dev/null +++ b/.werks/3017 @@ -0,0 +1,9 @@ +Title: Fixed missing host/vms inventory information when having multiple datacenters +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459754630 +Class: fix + +The inventory data was incomplete when more than one datacenter was available. diff --git a/ChangeLog b/ChangeLog index d609d64..482918c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * 3110 FIX: ewon: Various improvements to snmp proxy functionality... NOTE: Please refer to the migration notes! * 3016 FIX: mk-job: scheduled jobs are now always executed despite of any status file permission problems... + * 3017 FIX: Fixed missing host/vms inventory information when having multiple datacenters... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 85da7df..f70284f 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1583,21 +1583,22 @@ if not error: if not opt_direct: reply_code, reply_msg, reply_headers, response = query_server(telegram_list["datacenters"]) - datacenter = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>.*', response)[0] - reply_code, reply_msg, reply_headers, response = query_server(telegram_list["clustersofdatacenter"], - payload_params = {"datacenter": datacenter} ) - clusters = get_pattern('<objects><obj type="ClusterComputeResource">(.*?)</obj>.*?string">(.*?)</val></propSet></objects>', response) - - output("<<<esx_vsphere_clusters:sep(9)>>>") - for cluster in clusters: - reply_code, reply_msg, reply_headers, response = query_server(telegram_list["esxhostsofcluster"], - payload_params = {"clustername": cluster[0]} ) - cluster_vms = [] - hosts = get_pattern('<objects><obj type="HostSystem">.*?string">(.*?)</val></propSet></objects>', response) - for host in hosts: - cluster_vms.extend(vm_esx_host.get(host, [])) - output("%s\thostsystems\t%s\t%s" % (datacenter, cluster[1], "\t".join(hosts))) - output("%s\tvms\t%s\t%s" % (datacenter, cluster[1], "\t".join(map(convert_hostname, cluster_vms)))) + datacenters = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>', response) + for datacenter in datacenters: + reply_code, reply_msg, reply_headers, response = query_server(telegram_list["clustersofdatacenter"], + payload_params = {"datacenter": datacenter} ) + clusters = get_pattern('<objects><obj type="ClusterComputeResource">(.*?)</obj>.*?string">(.*?)</val></propSet></objects>', response) + + output("<<<esx_vsphere_clusters:sep(9)>>>") + for cluster in clusters: + reply_code, reply_msg, reply_headers, response = query_server(telegram_list["esxhostsofcluster"], + payload_params = {"clustername": cluster[0]} ) + cluster_vms = [] + hosts = get_pattern('<objects><obj type="HostSystem">.*?string">(.*?)</val></propSet></objects>', response) + for host in hosts: + cluster_vms.extend(vm_esx_host.get(host, [])) + output("%s\thostsystems\t%s\t%s" % (datacenter, cluster[1], "\t".join(hosts))) + output("%s\tvms\t%s\t%s" % (datacenter, cluster[1], "\t".join(map(convert_hostname, cluster_vms)))) output("<<<esx_vsphere_objects:sep(9)>>>")

8 years, 5 months

3239 The delay and the period of notifications can be fractions of a minute now.

by Sven Panne

Module: check_mk Branch: master Commit: 8878b781354aa7f632bb1a5f07521af1ea8216dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8878b781354aa7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 4 08:39:52 2016 +0200 3239 The delay and the period of notifications can be fractions of a minute now. --- .werks/3239 | 10 ++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 76 ++++++++++++++++------------ 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/.werks/3239 b/.werks/3239 new file mode 100644 index 0000000..0887988 --- /dev/null +++ b/.werks/3239 @@ -0,0 +1,10 @@ +Title: The delay and the period of notifications can be fractions of a minute now. +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459751927 + + diff --git a/ChangeLog b/ChangeLog index 1a3c00b..d609d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 3002 Treasure script wato_import.py: now able to set wato host tag groups * 3003 New treasure script: migrate_oldcmk2wato.py... * 3304 Bulk deleting users is now available + * 3239 The delay and the period of notifications can be fractions of a minute now. * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 64c783e..4b6ff2b 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1520,49 +1520,58 @@ register_rule(group, register_rule(group, "extra_host_conf:first_notification_delay", - Integer( - minvalue = 0, - default_value = 60, - label = _("Delay:"), - unit = _("minutes"), - title = _("Delay host notifications"), - help = _("This setting delays notifications about host problems by the " - "specified amount of time. If the host is up again within that " - "time, no notification will be sent out."), + Transform( + Float( + minvalue = 0.0, + default_value = 60.0, + label = _("Delay:"), + unit = _("minutes"), + title = _("Delay host notifications"), + help = _("This setting delays notifications about host problems by the " + "specified amount of time. If the host is up again within that " + "time, no notification will be sent out."), + ), + forth = lambda x: float(x), ), - factory_default = 0, + factory_default = 0.0, ) register_rule(group, "extra_service_conf:first_notification_delay", - Integer( - minvalue = 0, - default_value = 60, - label = _("Delay:"), - unit = _("minutes"), - title = _("Delay service notifications"), - help = _("This setting delays notifications about service problems by the " - "specified amount of time. If the service is OK again within that " - "time, no notification will be sent out."), + Transform( + Float( + minvalue = 0.0, + default_value = 60.0, + label = _("Delay:"), + unit = _("minutes"), + title = _("Delay service notifications"), + help = _("This setting delays notifications about service problems by the " + "specified amount of time. If the service is OK again within that " + "time, no notification will be sent out."), + ), + forth = lambda x: float(x), ), - factory_default = 0, + factory_default = 0.0, itemtype = "service") register_rule(group, "extra_host_conf:notification_interval", Optional( - Integer( - minvalue = 1, - default_value = 120, - label = _("Interval:"), - unit = _("minutes")), + Transform( + Float( + minvalue = 0.05, + default_value = 120.0, + label = _("Interval:"), + unit = _("minutes")), + forth = lambda x: float(x), + ), title = _("Periodic notifications during host problems"), help = _("If you enable periodic notifications, then during a problem state " "of the host notifications will be sent out in regular intervals " "until the problem is acknowledged."), label = _("Enable periodic notifications"), none_label = _("disabled"), - none_value = 0, + none_value = 0.0, ) ) @@ -1571,18 +1580,21 @@ register_rule(group, register_rule(group, "extra_service_conf:notification_interval", Optional( - Integer( - minvalue = 1, - default_value = 120, - label = _("Interval:"), - unit = _("minutes")), + Transform( + Float( + minvalue = 0.05, + default_value = 120.0, + label = _("Interval:"), + unit = _("minutes")), + forth = lambda x: float(x), + ), title = _("Periodic notifications during service problems"), help = _("If you enable periodic notifications, then during a problem state " "of the service notifications will be sent out in regular intervals " "until the problem is acknowledged."), label = _("Enable periodic notifications"), none_label = _("disabled"), - none_value = 0, + none_value = 0.0, ), itemtype = "service")

8 years, 5 months

Cleaned up subclassing of GUITester

by Lars Michelsen

Module: check_mk Branch: master Commit: 746d6b71728af1c60d344086c4abc3b91ea1e876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746d6b71728af1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 1 17:27:45 2016 +0200 Cleaned up subclassing of GUITester --- web/htdocs/guitester.py | 47 ++++++++++++++++++++++++++++++++++++++--- web/htdocs/html_mod_python.py | 5 ----- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index 3be4f73..6929273 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -41,6 +41,10 @@ class MKGuitestFailed(MKException): class GUITester: def __init__(self): + # Are overridden later by html() + self.user = None + self.start_time = None + self.guitest = None self.replayed_guitest_step = None self.guitest_repair_step = None @@ -104,6 +108,11 @@ class GUITester: raise MKGeneralException(_("Cannot load GUI test file %s: %s") % (self.attrencode(path), e)) + def guitest_fake_login(self, user_id): + config.login(user_id) + self.user = user_id + + def replay_guitest(self): test_name = self.var("test") if not test_name: @@ -186,16 +195,48 @@ class GUITester: return guitest_check_element_list + # + # Abstract methods, are in html() object + # + + def add_status_icon(self, img, tooltip, url = None): + raise NotImplementedError() + + + def attrencode(self, value): + raise NotImplementedError() + + + def var(self, varname, deflt = None): + raise NotImplementedError() + + + def get_transid(self): + raise NotImplementedError() + + + def store_new_transids(self): + raise NotImplementedError() + + + def write(self, text): + raise NotImplementedError() + + + def guitest_check_single_value(reference, reality): + errors = [] + if len(reference) > 1: errors.append("More than one reference value: %s" % ", ".join(reference)) if len(reality) > 1: errors.append("More than one value: %s" % ", ".join(reality)) + diff_text = guitest_check_text(reference[0], reality[0]) if diff_text: - return [ diff_text ] - else: - return [] + errors.append(diff_text) + + return errors def guitest_check_element_list_with_exceeding(reference, reality): diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 4c49a25..715126e 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -93,11 +93,6 @@ class html_mod_python(htmllib.html): return self.req.headers_in.get('Referer', '') - def guitest_fake_login(self, user_id): - config.login(user_id) - self.user = user_id - - def verify_not_using_threaded_mpm(self): if apache.mpm_query(apache.AP_MPMQ_IS_THREADED) != 0: raise MKGeneralException(

8 years, 5 months

Fixed typo in Werk title

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b2aae6cb8c3f85e92225a6eea2962211d2999ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b2aae6cb8c3f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 4 08:34:02 2016 +0200 Fixed typo in Werk title --- .werks/3355 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3355 b/.werks/3355 index d71b0dc..1d3c398 100644 --- a/.werks/3355 +++ b/.werks/3355 @@ -1,4 +1,4 @@ -Title: Fixed possible borken HW-/SW-Inventory history view +Title: Fixed possible broken HW-/SW-Inventory history view Level: 1 Component: multisite Class: fix diff --git a/ChangeLog b/ChangeLog index e8baf21..1a3c00b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,7 +152,7 @@ * 3344 FIX: Removed host inventory painters and sorters from non host based views * 3345 FIX: Fixed exception when inventory painter was used as group painter * 3347 FIX: Improved performance when having a lot of users... - * 3355 FIX: Fixed possible borken HW-/SW-Inventory history view + * 3355 FIX: Fixed possible broken HW-/SW-Inventory history view WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection...

8 years, 5 months

Added GTAGS convenience target to top-level Makefile.

by Sven Panne

Module: check_mk Branch: master Commit: 58e920562ff9d3c0b90cdd01baa865813b64cc10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58e920562ff9d3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 4 08:10:31 2016 +0200 Added GTAGS convenience target to top-level Makefile. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0e0a9e..4956bb5 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix bin/,*.cc *.c *.h)) .PHONY: all analyze check check-binaries check-permissions check-spaces \ - check-version clean cppcheck dist documentation format headers \ + check-version clean cppcheck dist documentation format GTAGS headers \ healspaces help iwyu minify-js mk-livestatus mrproper \ optimize-images packages setup setversion tidy version @@ -267,6 +267,10 @@ mrproper: setup: sudo apt-get install figlet pngcrush slimit bear dietlibc-dev +GTAGS: + $(MAKE) -C livestatus distclean-tags + $(MAKE) -C livestatus GTAGS + compile_commands.json: $(FILES_TO_FORMAT) $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8

8 years, 5 months

Refactored matrix_find_majorities to have a clear return type

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f716fca22901ed89c0e549416caa3016c94cb15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f716fca22901e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 1 16:58:21 2016 +0200 Refactored matrix_find_majorities to have a clear return type --- web/plugins/views/layouts.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index da9a95d..5640a3c 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -661,8 +661,8 @@ multisite_layouts["table"] = { def render_matrix(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): - header_majorities = matrix_find_majorities(rows, group_painters, True) - value_counts, row_majorities = matrix_find_majorities(rows, painters, False) + header_majorities = matrix_find_majorities_for_header(rows, group_painters) + value_counts, row_majorities = matrix_find_majorities(rows, painters) for groups, unique_row_ids, matrix_cells in \ create_matrices(rows, group_painters, painters, num_columns): @@ -732,7 +732,7 @@ def csv_export_matrix(rows, view, group_painters, painters): output_csv_headers(view) groups, unique_row_ids, matrix_cells = list(create_matrices(rows, group_painters, painters, num_columns=None))[0] - value_counts, row_majorities = matrix_find_majorities(rows, painters, False) + value_counts, row_majorities = matrix_find_majorities(rows, painters) table.begin(output_format="csv") for painter_nr, painter in enumerate(group_painters): @@ -770,7 +770,12 @@ def csv_export_matrix(rows, view, group_painters, painters): table.end() -def matrix_find_majorities(rows, painters, for_header): +def matrix_find_majorities_for_header(rows, painters): + counts, majorities = matrix_find_majorities(rows, painters, for_header=True) + return majorities.get(None, {}) + + +def matrix_find_majorities(rows, painters, for_header=False): counts = {} # dict row_id -> painter_nr -> value -> count for row in rows: @@ -778,6 +783,7 @@ def matrix_find_majorities(rows, painters, for_header): row_id = None else: row_id = tuple(group_value(row, [ painters[0] ])) + for painter_nr, painter in enumerate(painters[1:]): value = group_value(row, [painter]) row_entry = counts.setdefault(row_id, {}) @@ -805,10 +811,8 @@ def matrix_find_majorities(rows, painters, for_header): maj_entry[painter_nr] = maj_value - if for_header: - return majorities.get(None, {}) - else: - return counts, majorities + return counts, majorities + # Create list of matrices to render def create_matrices(rows, group_painters, painters, num_columns):

8 years, 6 months

3016 FIX mk-job: scheduled jobs are now always executed despite of any status file permission problems

by Andreas Boesl

Module: check_mk Branch: master Commit: f131580f2cb9a8d5d9343261d739e887dde79227 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f131580f2cb9a8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 1 13:59:44 2016 +0200 3016 FIX mk-job: scheduled jobs are now always executed despite of any status file permission problems The mk-job call could fail if the status file for this command could not get created due to permission problems. With this fix insufficient permissions now only prevent the creation of the status file. The command itself is executed nevertheless. --- .werks/3016 | 11 +++++++++++ ChangeLog | 1 + agents/mk-job | 11 ++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/3016 b/.werks/3016 new file mode 100644 index 0000000..3ab6323 --- /dev/null +++ b/.werks/3016 @@ -0,0 +1,11 @@ +Title: mk-job: scheduled jobs are now always executed despite of any status file permission problems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459511566 +Class: fix + +The mk-job call could fail if the status file for this command could not get created +due to permission problems. With this fix insufficient permissions now only prevent the creation of the status file. +The command itself is executed nevertheless. diff --git a/ChangeLog b/ChangeLog index 1c9dd97..e8baf21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 3015 FIX: Dump host (cmk -D): fixed exception with service descriptions containing umlauts * 3110 FIX: ewon: Various improvements to snmp proxy functionality... NOTE: Please refer to the migration notes! + * 3016 FIX: mk-job: scheduled jobs are now always executed despite of any status file permission problems... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/mk-job b/agents/mk-job index 46bc862..342df2b 100755 --- a/agents/mk-job +++ b/agents/mk-job @@ -62,7 +62,16 @@ if ! type $1 >/dev/null 2>&1; then exit 1 fi -date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running" +date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running" 2>/dev/null + +if [ ! -w "$OUTPUT_PATH/$IDENT.running" ] ; then + # Looks like we are lacking the permissions to create this file.. + # In this scenario no mk-job status file is created. We simply execute the command + $@ + exit $? +fi + + /usr/bin/time -o "$OUTPUT_PATH/$IDENT.running" --append \ -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads %I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches %c\nvol_context_switches %w" "$@" RC=$?

8 years, 6 months

3358 FIX Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: d3489b887dce16a9f53ba2e74ba754dc86049852 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3489b887dce16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 1 13:50:25 2016 +0200 3358 FIX Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled --- .werks/3358 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 14 ++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.werks/3358 b/.werks/3358 new file mode 100644 index 0000000..88185db --- /dev/null +++ b/.werks/3358 @@ -0,0 +1,10 @@ +Title: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459511339 + + diff --git a/ChangeLog b/ChangeLog index 8bb2aec..1c9dd97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -208,6 +208,7 @@ * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... * 3291 FIX: Improved error handling when searching for BI aggregations with invalid regex + * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index be7e25f..17528c0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1251,9 +1251,6 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc columns = [ "name", "host_name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth", "host_in_service_period", "acknowledged", "services_with_fullstate", "parents" ] + add_columns - sites.live().set_only_sites(only_sites) - sites.live().set_prepend_site(True) - query = "GET hosts%s\n" % (bygroup and "bygroup" or "") query += "Columns: " + (" ".join(columns)) + "\n" query += filter_header @@ -1265,10 +1262,14 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc sites.live().set_only_sites(only_sites) sites.live().set_prepend_site(True) - sites.live().set_auth_domain('bi') + data = sites.live().query(query) + html.live.set_only_sites(only_sites) + html.live.set_prepend_site(True) + html.live.set_auth_domain('bi') + sites.live().set_prepend_site(False) sites.live().set_only_sites(None) sites.live().set_auth_domain('read') @@ -1282,10 +1283,11 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc # host_aggregation construct. if fetch_parents: parent_filter = [] - for row in data: - parent_filter += [ 'Filter: name = %s\n' % p for p in row[8] ] + for row in rows: + parent_filter += [ 'Filter: name = %s\n' % p for p in row["services_with_fullstate"] ] parent_filter_txt = ''.join(parent_filter) parent_filter_txt += 'Or: %d\n' % len(parent_filter) + for row in get_status_info_filtered(filter_header, only_sites, limit, add_columns, False, bygroup): if row['name'] not in hostnames: rows.append(row)

8 years, 6 months

3357 FIX Fixed service conditions of Disk IO related rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: eb9a10ddf934a2a90223485c187d90a93507d2a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb9a10ddf934a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 1 10:46:09 2016 +0200 3357 FIX Fixed service conditions of Disk IO related rulesets --- .werks/3357 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 16 ++++------------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.werks/3357 b/.werks/3357 new file mode 100644 index 0000000..04980f9 --- /dev/null +++ b/.werks/3357 @@ -0,0 +1,10 @@ +Title: Fixed service conditions of Disk IO related rulesets +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459500350 + + diff --git a/ChangeLog b/ChangeLog index 9f0e2f4..8bb2aec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ * 3352 FIX: Network scan: Added hostname translation to translate detected DNS names of scanned hosts * 3353 FIX: Displaying disabled/offline host state in WATO host list now * 3354 FIX: Added missing option to exclude IP addresses by regex + * 3357 FIX: Fixed service conditions of Disk IO related rulesets Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 12b8b7f..a5b4aca 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7378,14 +7378,12 @@ register_check_parameters( default_value = 300, )), ]), - OptionalDropdownChoice( - choices = [ ( "SUMMARY", _("Summary of all disks") ), ], - otherlabel = _("On explicit devices ->"), - explicit = TextAscii(allow_empty = False), + TextAscii( title = _("Device"), help = _("For a summarized throughput of all disks, specify <tt>SUMMARY</tt>, " "a per-disk IO is specified by the drive letter, a colon and a slash on Windows " - "(e.g. <tt>C:/</tt>) or by the device name on Linux/UNIX (e.g. <tt>/dev/sda</tt>).")), + "(e.g. <tt>C:/</tt>) or by the device name on Linux/UNIX (e.g. <tt>/dev/sda</tt>).") + ), "dict", ) @@ -7456,13 +7454,7 @@ register_check_parameters( "if you are running PNP4Nagios in SINGLE mode.")), ), ]), - OptionalDropdownChoice( - choices = [ ( "SUMMARY", _("Summary of all disks") ), - ( "read", _("Summary of disk input (read)") ), - ( "write", _("Summary of disk output (write)") ), - ], - otherlabel = _("On explicit devices ->"), - explicit = TextAscii(allow_empty = False), + TextAscii( title = _("Device"), help = _("For a summarized throughput of all disks, specify <tt>SUMMARY</tt>, for a " "sum of read or write throughput write <tt>read</tt> or <tt>write</tt> resp. "

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016