Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4761 FIX Fixed multisite setups with sites using Check_MK/Livestatus < 1.4

by Lars Michelsen

Module: check_mk Branch: master Commit: d98ff03d7af390ff68226cb3bf3902372fcdd7b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d98ff03d7af390… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Jun 18 16:23:56 2017 +0200 4761 FIX Fixed multisite setups with sites using Check_MK/Livestatus < 1.4 When updating the central site of a distributed setup to Check_MK 1.4.* and leaving the slave sites on older versions the other sites were marked as dead sites while rendering the page. This issue was caused by the tactical overview snapin that tried to calculate the numbers for the "Events" of the Event Console. The slave sites using older Check_MK versions do not support that kind of query. Once this query is made the sites are marked as dead and are also not shown correctly in the master control and site status snapin. A possible workaround would be to update all involved sites to Check_MK 1.4. Also affected are sites that use the Nagios core and have the Event Console disabled. They still report an error to the GUI. This will be fixed soon. Change-Id: I0de4cd282c1d06bb160396585ae5ed8e5e0ec959 --- .werks/4761 | 25 +++++++++++++++++++ livestatus/api/python/livestatus.py | 50 +++++++++++++++++++++++++++++++------ web/plugins/sidebar/shipped.py | 13 +++++++++- 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/.werks/4761 b/.werks/4761 new file mode 100644 index 0000000..684646a --- /dev/null +++ b/.werks/4761 @@ -0,0 +1,25 @@ +Title: Fixed multisite setups with sites using Check_MK/Livestatus < 1.4 +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497795538 + +When updating the central site of a distributed setup to Check_MK 1.4.* and +leaving the slave sites on older versions the other sites were marked as +dead sites while rendering the page. + +This issue was caused by the tactical overview snapin that tried to calculate +the numbers for the "Events" of the Event Console. The slave sites using +older Check_MK versions do not support that kind of query. Once this query +is made the sites are marked as dead and are also not shown correctly in the +master control and site status snapin. + +A possible workaround would be to update all involved sites to Check_MK +1.4. + +Also affected are sites that use the Nagios core and have the Event Console +disabled. They still report an error to the GUI. This will be fixed soon. diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index fd51baf..7352ca4 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -176,6 +176,35 @@ class Helpers: return result + +class Query(object): + """This object can be passed to all livestatus methods accepting a livestatus + query. The object can be used to hand over the handling code some flags, for + example to influence the error handling during query processing.""" + + def __init__(self, query, suppress_exceptions=None): + super(Query, self).__init__() + + self._query = self._ensure_unicode(query) + self.suppress_exceptions = suppress_exceptions or [] + + + def _ensure_unicode(self, thing): + try: + return unicode(thing) + except UnicodeDecodeError: + return thing.decode("utf-8") + + + def __unicode__(self): + return self._query + + + def __str__(self): + return self._query.encode("utf-8") + + + #. # .--BaseConnection----------------------------------------------------------. # | ____ ____ _ _ | @@ -291,12 +320,16 @@ class BaseConnection: self.send_query(query, add_headers) return self.recv_response(query, add_headers) - def send_query(self, query, add_headers = "", do_reconnect=True): + def send_query(self, query_obj, add_headers = "", do_reconnect=True): + orig_query = query_obj + + query = "%s" % query_obj if not self.allow_cache: query = remove_cache_regex.sub("", query) - orig_query = query + if self.socket == None: self.connect() + if not query.endswith("\n"): query += "\n" query += self.auth_header + self.add_headers @@ -707,6 +740,11 @@ class MultiSiteConnection(Helpers): "site" : site, } + if isinstance(query, Query): + suppress_exceptions = tuple(query.suppress_exceptions) + else: + suppress_exceptions = tuple() + # Then retrieve all answers. We will be as slow as the slowest of all # connections. result = [] @@ -721,11 +759,9 @@ class MultiSiteConnection(Helpers): if self.prepend_site: r = [ [sitename] + l for l in r ] result += r - #except MKLivestatusTableNotFoundError: - # # In case of multi site queries it may happen that one site knows a table and - # # another site does not have this table because it runs an older version. - # # Don't mark the site as dead site in such a case. - # pass + except suppress_exceptions: + stillalive.append( (sitename, site, connection) ) + continue except Exception, e: self.deadsites[sitename] = { diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 3b57db1..2c56c72 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -638,9 +638,20 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True, extra_headers=extra_filter_headers) + # Livestatus < 1.4.0 does not know this table. The API will raise a + # MKLivestatusTableNotFoundError exception in this case which will mark + # the site as dead by default. Adding the exception to the list of + # suppressed exception makes livestatus silently ignore this kind of + # error. This makes it possible to make livestatus connections with + # older Check_MK versions. + query = livestatus.Query( + event_query, + suppress_exceptions=[livestatus.MKLivestatusTableNotFoundError], + ) + try: sites.live().set_auth_domain("ec") - event_data = sites.live().query_summed_stats(event_query) + event_data = sites.live().query_summed_stats(query) except livestatus.MKLivestatusNotFoundError: event_data = [0, 0, 0] finally:

