Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3008 FIX Fixed logwatch exception in config generation when using Nagios

by Andreas Boesl

Module: check_mk Branch: master Commit: 5ee336a0085f3647a4eb052b0fd8a3e3485d3c2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ee336a0085f36… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 14 13:43:46 2016 +0100 3008 FIX Fixed logwatch exception in config generation when using Nagios --- .werks/3008 | 9 +++++++++ ChangeLog | 1 + modules/nagios.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3008 b/.werks/3008 new file mode 100644 index 0000000..5c49298 --- /dev/null +++ b/.werks/3008 @@ -0,0 +1,9 @@ +Title: Fixed exception in logwatch config generation when using Nagios +Level: 1 +Component: core +Compatible: compat +Version: 1.2.9i1 +Date: 1457959319 +Class: fix + +The config generation failed when the logwatch item had special characters. diff --git a/ChangeLog b/ChangeLog index 0e4d81d..5f9308e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 3234 FIX: Make unixcat more robust... * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... * 3286 FIX: Fixing possible logging issues when using datasource programs for monitoring... + * 3008 FIX: Fixed exception in logwatch config generation when using Nagios... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/nagios.py b/modules/nagios.py index 1bad72d..bc43972 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -308,7 +308,7 @@ define servicedependency { # Hardcoded for logwatch check: Link to logwatch.php if checkname == "logwatch": - logwatch = " notes_url\t\t\t" + (logwatch_notes_url % (urllib.quote(hostname), urllib.quote(item))) + "\n" + logwatch = " notes_url\t\t\t" + (logwatch_notes_url % (urllib.quote(hostname), urllib.quote(make_utf8(item)))) + "\n" else: logwatch = "";

8 years, 6 months

3287 FIX Fixed broken crash reporting (Submission of crashes did not work)

by Lars Michelsen

Module: check_mk Branch: master Commit: 67e097bb04aa6074d609463cd1c080da36b15cc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67e097bb04aa60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 14 09:00:29 2016 +0100 3287 FIX Fixed broken crash reporting (Submission of crashes did not work) --- .werks/3287 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/crash_reporting.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3287 b/.werks/3287 new file mode 100644 index 0000000..7d4d60f --- /dev/null +++ b/.werks/3287 @@ -0,0 +1,10 @@ +Title: Fixed broken crash reporting (Submission of crashes did not work) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457942405 + + diff --git a/ChangeLog b/ChangeLog index b3c44de..0e4d81d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 3260 FIX: Availability: ignores completely unmonitored objects in summary calculation * 3279 FIX: LDAP: Fixed default values of attribute selections... * 3285 FIX: Fixed exception when editing large bookmark lists + * 3287 FIX: Fixed broken crash reporting (Submission of crashes did not work) WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 7f9b9ce..664794e 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -256,7 +256,7 @@ def show_report_form(details): vs.render_input("_report", details) vs.set_focus("report") forms.end() - html.button("report", _("Submit Report")) + html.button("_report", _("Submit Report")) html.hidden_fields() html.end_form()

8 years, 6 months

livestatus: Fixed several bugs and cleaned up parent/ child class attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: e536f054e06080cdb2e780b4ec51a5fdb65bd4ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e536f054e06080… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 17:56:11 2016 +0100 livestatus: Fixed several bugs and cleaned up parent/child class attributes --- web/htdocs/livestatus.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 9f8e61e..470ae2e 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -87,6 +87,9 @@ class MKLivestatusNotFoundError(MKLivestatusException): # We need some unique value here NO_DEFAULT = lambda: None class Helpers: + def query(self, query, add_headers = ""): + raise NotImplementedError() + def query_value(self, query, deflt = NO_DEFAULT): """Issues a query that returns exactly one line and one columns and returns the response as a single value""" @@ -163,6 +166,7 @@ class BaseConnection: def __init__(self, socketurl, persist = False, allow_cache = False): """Create a new connection to a MK Livestatus socket""" self.add_headers = "" + self.auth_header = "" self.persist = persist self.allow_cache = allow_cache self.socketurl = socketurl @@ -358,7 +362,6 @@ class SingleSiteConnection(BaseConnection, Helpers): self.prepend_site = False self.auth_users = {} self.deadsites = {} # never filled, just for compatibility - self.auth_header = "" self.limit = None def set_prepend_site(self, p): @@ -404,7 +407,10 @@ class SingleSiteConnection(BaseConnection, Helpers): # timeout: timeout for tcp/unix in seconds class MultiSiteConnection(Helpers): - def __init__(self, sites, disabled_sites = []): + def __init__(self, sites, disabled_sites = None): + if disabled_sites is None: + disabled_sites = {} + self.sites = sites self.connections = [] self.deadsites = {} @@ -556,7 +562,7 @@ class MultiSiteConnection(Helpers): return self.deadsites def alive_sites(self): - return self.connections.keys() + return [ s[0] for s in self.connections ] def successfully_persisted(self): for sitename, site, connection in self.connections:

8 years, 6 months

stdin should be readable, really.

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f402524a774ecb8ddedb4038302668f4e968807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f402524a774ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 14:47:13 2016 +0100 stdin should be readable, really. --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3db97e9..422c90f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -772,7 +772,7 @@ def get_agent_info_program(commandline): vverbose("Calling external program %s\n" % commandline) try: - p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull, 'w'), + p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull), stdout=subprocess.PIPE, stderr = subprocess.PIPE, preexec_fn=os.setsid, close_fds=True) stdout, stderr = p.communicate()

