Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 7eb60f21f70cc0c2233c2649acd8c86c3bf29db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eb60f21f70cc0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 21 11:21:41 2017 +0100 updated werk 4364 Change-Id: I4c4778b5fd7c0287b43867ab067d08aef9e5bcf3 --- .werks/4364 | 3 +-- checks/genua_fan | 1 - checks/openbsd_sensors | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.werks/4364 b/.werks/4364 index 1a7cb39..a82805a 100644 --- a/.werks/4364 +++ b/.werks/4364 @@ -7,5 +7,4 @@ State: unknown Version: 1.5.0i1 Date: 1487671496 -Default setting of performance data is disabled for all fan check -plugins except genau_fan and openbsd_sensors. +Default setting of performance data is disabled for all fan check plugins. diff --git a/checks/genua_fan b/checks/genua_fan index 4fafa73..85f06b4 100644 --- a/checks/genua_fan +++ b/checks/genua_fan @@ -28,7 +28,6 @@ factory_settings["genua_fan_default_levels"] = { "lower" : (2000, 1000), "upper" : (8000, 8400), - "output_metrics" : True } diff --git a/checks/openbsd_sensors b/checks/openbsd_sensors index 4cb7bc7..2ef1752 100644 --- a/checks/openbsd_sensors +++ b/checks/openbsd_sensors @@ -204,7 +204,6 @@ check_info['openbsd_sensors'] = { factory_settings['openbsd_sensors_fan_default_levels'] = { 'lower' : (500, 300), 'upper' : (8000, 8400), - 'output_metrics' : True, } def check_openbsd_sensors_fan(item, params, parsed):

7 years, 7 months

Fixed accidentially removed call

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c1da1c361527dc817966b1c57dabb53db9b8738 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c1da1c361527d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 11:07:25 2017 +0100 Fixed accidentially removed call Change-Id: Ied55a3adc34355d5a614669b378df095745033c1 --- web/htdocs/index.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3bd42f1..8157cf7 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -203,6 +203,7 @@ def finalize_request(): release_all_locks() userdb.finalize() sites.disconnect() + html.finalize() # Ajax-Functions want no HTML output in case of an error but

7 years, 7 months

4364 FIX fan.include: now performance data can be enabled

by Simon Betz

Module: check_mk Branch: master Commit: 4bad96905e444ce712ef7f9574962092f938327d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bad96905e444c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 21 11:08:26 2017 +0100 4364 FIX fan.include: now performance data can be enabled Default setting of performance data is disabled for all fan check plugins except genau_fan and openbsd_sensors. Change-Id: I091b6d8505a5d3c03c939ab634007aa713589d68 --- .werks/4364 | 11 ++++ checks/fan.include | 4 +- checks/genua_fan | 113 ++++++++++++++++------------------- checks/openbsd_sensors | 28 ++------- checks/openhardwaremonitor | 20 ++++--- web/plugins/metrics/check_mk.py | 8 +++ web/plugins/wato/check_parameters.py | 2 + 7 files changed, 92 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4bad96905e…

7 years, 7 months

Refactoring: Pull up method.

by Sven Panne

Module: check_mk Branch: master Commit: d2e0cd34a66f99a6d872a4f6171b59571ac6b178 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2e0cd34a66f99… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 21 09:39:26 2017 +0100 Refactoring: Pull up method. https://refactoring.com/catalog/pullUpMethod.html Change-Id: Icfde6cd56dc294e7adc21aeb6898f293a7c74da5 --- livestatus/src/TableEventConsole.cc | 25 +++++++++++++++++++++++++ livestatus/src/TableEventConsole.h | 4 +++- livestatus/src/TableEventConsoleEvents.cc | 23 +---------------------- livestatus/src/TableEventConsoleHistory.cc | 23 +---------------------- 4 files changed, 30 insertions(+), 45 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 45afa9e..172ece1 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -26,6 +26,7 @@ #include "TableEventConsole.h" #include <iosfwd> #include <iostream> +#include <memory> #include <utility> #include "Column.h" #include "EventConsoleConnection.h" @@ -33,6 +34,7 @@ #include "Query.h" using std::ostream; +using std::static_pointer_cast; using std::string; using std::vector; @@ -109,3 +111,26 @@ void TableEventConsole::answerQuery(Query *query) { } } } + +// TODO(sp) Remove evil casts below. +bool TableEventConsole::isAuthorizedForEvent(contact *ctc, void *data) { + if (MonitoringCore::Host *hst = static_cast<Row *>(data)->_host) { + return _core->host_has_contact( + hst, reinterpret_cast<MonitoringCore::Contact *>(ctc)); + } + + auto col = static_pointer_cast<ListEventConsoleColumn>( + column("event_contact_groups")); + if (col->isNone(data)) { + return true; + } + + for (const auto &name : col->getValue(data)) { + if (_core->is_contact_member_of_contactgroup( + _core->find_contactgroup(name), + reinterpret_cast<MonitoringCore::Contact *>(ctc))) { + return true; + } + } + return false; +} diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index a7370ad..c9c6dac 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -193,7 +193,9 @@ protected: } }; -protected: + bool isAuthorizedForEvent(contact *ctc, void *data); + +private: MonitoringCore *_core; }; diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index 2076e59..80098cc 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -27,7 +27,6 @@ #include "TableEventConsoleEvents.h" #include <memory> #include "Column.h" -#include "MonitoringCore.h" #include "Table.h" #include "TableHosts.h" @@ -129,26 +128,6 @@ string TableEventConsoleEvents::namePrefix() const { return "eventconsoleevents_"; } -// TODO(sp) This is copy-n-pasted in TableEventConsoleHistory. -// TODO(sp) Remove evil casts below. bool TableEventConsoleEvents::isAuthorized(contact *ctc, void *data) { - if (MonitoringCore::Host *hst = static_cast<Row *>(data)->_host) { - return _core->host_has_contact( - hst, reinterpret_cast<MonitoringCore::Contact *>(ctc)); - } - - auto col = static_pointer_cast<ListEventConsoleColumn>( - column("event_contact_groups")); - if (col->isNone(data)) { - return true; - } - - for (const auto &name : col->getValue(data)) { - if (_core->is_contact_member_of_contactgroup( - _core->find_contactgroup(name), - reinterpret_cast<MonitoringCore::Contact *>(ctc))) { - return true; - } - } - return false; + return isAuthorizedForEvent(ctc, data); } diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index d62d889..3b185b4 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -27,7 +27,6 @@ #include "TableEventConsoleHistory.h" #include <memory> #include "Column.h" -#include "MonitoringCore.h" #include "TableEventConsoleEvents.h" using std::make_unique; @@ -75,26 +74,6 @@ string TableEventConsoleHistory::namePrefix() const { return "eventconsolehistory_"; } -// TODO(sp) This is copy-n-pasted in TableEventConsoleEvents. -// TODO(sp) Remove evil casts below. bool TableEventConsoleHistory::isAuthorized(contact *ctc, void *data) { - if (MonitoringCore::Host *hst = static_cast<Row *>(data)->_host) { - return _core->host_has_contact( - hst, reinterpret_cast<MonitoringCore::Contact *>(ctc)); - } - - auto col = static_pointer_cast<ListEventConsoleColumn>( - column("event_contact_groups")); - if (col->isNone(data)) { - return true; - } - - for (const auto &name : col->getValue(data)) { - if (_core->is_contact_member_of_contactgroup( - _core->find_contactgroup(name), - reinterpret_cast<MonitoringCore::Contact *>(ctc))) { - return true; - } - } - return false; + return isAuthorizedForEvent(ctc, data); }

7 years, 7 months

4363 FIX netgear_fans: fixed typo in group

by Simon Betz

Module: check_mk Branch: master Commit: 10bc580a8e4b7e1d4c88e526455801802399b938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10bc580a8e4b7e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 21 10:23:49 2017 +0100 4363 FIX netgear_fans: fixed typo in group Change-Id: I93fa7e7ddb50919548068bfe5597045eb7f5b516 --- .werks/4363 | 10 ++++++++++ checks/netgear_fans | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4363 b/.werks/4363 new file mode 100644 index 0000000..a3ea149 --- /dev/null +++ b/.werks/4363 @@ -0,0 +1,10 @@ +Title: netgear_fans: fixed typo in group +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487669000 + + diff --git a/checks/netgear_fans b/checks/netgear_fans index fba0d35..bf69dcd 100644 --- a/checks/netgear_fans +++ b/checks/netgear_fans @@ -141,5 +141,5 @@ check_info['netgear_fans'] = { 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.4526.100"), 'default_levels_variable' : 'netgear_fans_default_levels', 'includes' : [ 'fan.include' ], - 'group' : 'hw_fan', + 'group' : 'hw_fans', }

7 years, 7 months

check_sql: Fixed output of query results

by Lars Michelsen

Module: check_mk Branch: master Commit: a42a8c3faad81c35531deaaa74ac732cec72ef87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a42a8c3faad81c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 10:24:55 2017 +0100 check_sql: Fixed output of query results Change-Id: I93a9b9d0f0b9b095dd01f40e0ed8db9cb6f285ca --- active_checks/check_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index cb2425f..6cac732 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -253,7 +253,7 @@ except Exception, e: if opt_verbose: - sys.stderr.write("SQL Result:\n %r\n" % result) + sys.stderr.write("SQL Result:\n %r\n" % (result,)) try:

7 years, 7 months

werk list: Added missing component, cleaned up titles

by Lars Michelsen

Module: check_mk Branch: master Commit: dec7f6d033c02783b2803377f2000476a014b292 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dec7f6d033c027… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 10:12:58 2017 +0100 werk list: Added missing component, cleaned up titles Change-Id: I3a196e3dab2764dc20088298215322f158bde5b7 --- lib/werks.py | 39 ++++++++++++++++++++------------------- web/htdocs/werks.py | 8 ++------ 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/lib/werks.py b/lib/werks.py index cb2d201..1d0c41a 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -55,41 +55,42 @@ def werk_classes(): def werk_components(): return { # CRE - "core" : _("Core & Setup"), - "checks" : _("Checks & Agents"), - "multisite" : _("User Interface"), + "core" : _("Core & setup"), + "checks" : _("Checks & agents"), + "multisite" : _("User interface"), "wato" : _("WATO"), "notifications" : _("Notifications"), "bi" : _("BI"), - "reporting" : _("Reporting & Availability"), - "ec" : _("Event Console"), + "reporting" : _("Reporting & availability"), + "ec" : _("Event console"), "livestatus" : _("Livestatus"), - "liveproxy" : _("Livestatus-Proxy"), - "inv" : _("HW/SW-Inventory"), + "liveproxy" : _("Livestatus proxy"), + "inv" : _("HW/SW inventory"), # CEE - "cmc" : _("The Check_MK Micro Core"), - "setup" : _("Setup, Site Management"), + "cmc" : _("The Check_MK micro core"), + "setup" : _("Setup, site management"), "config" : _("Configuration generation"), "inline-snmp" : _("Inline SNMP"), - "agents" : _("Agent Bakery"), - "metrics" : _("Metrics System"), + "agents" : _("Agent bakery"), + "metrics" : _("Metrics system"), + "alerts": _("Alert handlers"), # CMK-OMD - "omd": _("Site Management"), - "rpm": _("RPM Packaging"), - "deb": _("DEB Packaging"), + "omd": _("Site management"), + "rpm": _("RPM packaging"), + "deb": _("DEB packaging"), "nagvis": _("NagVis"), - "packages": _("Other Components"), - "distros": _("Linux Distributions"), + "packages": _("Other components"), + "distros": _("Linux distributions"), } def werk_levels(): return { - 1 : _("Trivial Change"), - 2 : _("Prominent Change"), - 3 : _("Major Feature"), + 1 : _("Trivial change"), + 2 : _("Prominent change"), + 3 : _("Major change"), } diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 0e4675d..0a5f9c6 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -450,12 +450,8 @@ def render_werk_compatibility(werk): return cmk.werks.werk_compatibilities()[werk["compatible"]] def render_werk_component(werk): - if werk["component"] not in cmk.werks.werk_components(): - html.li(_("Invalid component %s in werk %s")\ - % (werk["component"], render_werk_id(werk, with_link=True))) - return werk["component"] - else: - return cmk.werks.werk_components()[werk["component"]] + return cmk.werks.werk_components().get(werk["component"], werk["component"]) + def render_werk_title(werk): title = werk["title"]

7 years, 7 months

Improved error handling when accessing not existing werks

by Lars Michelsen

Module: check_mk Branch: master Commit: 561f8fadef71e4900c8dbe2bbe01e919d191ade8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561f8fadef71e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 10:07:39 2017 +0100 Improved error handling when accessing not existing werks Change-Id: Ibd52d00da65fea2f75db7c6acfae2849009563e2 --- web/htdocs/werks.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 9a1c044..0e4675d 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -53,7 +53,10 @@ def page_version(): def handle_acknowledgement(): if html.var("_werk_ack") and html.check_transaction(): werk_id = html.get_integer_input("_werk_ack") + if werk_id not in g_werks: + raise MKUserError("werk", _("This werk does not exist.")) werk = g_werks[werk_id] + if werk["compatible"] == "incomp_unack": acknowledge_werk(werk) html.message(HTML(_("Werk %s - %s has been acknowledged.") % (render_werk_id(werk, with_link=True), render_werk_title(werk)))) @@ -74,6 +77,8 @@ def handle_acknowledgement(): def page_werk(): load_werks() werk_id = html.get_integer_input("werk") + if werk_id not in g_werks: + raise MKUserError("werk", _("This werk does not exist.")) werk = g_werks[werk_id] html.header(("%s %s - %s") % (_("Werk"), render_werk_id(werk, with_link=False), werk["title"]), stylesheets = werks_stylesheets)

7 years, 7 months

Fixed recently introduced issue on single host aggregation page when having no hosts configured

by Lars Michelsen

Module: check_mk Branch: master Commit: f536293d570cd112a282c9d9631ef22b3b39200e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f536293d570cd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 10:04:27 2017 +0100 Fixed recently introduced issue on single host aggregation page when having no hosts configured Change-Id: I12549301b18998b4bc16e8a329aae9daa7194898 --- web/htdocs/bi.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index b7d6941..e1bc75c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2601,13 +2601,14 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, prec for row in rows: parent_filter += [ 'Filter: host_name = %s\n' % p for p in row["parents"] ] - parent_filter_txt = ''.join(parent_filter) - parent_filter_txt += 'Or: %d\n' % len(parent_filter) - - for row in get_status_info_filtered(parent_filter_txt, only_sites, - limit, add_columns, False, bygroup): - if row['name'] not in hostnames: - rows.append(row) + if parent_filter: + parent_filter_txt = ''.join(parent_filter) + parent_filter_txt += 'Or: %d\n' % len(parent_filter) + + for row in get_status_info_filtered(parent_filter_txt, only_sites, + limit, add_columns, False, bygroup): + if row['name'] not in hostnames: + rows.append(row) return rows

7 years, 7 months

4390 FIX Virtual host trees are now identified by manually set IDs

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fafd0f4f638854c4dbcf5e6352eac37f8bd7f1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fafd0f4f63885… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 09:36:28 2017 +0100 4390 FIX Virtual host trees are now identified by manually set IDs In the past it was possible to delete virtual host trees by accident, because the virtual host trees were identified by their number in the list of trees. The users were also referencing the trees by these IDs. When the trees were re-sorted, the users suddenly had the wrong trees activated. Now you have to provide a unique ID for each virtual host tree Change-Id: I51886cf09ccaa421301d6a092678ce2ec11fd112 --- .werks/4390 | 17 +++++++ web/htdocs/sidebar.py | 14 +++++- web/htdocs/valuespec.py | 2 +- web/plugins/sidebar/shipped.py | 32 ++++++++----- web/plugins/wato/check_mk_configuration.py | 73 ++++++++++++++++++++++-------- 5 files changed, 104 insertions(+), 34 deletions(-) diff --git a/.werks/4390 b/.werks/4390 new file mode 100644 index 0000000..71d4625 --- /dev/null +++ b/.werks/4390 @@ -0,0 +1,17 @@ +Title: Virtual host trees are now identified by manually set IDs +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487666075 + +In the past it was possible to delete virtual host trees by accident, +because the virtual host trees were identified by their number in the +list of trees. + +The users were also referencing the trees by these IDs. When the trees +were re-sorted, the users suddenly had the wrong trees activated. + +Now you have to provide a unique ID for each virtual host tree diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 57575f6..a81e33a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -626,12 +626,22 @@ def ajax_switch_masterstate(): html.write(_("Command %s/%d not found") % (html.attrencode(column), state)) def ajax_tag_tree(): - newconf = int(html.var("conf")) + new_tree = html.var("conf") + tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + if type(tree_conf) == int: tree_conf = {"cwd":{}} # convert from old style - tree_conf["tree"] = newconf + + trees = dict([ (tree["id"], tree) for tree in + wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + + if new_tree not in trees: + raise MKUserError("conf", _("This virtual host tree does not exist.")) + + tree_conf["tree"] = new_tree config.user.save_file("virtual_host_tree", tree_conf) + html.write("OK") def ajax_tag_tree_enter(): path = html.var("path") and html.var("path").split("|") or [] diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index df33621..6f38f2a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2118,7 +2118,7 @@ class DualListChoice(ListChoice): self._autoheight = False else: self._rows = 5 - self._size = kwargs.get("size") # Total with in ex + self._size = kwargs.get("size") # Total width in ex def render_input(self, varprefix, value): diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1b41fbb..d685795 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1805,11 +1805,14 @@ sidebar_snapins["wiki"] = { # '----------------------------------------------------------------------' def compute_tag_tree(taglist): - sites.live().set_prepend_site(True) - query = "GET hosts\n" \ - "Columns: host_name filename state num_services_ok num_services_warn num_services_crit num_services_unknown custom_variables" - hosts = sites.live().query(query) - sites.live().set_prepend_site(False) + try: + sites.live().set_prepend_site(True) + query = "GET hosts\n" \ + "Columns: host_name filename state num_services_ok num_services_warn num_services_crit num_services_unknown custom_variables" + hosts = sites.live().query(query) + finally: + sites.live().set_prepend_site(False) + hosts.sort() def get_tag_group_value(groupentries, tags): @@ -2077,7 +2080,12 @@ def render_tag_tree(): if type(tree_conf) == int: tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style - choices = [ (str(i), v[0]) for i, v in enumerate(config.virtual_host_trees)] + trees = dict([ (tree["id"], tree) for tree in + wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + + choices = sorted([ (tree["id"], tree["title"]) for tree in trees.values() ], + key=lambda x: x[1]) + html.begin_form("vtree") # Give chance to change one level up, if we are in a subtree @@ -2086,19 +2094,19 @@ def render_tag_tree(): upurl = "javascript:virtual_host_tree_enter('%s')" % "|".join(cwd[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") - html.select("vtree", choices, str(tree_conf["tree"]), onchange='virtual_host_tree_changed(this)') + html.select("vtree", choices, "%s" % tree_conf["tree"], onchange='virtual_host_tree_changed(this)') html.br() html.end_form() html.final_javascript(virtual_host_tree_js) try: - title, taggroups = config.virtual_host_trees[tree_conf["tree"]] - except IndexError: + tag_groups = trees[tree_conf["tree"]]["tag_groups"] + except KeyError: # Fallback to first host tree in case the wanted does not exist (anymore) - title, taggroups = config.virtual_host_trees[0] + tag_groups = trees[choices[0][0]]["tag_groups"] - tree = compute_tag_tree(taggroups) - render_tag_tree_level(taggroups, [], cwd, _("Virtual Host Tree"), tree) + tree = compute_tag_tree(tag_groups) + render_tag_tree_level(tag_groups, [], cwd, _("Virtual Host Tree"), tree) sidebar_snapins["tag_tree"] = { "title" : _("Virtual Host Tree"), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2e0322e..3d49ace 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import re + import cmk.paths # .--Global Settings-----------------------------------------------------. @@ -333,29 +335,62 @@ def virtual_host_tree_choices(): for l in range(1, 7) ] +def transform_virtual_host_trees(trees): + def id_from_title(title): + return re.sub("[^-a-zA-Z0-9_]+", "", title.lower()) + + for index, tree in enumerate(trees): + if type(tree) == tuple: + trees[index] = { + "id" : id_from_title(tree[0]), + "title" : tree[0], + "tag_groups" : tree[1], + } + + return sorted(trees, key = lambda x: x["title"]) + + +def validate_virtual_host_trees(value, varprefix): + tree_ids = set() + for tree in value: + if tree["id"] in tree_ids: + raise MKUserError(varprefix, _("The ID needs to be unique.")) + tree_ids.add(tree["id"]) + register_configvar(group, "virtual_host_trees", - ListOf( - Tuple( - elements = [ - TextUnicode( - title = _("Title of the tree"), - allow_empty = False, - ), - DualListChoice( - allow_empty = False, - custom_order = True, - choices = virtual_host_tree_choices, - rows = 10, - ) - ] + Transform( + ListOf( + Dictionary( + elements = [ + ("id", ID( + title = _("ID"), + allow_empty = False, + )), + ("title", TextUnicode( + title = _("Title of the tree"), + allow_empty = False, + )), + ("tag_groups", DualListChoice( + allow_empty = False, + custom_order = True, + choices = virtual_host_tree_choices, + rows = 10, + size = 80, + )), + ], + optional_keys = [], + ), + add_label = _("Create new virtual host tree configuration"), + title = _("Virtual Host Trees"), + help = _("Here you can define tree configurations for the snapin <i>Virtual Host-Trees</i>. " + "These trees organize your hosts based on their values in certain host tag groups. " + "Each host tag group you select will create one level in the tree."), + validate = validate_virtual_host_trees, + movable = False, ), - add_label = _("Create new virtual host tree configuration"), - title = _("Virtual Host Trees"), - help = _("Here you can define tree configurations for the snapin <i>Virtual Host-Trees</i>. " - "These trees organize your hosts based on their values in certain host tag groups. " - "Each host tag group you select will create one level in the tree."), + forth = transform_virtual_host_trees, ), domain = "multisite", )

7 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017