7 years

Minor cleanup: register page handler through function call

by Lars Michelsen

Module: check_mk Branch: master Commit: c734c655e0152dc1a4371df4ed07425a952d6f0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c734c655e0152d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 10 13:01:25 2017 +0200 Minor cleanup: register page handler through function call --- web/htdocs/modules.py | 6 +++++- web/plugins/pages/bi.py | 6 +++--- web/plugins/pages/cron.py | 2 +- web/plugins/pages/guitester.py | 2 +- web/plugins/pages/metrics.py | 2 +- web/plugins/pages/mobile.py | 2 +- web/plugins/pages/shipped.py | 4 +--- web/plugins/pages/wato.py | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index 3452780..6bf3879 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -125,12 +125,16 @@ def load_all_plugins(): # Install page handlers created by the pagetypes.py modules. It is allowed for all # kind of plugins to register own page types, so we need to wait after all plugins # have been loaded to update the pagehandlers - pagehandlers.update(pagetypes.page_handlers()) + register_handlers(pagetypes.page_handlers()) # Mark the modules as loaded after all plugins have been loaded. In case of exceptions # we want them to occur again on subsequent requests too. g_all_modules_loaded = True +def register_handlers(handlers): + pagehandlers.update(handlers) + + def get_handler(name, dflt=None): return pagehandlers.get(name, dflt) diff --git a/web/plugins/pages/bi.py b/web/plugins/pages/bi.py index 4d04206..24fbacf 100644 --- a/web/plugins/pages/bi.py +++ b/web/plugins/pages/bi.py @@ -26,9 +26,9 @@ import bi -pagehandlers.update({ - "bi_debug" : bi.page_debug, - "bi" : bi.page_all, +register_handlers({ + "bi_debug" : bi.page_debug, + "bi" : bi.page_all, "bi_set_assumption" : bi.ajax_set_assumption, "bi_save_treestate" : bi.ajax_save_treestate, "bi_render_tree" : bi.ajax_render_tree, diff --git a/web/plugins/pages/cron.py b/web/plugins/pages/cron.py index 12b0ba6..4860595 100644 --- a/web/plugins/pages/cron.py +++ b/web/plugins/pages/cron.py @@ -26,6 +26,6 @@ import cron -pagehandlers.update({ +register_handlers({ "noauth:run_cron" : cron.page_run_cron, }) diff --git a/web/plugins/pages/guitester.py b/web/plugins/pages/guitester.py index b187706..033f713 100644 --- a/web/plugins/pages/guitester.py +++ b/web/plugins/pages/guitester.py @@ -26,6 +26,6 @@ import guitester -pagehandlers.update({ +register_handlers({ "guitest_reschedule_all" : guitester.page_reschedule_all, }) diff --git a/web/plugins/pages/metrics.py b/web/plugins/pages/metrics.py index 15e47f1..96ca479 100644 --- a/web/plugins/pages/metrics.py +++ b/web/plugins/pages/metrics.py @@ -26,6 +26,6 @@ import metrics -pagehandlers.update({ +register_handlers({ "noauth:pnp_template" : metrics.page_pnp_template, }) diff --git a/web/plugins/pages/mobile.py b/web/plugins/pages/mobile.py index 1aa70d8..2a2e941 100644 --- a/web/plugins/pages/mobile.py +++ b/web/plugins/pages/mobile.py @@ -26,7 +26,7 @@ import mobile -pagehandlers.update({ +register_handlers({ "mobile" : mobile.page_index, "mobile_view" : mobile.page_view, }) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 0d9da17..2e17b3d 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -47,10 +47,8 @@ import inventory import notifications import valuespec - # map URLs to page rendering functions - -pagehandlers.update({ +register_handlers({ "index" : main.page_index, "login" : login.page_login, "logout" : login.page_logout, diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 3e36c0f..c7afcef 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -26,7 +26,7 @@ import wato -pagehandlers.update({ +register_handlers({ "wato" : wato.page_handler, "ajax_start_activation" : lambda: wato.ModeAjaxStartActivation().handle_page(),