8 years, 6 months

3286 FIX Fixing possible logging issues when using datasource programs for monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 89279b54e88b5c96f50ad60a79d93c2b762ebca3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89279b54e88b5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 14:34:34 2016 +0100 3286 FIX Fixing possible logging issues when using datasource programs for monitoring When calling datasource programs for monitoring they are executed as subprocesses of Check_MK. Check_MK as passing all filedescriptors except stdout and stderr to the subprocess. So if a subprocess was doing something strange with them it could happen that this influenced the handling within Check_MK. This could, for example, confuse the communication between the CMC and the Check_MK keepalive helper processes. --- .werks/3286 | 16 ++++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 5 +++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/3286 b/.werks/3286 new file mode 100644 index 0000000..130ba15 --- /dev/null +++ b/.werks/3286 @@ -0,0 +1,16 @@ +Title: Fixing possible logging issues when using datasource programs for monitoring +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457703007 + +When calling datasource programs for monitoring they are executed as subprocesses +of Check_MK. Check_MK as passing all filedescriptors except stdout and stderr to +the subprocess. So if a subprocess was doing something strange with them it could +happen that this influenced the handling within Check_MK. + +This could, for example, confuse the communication between the CMC and the Check_MK +keepalive helper processes. diff --git a/ChangeLog b/ChangeLog index a9db791..b3c44de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 3221 FIX: Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled... * 3234 FIX: Make unixcat more robust... * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... + * 3286 FIX: Fixing possible logging issues when using datasource programs for monitoring... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a9d7322..3db97e9 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -772,8 +772,9 @@ def get_agent_info_program(commandline): vverbose("Calling external program %s\n" % commandline) try: - p = subprocess.Popen(commandline, shell = True, stdout = subprocess.PIPE, - stderr = subprocess.PIPE, preexec_fn=os.setsid) + p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull, 'w'), + stdout=subprocess.PIPE, stderr = subprocess.PIPE, + preexec_fn=os.setsid, close_fds=True) stdout, stderr = p.communicate() exitstatus = p.returncode except MKTimeout:

8 years, 6 months

3262 Event Console: bulk delete button for custom MIBs now available

by Simon Betz

Module: check_mk Branch: master Commit: c25009b934fc1f61d79d98c46359fd60da895478 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25009b934fc1f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 11 13:26:14 2016 +0100 3262 Event Console: bulk delete button for custom MIBs now available --- .werks/3262 | 9 +++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 104 ++++++++++++++++++++++++--------- 3 files changed, 87 insertions(+), 27 deletions(-) diff --git a/.werks/3262 b/.werks/3262 new file mode 100644 index 0000000..1dc3f14 --- /dev/null +++ b/.werks/3262 @@ -0,0 +1,9 @@ +Title: Event Console: bulk delete button for custom MIBs now available +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.9i1 +Date: 1457699068 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cbfdd47..a9db791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -141,6 +141,7 @@ Event Console: * 2999 The contact name is now included in Event Console notifications... + * 3262 Event Console: bulk delete button for custom MIBs now available * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... Livestatus: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 844b73c..a0c356b 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1820,20 +1820,7 @@ def mode_mkeventd_mibs(phase): c = wato_confirm(_("Confirm MIB deletion"), _("Do you really want to delete the MIB file <b>%s</b>?" % filename)) if c: - log_mkeventd("delete-mib", _("Deleted MIB %s") % filename) - - # Delete the uploaded mib file - os.remove(mkeventd.mib_upload_dir + "/" + filename) - - # Also delete the compiled files - mib_name = mibs[filename]["name"] - for f in [ mkeventd.compiled_mibs_dir + "/" + mib_name + ".py", - mkeventd.compiled_mibs_dir + "/" + mib_name + ".pyc", - mkeventd.compiled_mibs_dir + "/" + filename.rsplit('.', 1)[0].upper() + ".py", - mkeventd.compiled_mibs_dir + "/" + filename.rsplit('.', 1)[0].upper() + ".pyc" - ]: - if os.path.exists(f): - os.remove(f) + delete_mib(filename, mibs[filename]["name"]) elif c == False: return "" else: @@ -1851,6 +1838,9 @@ def mode_mkeventd_mibs(phase): else: raise MKUserError("_upload_mib", str(e)) + elif html.var("_bulk_delete_custom_mibs"): + return bulk_delete_custom_mibs_after_confirm() + return html.write("<h3>" + _("Upload MIB file") + "</h3>") @@ -1875,20 +1865,80 @@ def mode_mkeventd_mibs(phase): os.makedirs(mkeventd.mib_upload_dir) # Let exception happen if this fails. Never happens on OMD for path, title in mkeventd.mib_dirs: - table.begin("mibs_"+path, title) - for filename, mib in sorted(load_snmp_mibs(path).items()): - table.row() + show_mib_table(path, title) - table.cell(_("Actions"), css="buttons") - if path == mkeventd.mib_upload_dir: - delete_url = make_action_link([("mode", "mkeventd_mibs"), ("_delete", filename)]) - html.icon_button(delete_url, _("Delete this MIB"), "delete") - - table.cell(_("Filename"), filename) - table.cell(_("MIB"), mib.get("name", "")) - table.cell(_("Organization"), mib.get("organization", "")) - table.cell(_("Size"), bytes_human_readable(mib.get("size", 0)), css="number") - table.end() + +def show_mib_table(path, title): + is_custom_dir = path == mkeventd.mib_upload_dir + + if is_custom_dir: + html.begin_form("bulk_delete_form", method = "POST") + + table.begin("mibs_"+path, title, searchable=False) + for filename, mib in sorted(load_snmp_mibs(path).items()): + table.row() + + if is_custom_dir: + table.cell("<input type=button class=checkgroup name=_toggle_group" + " onclick=\"toggle_all_rows();\" value=\"%s\" />" % _('X'), + sortable=False, css="buttons") + html.checkbox("_c_mib_%s" % filename) + + table.cell(_("Actions"), css="buttons") + if is_custom_dir: + delete_url = make_action_link([("mode", "mkeventd_mibs"), ("_delete", filename)]) + html.icon_button(delete_url, _("Delete this MIB"), "delete") + + table.cell(_("Filename"), filename) + table.cell(_("MIB"), mib.get("name", "")) + table.cell(_("Organization"), mib.get("organization", "")) + table.cell(_("Size"), bytes_human_readable(mib.get("size", 0)), css="number") + + table.end() + + if is_custom_dir: + html.button("_bulk_delete_custom_mibs", _("Bulk Delete"), "submit", style="margin-top:10px") + html.hidden_fields() + html.end_form() + + +def bulk_delete_custom_mibs_after_confirm(): + custom_mibs = load_snmp_mibs(mkeventd.mib_upload_dir) + selected_custom_mibs = [] + for varname in html.all_varnames_with_prefix("_c_mib_"): + if html.get_checkbox(varname): + filename = varname.split("_c_mib_")[-1] + if filename in custom_mibs: + selected_custom_mibs.append(filename) + + if selected_custom_mibs: + c = wato_confirm(_("Confirm deletion of selected MIBs"), + _("Do you really want to delete the selected %d MIBs?") % \ + len(selected_custom_mibs)) + if c: + for filename in selected_custom_mibs: + delete_mib(filename, custom_mibs[filename]["name"]) + return + elif c == False: + return "" # not yet confirmed + else: + return # browser reload + + +def delete_mib(filename, mib_name): + log_mkeventd("delete-mib", _("Deleted MIB %s") % filename) + + # Delete the uploaded mib file + os.remove(mkeventd.mib_upload_dir + "/" + filename) + + # Also delete the compiled files + for f in [ mkeventd.compiled_mibs_dir + "/" + mib_name + ".py", + mkeventd.compiled_mibs_dir + "/" + mib_name + ".pyc", + mkeventd.compiled_mibs_dir + "/" + filename.rsplit('.', 1)[0].upper() + ".py", + mkeventd.compiled_mibs_dir + "/" + filename.rsplit('.', 1)[0].upper() + ".pyc" + ]: + if os.path.exists(f): + os.remove(f) def load_snmp_mibs(path):