7 years

Cleaned up custom attribute handling

by Lars Michelsen

Module: check_mk Branch: master Commit: f0bdd61ebcd66a32780ee7722c3086f0eadf4d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0bdd61ebcd66a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 10 15:57:44 2017 +0200 Cleaned up custom attribute handling --- web/htdocs/userdb.py | 39 +++++++-------------------------------- web/htdocs/wato.py | 33 ++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 9bad29c..5cdb5c8 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -55,9 +55,6 @@ def load_plugins(force): # during runtime, means they need to be loaded during each page request. # But delete the old definitions before to also apply removals of attributes if user_attributes: - for attr_name in user_attributes.keys(): - if attr_name not in builtin_user_attribute_names: - del user_attributes[attr_name] declare_custom_user_attrs() connection_dict.clear() @@ -1021,36 +1018,14 @@ class GroupChoice(DualListChoice): # | Mange custom attributes of users (in future hosts etc.) | # '----------------------------------------------------------------------' -# TODO: userdb is a bad place for this when it manages user and host attributes! -# Maybe move to own module? -def load_custom_attrs(): - try: - filename = multisite_dir + "custom_attrs.mk" - if not os.path.exists(filename): - return {} - - vars = { - 'wato_user_attrs': [], - 'wato_host_attrs': [], - } - execfile(filename, vars, vars) - - attrs = {} - for what in [ "user", "host" ]: - attrs[what] = vars.get("wato_%s_attrs" % what, []) - return attrs - - except Exception, e: - if config.debug: - raise - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - - def declare_custom_user_attrs(): - all_attrs = load_custom_attrs() - attrs = all_attrs.setdefault('user', []) - for attr in attrs: + # First remove all previously registered custom host attributes + for attr_name in user_attributes.keys(): + if attr_name not in builtin_user_attribute_names: + del user_attributes[attr_name] + + # now declare the custom attributes + for attr in config.wato_user_attrs: vs = globals()[attr['type']](title = attr['title'], help = attr['help']) declare_user_attribute(attr['name'], vs, user_editable = attr['user_editable'], diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08a0682..a7b7333 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14721,6 +14721,31 @@ custom_attr_types = [ ('TextAscii', _('Simple Text')), ] +def load_custom_attrs(): + try: + filename = multisite_dir + "custom_attrs.mk" + if not os.path.exists(filename): + return {} + + vars = { + 'wato_user_attrs': [], + 'wato_host_attrs': [], + } + execfile(filename, vars, vars) + + attrs = {} + for what in [ "user", "host" ]: + attrs[what] = vars.get("wato_%s_attrs" % what, []) + return attrs + + except Exception, e: + if config.debug: + raise + raise MKGeneralException(_("Cannot read configuration file %s: %s") % + (filename, e)) + + + def save_custom_attrs(attrs): output = wato_fileheader() for what in [ "user", "host" ]: @@ -14752,7 +14777,7 @@ def mode_edit_custom_attr(phase, what): html.context_button(_("Back"), folder_preserving_link([("mode", "%s_attrs" % what)]), "back") return - all_attrs = userdb.load_custom_attrs() + all_attrs = load_custom_attrs() attrs = all_attrs.setdefault(what, []) if not new: @@ -14914,7 +14939,7 @@ def mode_custom_attrs(phase, what): html.context_button(_("New Attribute"), folder_preserving_link([("mode", "edit_%s_attr" % what)]), "new") return - all_attrs = userdb.load_custom_attrs() + all_attrs = load_custom_attrs() attrs = all_attrs.get(what, {}) if phase == "action": @@ -14985,9 +15010,7 @@ def declare_custom_host_attrs(): undeclare_host_attribute(attr_name) # now declare the custom attributes - all_attrs = userdb.load_custom_attrs() - attrs = all_attrs.setdefault('host', []) - for attr in attrs: + for attr in config.wato_host_attrs: vs = globals()[attr['type']](title = attr['title'], help = attr['help']) if attr['add_custom_macro']:

7 years

Removed deprecated is_multisite() noop calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 123614ee27195ff2ba60c7eaced950ee531d120f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=123614ee27195f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 19 07:30:10 2017 +0200 Removed deprecated is_multisite() noop calls Change-Id: I593a37513376bf32fadac45ae6111f92d9b4af01 --- web/htdocs/config.py | 5 ---- web/htdocs/views.py | 2 +- web/plugins/sidebar/shipped.py | 65 +++++++++++++++++++++--------------------- web/plugins/visuals/filters.py | 4 --- 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0f9a103..82f7f0d 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -700,11 +700,6 @@ def default_site(): return None - -def is_multisite(): - # TODO: Remove all calls of this function - return True - def is_single_local_site(): if len(sites) > 1: return False diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8b2aba3..c0eca62 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1905,7 +1905,7 @@ def render_view(view, rows, datasource, group_painters, painters, # In case of the web service we show errors only on single site installations. if config.show_livestatus_errors \ and display_options.enabled(display_options.W) \ - and (html.output_format == "html" or not config.is_multisite()): + and html.output_format == "html": for sitename, info in sites.live().dead_sites().items(): html.show_error("<b>%s - %s</b><br>%s" % (info["site"]["alias"], _('Livestatus error'), info["exception"])) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 2c56c72..c93ddd2 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -479,47 +479,46 @@ table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; # '----------------------------------------------------------------------' def render_sitestatus(): - if config.is_multisite(): - html.open_table(cellspacing=0, class_="sitestate") + html.open_table(cellspacing=0, class_="sitestate") - sites.update_site_states_from_dead_sites() + sites.update_site_states_from_dead_sites() - for sitename, sitealias in config.sorted_sites(): - site = config.site(sitename) + for sitename, sitealias in config.sorted_sites(): + site = config.site(sitename) - state = sites.state(sitename, {}) + state = sites.state(sitename, {}) - if state.get("state") == None: - state = "missing" - text = _("Missing site") - title = _("Site %s does not exist") % sitename + if state.get("state") == None: + state = "missing" + text = _("Missing site") + title = _("Site %s does not exist") % sitename + else: + if state["state"] == "disabled": + switch = "on" + text = site["alias"] + title = _("Site %s is switched off") % site["alias"] else: - if state["state"] == "disabled": - switch = "on" - text = site["alias"] - title = _("Site %s is switched off") % site["alias"] - else: - switch = "off" - text = render_link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) - ex = state.get("exception") - shs = state.get("status_host_state") + switch = "off" + text = render_link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) + ex = state.get("exception") + shs = state.get("status_host_state") - if ex: - title = ex - else: - title = "Site %s is online" % site["alias"] + if ex: + title = ex + else: + title = "Site %s is online" % site["alias"] - html.open_tr() - html.open_td(class_="left") - html.write(text) - html.close_td() - html.open_td(class_="state") - html.status_label_button(content=state["state"], status=state["state"], - help=_("%s this site") % (state["state"] == "disabled" and _("enable") or _("disable")), - onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) - html.close_tr() - html.close_table() + html.open_tr() + html.open_td(class_="left") + html.write(text) + html.close_td() + html.open_td(class_="state") + html.status_label_button(content=state["state"], status=state["state"], + help=_("%s this site") % (state["state"] == "disabled" and _("enable") or _("disable")), + onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) + html.close_tr() + html.close_table() sidebar_snapins["sitestatus"] = { diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 644a77a..77da0b8 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -690,10 +690,6 @@ class FilterSite(Filter): self.enforce = enforce - def visible(self): - return config.is_multisite() - - def display(self): html.dropdown("site", self._choices())

7 years

Updated bug entries #2554, #2923, #2556

by Lars Michelsen