8 years, 6 months

LDAP: Fixed default values of user/group attributes/filters

by Lars Michelsen

Module: check_mk Branch: master Commit: 4da4115e3dfc65b34f4f4c9f52221ae2f98c8f75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4da4115e3dfc65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 10:12:44 2016 +0100 LDAP: Fixed default values of user/group attributes/filters --- web/htdocs/wato.py | 8 ++++---- web/plugins/userdb/ldap.py | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2813d0d..14bb805 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5801,7 +5801,7 @@ def vs_ldap_connection(new, connection_id): "Members of a group:<br> " "<tt>(&(objectclass=user)(objectcategory=person)(memberof=CN=cmk-users,OU=groups,DC=example,DC=com))</tt><br>"), size = 80, - default_value = lambda: userdb.ldap_filter('users', False), + default_value = lambda: userdb.ldap_filter_of_connection(connection_id, 'users', False), attrencode = True, )), ("user_filter_group", LDAPDistinguishedName( @@ -5825,7 +5825,7 @@ def vs_ldap_connection(new, connection_id): help = _("The attribute used to identify the individual users. It must have " "unique values to make an user identifyable by the value of this " "attribute."), - default_value = lambda: userdb.ldap_attr('user_id'), + default_value = lambda: userdb.ldap_attr_of_connection(connection_id, 'user_id'), attrencode = True, )), ("lower_user_ids", FixedValue( @@ -5879,13 +5879,13 @@ def vs_ldap_connection(new, connection_id): "subset of the groups below the given base DN.<br><br>" "e.g. <tt>(objectclass=group)</tt>"), size = 80, - default_value = lambda: userdb.ldap_filter('groups', False), + default_value = lambda: userdb.ldap_filter_of_connection(connection_id, 'groups', False), attrencode = True, )), ("group_member", TextAscii( title = _("Member Attribute"), help = _("The attribute used to identify users group memberships."), - default_value = lambda: userdb.ldap_attr('member'), + default_value = lambda: userdb.ldap_attr_of_connection(connection_id, 'member'), attrencode = True, )), ] diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index db86eba..54921ee 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1214,6 +1214,15 @@ def ldap_attr_of_connection(connection_id, attr): return connection.ldap_attr(attr) +# Helper function for gathering the default LDAP filters of a connection. +def ldap_filter_of_connection(connection_id, *args, **kwargs): + connection = get_connection(connection_id) + if not connection: + return None + + return connection.ldap_filter(*args, **kwargs) + + def ldap_sync_simple(user_id, ldap_user, user, user_attr, attr): if attr in ldap_user: return {user_attr: ldap_user[attr][0]}

8 years, 6 months

Made some Column classes more consistent with the rest.

by Sven Panne

Module: check_mk Branch: master Commit: 12c09340c6bb946785972542228985206cc21a10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12c09340c6bb94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 11 09:58:10 2016 +0100 Made some Column classes more consistent with the rest. --- livestatus/src/OffsetDoubleColumn.cc | 3 --- livestatus/src/OffsetIntColumn.cc | 11 ++++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/livestatus/src/OffsetDoubleColumn.cc b/livestatus/src/OffsetDoubleColumn.cc index 70bff8d..70e90d8 100644 --- a/livestatus/src/OffsetDoubleColumn.cc +++ b/livestatus/src/OffsetDoubleColumn.cc @@ -26,9 +26,6 @@ #include <string.h> double OffsetDoubleColumn::getValue(void *data) { - if (data == nullptr) { - return 0; - } char *p = static_cast<char *>(shiftPointer(data)); if (p == nullptr) { return 0; diff --git a/livestatus/src/OffsetIntColumn.cc b/livestatus/src/OffsetIntColumn.cc index fe8768b..fffcd61 100644 --- a/livestatus/src/OffsetIntColumn.cc +++ b/livestatus/src/OffsetIntColumn.cc @@ -25,13 +25,10 @@ #include "OffsetIntColumn.h" int32_t OffsetIntColumn::getValue(void *data, Query * /*unused*/) { - if (data == nullptr) { - return 0; - } - char *p = reinterpret_cast<char *>(shiftPointer(data)); - if (p != nullptr) { - return *reinterpret_cast<int *>(p + _offset); + if (p == nullptr) { + return 0; } - return 0; + auto ptr = reinterpret_cast<int *>(p + _offset); + return static_cast<int32_t>(*ptr); }

8 years, 6 months

Synched with upcoming time-related core changes.

by Sven Panne

Module: check_mk Branch: master Commit: 059fddc3b2f6a0d0ef9235f56a4269367063ba3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=059fddc3b2f6a0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 11 09:58:52 2016 +0100 Synched with upcoming time-related core changes. --- livestatus/src/LogCache.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index bc67028..3e37998 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -36,7 +36,9 @@ #include "logger.h" #ifdef CMC +#include <chrono> #include "Core.h" +using std::chrono::system_clock; extern Core *g_core; #else extern time_t last_log_rotation; @@ -97,7 +99,8 @@ bool LogCache::logCachePreChecks() { // our file index. And delete all memorized // log messages. #ifdef CMC - if (g_core->_last_logfile_rotation > _last_index_update) { + if (g_core->_last_logfile_rotation > + system_clock::from_time_t(_last_index_update)) { #else if (last_log_rotation > _last_index_update) { #endif

8 years, 6 months

Fixed mixup between SearchFolder and Folder logic in single method

by Lars Michelsen

Module: check_mk Branch: master Commit: 753d9cd4a2ab461921302c14e54b5333b73cfb56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=753d9cd4a2ab46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 09:52:56 2016 +0100 Fixed mixup between SearchFolder and Folder logic in single method --- web/htdocs/watolib.py | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b3bc60c..b6536f0 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -625,26 +625,23 @@ class Folder(BaseFolder): # latter case we need to load all hosts in all folders and actively search the host. @staticmethod def current(): - if not html.is_cached("wato_current_folder"): - if html.has_var("host_search"): - base_folder = Folder.folder(html.var("folder", "")) - search_criteria = SearchFolder.criteria_from_html_vars() - folder = SearchFolder(base_folder, search_criteria) - elif html.has_var("folder"): - folder = Folder.folder(html.var("folder")) - else: - host_name = html.var("host") - if host_name: # find host with full scan. Expensive operation - host = Host.host(host_name) - if host: - folder = host.folder() - else: - folder = Folder.root_folder() - html.set_cache("wato_current_folder", folder) - return folder - else: + if html.is_cached("wato_current_folder"): return html.get_cached("wato_current_folder") + if html.has_var("folder"): + folder = Folder.folder(html.var("folder")) + else: + host_name = html.var("host") + if host_name: # find host with full scan. Expensive operation + host = Host.host(host_name) + if host: + folder = host.folder() + else: + folder = Folder.root_folder() + + Folder.set_current(folder) + return folder + @staticmethod def current_disk_folder(): @@ -1709,6 +1706,22 @@ class SearchFolder(BaseFolder): return crit + @staticmethod + def current(): + if html.is_cached("wato_current_folder"): + return html.get_cached("wato_current_folder") + + if html.has_var("host_search"): + base_folder = Folder.folder(html.var("folder", "")) + search_criteria = SearchFolder.criteria_from_html_vars() + folder = SearchFolder(base_folder, search_criteria) + Folder.set_current(folder) + return + else: + # FIXME: Is this needed for SearchFolder()? + return Folder.current() + + # .--------------------------------------------------------------------. # | CONSTRUCTION | # '--------------------------------------------------------------------'

8 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016