Module: check_mk Branch: master Commit: f26430ef92d8e1edc2bb018c89f22a5e799508f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f26430ef92d8e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 19 08:51:00 2017 +0200 Updated bug entries #2554, #2923, #2556 Change-Id: I77829334a2af8927a60e5951e266e52a5bdea796 --- .bugs/2554 | 2 +- .bugs/2556 | 2 +- .bugs/2923 | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.bugs/2554 b/.bugs/2554 index 11775f7..1557bbd 100644 --- a/.bugs/2554 +++ b/.bugs/2554 @@ -2,7 +2,7 @@ Title: Host with datasource program should not be force to have an IP address Component: core State: open Date: 2017-05-29 16:43:34 -Targetversion: 1.4.0 +Targetversion: 1.5.0 Class: bug You have a host that is monitored via a datasource program. This diff --git a/.bugs/2556 b/.bugs/2556 index 8a1f9ab..0015600 100644 --- a/.bugs/2556 +++ b/.bugs/2556 @@ -2,7 +2,7 @@ Title: Rework setting of environment variables in whole OMD context Component: core State: open Date: 2017-06-12 09:45:35 -Targetversion: 1.4.0 +Targetversion: 1.5.0 Class: bug Environment variables should only be set in ~/.profile and diff --git a/.bugs/2923 b/.bugs/2923 index 3e16216..7c02d6d 100644 --- a/.bugs/2923 +++ b/.bugs/2923 @@ -1,9 +1,12 @@ Title: Persistent comment for hosts is not working Component: multisite -State: open +Class: bug +State: done Date: 2017-05-26 16:30:26 Targetversion: 1.2.8 -Class: bug If you create a persistent comment for hosts, it is not assigned to this hosts. The comment can not be found in Check_MK. The persistent comment for services is working. + +2017-06-19 08:50:58: changed state open -> done +Works.

7 years

web .f12 files now deploy all web files

by Lars Michelsen

Module: check_mk Branch: master Commit: 294df85c237273ffde5b04290e150ed826fbd110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294df85c237273… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 10 21:30:24 2017 +0200 web .f12 files now deploy all web files --- web/.f12 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/web/.f12 b/web/.f12 index f37edbd..b10da3e 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,12 +1,21 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} + +echo "Copy CRE files..." sudo rsync \ --exclude "*cmc.py" \ --exclude "*omd_configuration.py" \ - -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ -# --delete \ -echo "$C files copied" + -arx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ + +# Also deploy all other directories of same type +if [ ${ALL_EDITIONS:-1} != 0 ]; then + for WHAT in enterprise managed; do + if [ -e ../$WHAT/web/.f12 ]; then + (cd ../$WHAT/web ; ONLY_COPY=1 ALL_EDITIONS=0 bash .f12) + fi + done +fi if [ -z $ONLY_COPY ]; then if [ "$SITE" != - ] ; then

7 years

Fixed broken dashlet edit after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 7793d98e56ef5a1626af2f00529052e63e1b150d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7793d98e56ef5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 17 13:24:29 2017 +0200 Fixed broken dashlet edit after recent refactoring Change-Id: I48d0d85b1dfd239e2a22699e93211405c46225af --- web/htdocs/visuals.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index bb7f342..1d4bab8 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -498,7 +498,13 @@ def page_create_visual(what, info_keys, next_url = None): def get_context_specs(visual, info_handler): context_specs = [] - info_keys = info_handler(visual) if info_handler else infos.keys() + + info_keys = [] + if info_handler: + info_keys = info_handler(visual) + + if not info_keys: + info_keys = infos.keys() single_info_keys = [key for key in info_keys if key in visual['single_infos']] multi_info_keys = [key for key in info_keys if key not in single_info_keys]

7 years

4760 FIX Fixed vanishing CUPS queues services on systems using systemd

by Lars Michelsen

Module: check_mk Branch: master Commit: 51c57ed9337b83ddd1e70f52a45237f937640021 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51c57ed9337b83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 17 11:09:44 2017 +0200 4760 FIX Fixed vanishing CUPS queues services on systems using systemd When monitoring CUPS queues on linux systems using systemd it happened that the agent did not provide CUPS queue information suddenly. When using systemd the cupsd process is stopped when nothing is using the daemon. Systemd is starting the daemon again automatically once any process wants use the printer system. The CUPS part of the Check_MK agent was only executed when the cupsd process was running which is wrong for such systems. Additionally the agent is now checking whether or not systemd is used and the cups.service is enabled and checks the queues if so, even when the cupsd is not running. Change-Id: I29c156f95eda0a18598039dc943a4c923a18a729 --- .werks/4760 | 21 +++++++++++++++++++++ agents/check_mk_agent.linux | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/4760 b/.werks/4760 new file mode 100644 index 0000000..cedfc6a --- /dev/null +++ b/.werks/4760 @@ -0,0 +1,21 @@ +Title: Fixed vanishing CUPS queues services on systems using systemd +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497690367 + +When monitoring CUPS queues on linux systems using systemd it happened +that the agent did not provide CUPS queue information suddenly. + +When using systemd the cupsd process is stopped when nothing is using +the daemon. Systemd is starting the daemon again automatically once +any process wants use the printer system. + +The CUPS part of the Check_MK agent was only executed when the cupsd +process was running which is wrong for such systems. Additionally the +agent is now checking whether or not systemd is used and the cups.service +is enabled and checks the queues if so, even when the cupsd is not running. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ba6cee1..8af57f4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -579,7 +579,10 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then - if pgrep -f "\bcupsd" > /dev/null 2>&1; then + # Systemd starts cupsd on demand: Instead of checking that the cupsd is + # running we check that the cups service exists and is enabled. + if pgrep -f "\bcupsd" > /dev/null 2>&1 \ + || (type systemctl >/dev/null 2>&1 && systemctl is-enabled cups.service); then # first define a function to check cups function cups_queues () { CPRINTCONF=/etc/cups/printers.conf

7 years

4759 FIX Fixed some wrong escaped links in help texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cb3d2151e2cba5eaa722a6371346351e6fa8f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cb3d2151e2cba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 17 10:45:13 2017 +0200 4759 FIX Fixed some wrong escaped links in help texts Change-Id: I044d6fd6b211d5367407c98f19222f264bf8269f --- .werks/4759 | 10 ++++++++++ web/htdocs/htmllib.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4759 b/.werks/4759 new file mode 100644 index 0000000..04dad6f --- /dev/null +++ b/.werks/4759 @@ -0,0 +1,10 @@ +Title: Fixed some wrong escaped links in help texts +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497689097 +Class: fix + + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index eb39b9d..3351d39 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -112,7 +112,7 @@ class Escaper(object): def __init__(self): super(Escaper, self).__init__() self._unescaper_text = re.compile(r'<(/?)(h1|h2|b|tt|i|u|br(?: /)?|nobr(?: /)?|pre|a|sup|p|li|ul|ol)>') - self._unescaper_href = re.compile(r'<a href="(.*?)">') + self._unescaper_href = re.compile(r'<a href=(?:"|\')(.*?)(?:"|\')>') # Encode HTML attributes. Replace HTML syntax with HTML text.

7 years

Fixed exceptions after recently merged refactorings

by Lars Michelsen

Module: check_mk Branch: master Commit: ad7b4d82ee5cf52b636070dafe2cb8ff6f4bb615 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad7b4d82ee5cf5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jun 17 10:40:36 2017 +0200 Fixed exceptions after recently merged refactorings Change-Id: Iea46ab44cbe4059127315029914d660da68fa44e --- web/htdocs/views.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ffffe3e..8b2aba3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1554,7 +1554,12 @@ def show_view(view, show_heading = False, show_buttons = True, # Sorting - use view sorters and URL supplied sorters if not only_count: - sorter_list = parse_url_sorters(html.var('sort', deflt=view["sorters"])) + user_sorters = parse_url_sorters(html.var("sort")) + if user_sorters: + sorter_list = user_sorters + else: + sorter_list = view["sorters"] + sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list if s[0] in multisite_sorters ] else: @@ -2111,7 +2116,7 @@ def show_context_links(thisview, datasource, show_filters, view_optiondial_off("num_columns") if display_options.enabled(display_options.R) and config.user.may("general.view_option_refresh"): - choices = [ [x, {0:_("off")}.get(x,str(x) + "s")] + '' for x in config.view_option_refreshes ] + choices = [ [x, {0:_("off")}.get(x, str(x) + "s") ] for x in config.view_option_refreshes ] view_optiondial(thisview, "refresh", choices, _("Change the refresh rate")) else: view_optiondial_off("refresh")

7 years

← Newer
1
...
12
13
14
15
16
17
18
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017