Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

Some german translations and fixes in texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 844b63c7d3d2dc46078541bcddfe91eabf569829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=844b63c7d3d2dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 17 11:07:17 2017 +0100 Some german translations and fixes in texts Change-Id: Ic488820753eef934453748c6067cc736f3001959 --- web/htdocs/wato.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b90dceb..5b887d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3089,7 +3089,7 @@ class ModeDiscovery(WatoMode): "disable them. If you are sure that they are just transitional, just leave them " "until they vanish.")), # undecided ("vanished", True, _("Vanished services (monitored, but no longer exist)"), - _("These service had been added to the monitoring by a previous discovery " + _("These services had been added to the monitoring by a previous discovery " "but the actual items that are monitored are not present anymore. This might " "be due to a real failure. In that case you should leave them in the monitoring. " "If the actually monitored things are really not relevant for the monitoring " @@ -3099,20 +3099,20 @@ class ModeDiscovery(WatoMode): _("These services had been found by a discovery and are currently configured " "to be monitored.")), ("ignored", True, _("Disabled services"), - _("These services are being discovery but have been disabled by creating a rule " - "in the rule set <i>Disabled service</i> oder <i>Disabled checks</i>.")), + _("These services are being discovered but have been disabled by creating a rule " + "in the rule set <i>Disabled services</i> oder <i>Disabled checks</i>.")), ("active", False, _("Active checks"), - _("These service do not use the Check_MK agent or Check_MK-SNMP engine but actively " + _("These services do not use the Check_MK agent or Check_MK-SNMP engine but actively " "call classical check plugins. They have been added by a rule in the section " "<i>Active checks</i> or implicitely by Check_MK.")), ("manual", False, _("Manual checks"), _("These services have not been found by the discovery but have been added " - "manually by a rule in the WATO module <i>Manual checks</i>")), + "manually by a rule in the WATO module <i>Manual checks</i>.")), ("legacy", False, _("Legacy services (defined in main.mk)"), - _("These services have been configured by the deprecated variable <i>legacy_check</i> " + _("These services have been configured by the deprecated variable <tt>legacy_checks</tt> " "in <tt>main.mk</tt> or a similar configuration file.")), ("custom", False, _("Custom checks (defined via rule)"), - _("These service do not use the Check_MK agent or Check_MK-SNMP engine but actively " + _("These services do not use the Check_MK agent or Check_MK-SNMP engine but actively " "call a classical check plugin, that you have installed yourself.")), ("clustered_old", False, _("Monitored clustered services (located on cluster host)"), _("These services have been found on this host but have been mapped to "

7 years, 3 months

crawler: Removed saving of old report file

by Lars Michelsen

Module: check_mk Branch: master Commit: 684ed30aff3e7a9e003628893ec4c540528b5262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=684ed30aff3e7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 10:47:15 2017 +0100 crawler: Removed saving of old report file Change-Id: I93d623f521d2c5bcc502b4a71d38288823d90f51 --- tests/web/test_crawl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 2dd0706..c83468d 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -374,8 +374,8 @@ class TestCrawler(object): (len(self.visited), time.time() - self.started, "\n".join(self.errors))) # Copy the previous file for analysis - if os.path.exists(self.report_file()): - open(self.report_file()+".old", "w").write(open(self.report_file()).read()) + #if os.path.exists(self.report_file()): + # open(self.report_file()+".old", "w").write(open(self.report_file()).read()) os.rename(self.report_file()+".tmp", self.report_file())

7 years, 3 months

4504 FIX Removed wrong context menu links to add "availability views" to dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a3467e47b0c97f617ce0fdd9540c4b63f53b3c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a3467e47b0c97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 10:27:20 2017 +0100 4504 FIX Removed wrong context menu links to add "availability views" to dashboards Change-Id: I84f2e1d579ab1440f227edc0bf2dbdab4afec814 --- .werks/4504 | 10 ++++++++++ web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4504 b/.werks/4504 new file mode 100644 index 0000000..8b64161 --- /dev/null +++ b/.werks/4504 @@ -0,0 +1,10 @@ +Title: Removed wrong context menu links to add "availability views" to dashboards +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489742803 +Class: fix + + diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index fc94229..a49d91d 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1271,7 +1271,7 @@ def popup_list_dashboards(add_type): if not config.user.may("general.edit_dashboards"): return [] - if add_type == "graph_collection": + if add_type in [ "availability", "graph_collection" ]: return load_dashboards() diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ff33ad0..d592cbe 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2709,7 +2709,7 @@ class html(HTMLGenerator, Encoder, RequestHandler): self.popup_trigger( self.render_icon("menu", _("Add this view to..."), cssclass="iconbutton inline"), 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}], - url_vars=[("add_type", "view")]) + url_vars=[("add_type", mode_name)]) # TODO: This should be handled by pagetypes.py elif self.myfile == "graph_collection":

7 years, 3 months

Fixed broken condition

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b98d06295149aabe8bbdc322a21f5539c2fcccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b98d06295149a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 10:36:08 2017 +0100 Fixed broken condition Change-Id: I51c4515e871bc509a6fb604e26f05ea7ac30f62d --- tests/web/test_crawl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index a3a37dd..2dd0706 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -258,7 +258,7 @@ class Worker(threading.Thread): raise InvalidUrl("Skipping filled in filter URL: %s" % url) # Don't follow the view editor - if "edit_view.py": + if "edit_view.py" in url: raise InvalidUrl("Skipping view editor URL: %s" % url) # Skip agent download files

7 years, 3 months

4503 FIX Graph designer: Show warnings when all or single sites use incompatible cores

by Lars Michelsen

Module: check_mk Branch: master Commit: cb4c50bab878f02432de146c8e6b7b04ca1584de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb4c50bab878f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 10:10:58 2017 +0100 4503 FIX Graph designer: Show warnings when all or single sites use incompatible cores Change-Id: Ifaf94126a44773334e17e2ad3c2179a6c3af1d7f --- .werks/4503 | 10 ++++++++++ web/htdocs/sites.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/.werks/4503 b/.werks/4503 new file mode 100644 index 0000000..ced4001 --- /dev/null +++ b/.werks/4503 @@ -0,0 +1,10 @@ +Title: Graph designer: Show warnings when all or single sites use incompatible cores +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1489741823 +Class: fix + + diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 003cd7d..3c22398 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -72,6 +72,36 @@ def disconnect(): _site_status = None +def sites_using_foreign_cores(): + site_ids = [] + for site_id, core in cores_by_site().items(): + if core not in [ "cmc", None ]: + site_ids.append(site_id) + + return sorted(site_ids) + + +def all_sites_use_foreign_cores(): + for site_id, core in cores_by_site().items(): + if core == "cmc": + return False + + return True + + +def cores_by_site(): + cores = {} + for site_id, site_state in states().items(): + # Offline sites don't provide core info. Assume CMC is this case + if site_state["state"] == "dead": + state = "cmc" + else: + state = site_state.get("core") + + cores[site_id] = state + + return cores + #. # .--Internal------------------------------------------------------------. # | ___ _ _ |

7 years, 3 months

GUI Crawl: do not visit view editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 83cbf424b0d3b5d52f168010566dbd52bec0f317 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83cbf424b0d3b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 09:49:27 2017 +0100 GUI Crawl: do not visit view editor Change-Id: I96a36c83917d05eeea0d55ef3b217a4f967afc6d --- tests/web/test_crawl.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index cc8c77e..a3a37dd 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -257,6 +257,10 @@ class Worker(threading.Thread): if "view.py" in url and "filled_in=filter" in url: raise InvalidUrl("Skipping filled in filter URL: %s" % url) + # Don't follow the view editor + if "edit_view.py": + raise InvalidUrl("Skipping view editor URL: %s" % url) + # Skip agent download files if parsed.path.startswith("/%s/check_mk/agents/" % self.crawler.site.id): raise InvalidUrl("Skipping agent download file: %s" % url)

7 years, 3 months

4502 FIX LDAP: Fixed setting default values for user/ group filters and attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 9240615db7d6c0b730b380dc94654d25a1914743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9240615db7d6c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 09:28:27 2017 +0100 4502 FIX LDAP: Fixed setting default values for user/group filters and attributes Change-Id: Ie044104addcea9b3a778629624de34aefc6a077a --- .werks/4502 | 11 +++++++++++ web/plugins/userdb/ldap.py | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4502 b/.werks/4502 new file mode 100644 index 0000000..d692886 --- /dev/null +++ b/.werks/4502 @@ -0,0 +1,11 @@ +Title: LDAP: Fixed setting default values for user/group filters and attributes +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489739280 + + diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index d747f94..fa3e2b9 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1244,7 +1244,9 @@ g_editing_connection_id = None def ldap_attr_of_connection(connection_id, attr): connection = get_connection(connection_id) if not connection: - return None + # Handle "new connection" situation where there is no connection object existant yet. + # The default type is "Active directory", so we use it here. + return ldap_attr_map["ad"].get(attr, attr).lower() return connection.ldap_attr(attr) @@ -1253,7 +1255,9 @@ def ldap_attr_of_connection(connection_id, attr): def ldap_filter_of_connection(connection_id, *args, **kwargs): connection = get_connection(connection_id) if not connection: - return None + # Handle "new connection" situation where there is no connection object existant yet. + # The default type is "Active directory", so we use it here. + return ldap_filter_map["ad"].get(args[0], '(objectclass=*)') return connection.ldap_filter(*args, **kwargs)

7 years, 3 months

Fixed sometimes broken snmp_communities link in host SNMP community help text

by Lars Michelsen

Module: check_mk Branch: master Commit: dcb6f27ad2fe2ecdc3bd4033c42823a7d1d9b9fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcb6f27ad2fe2e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 09:47:34 2017 +0100 Fixed sometimes broken snmp_communities link in host SNMP community help text Change-Id: I79c067cb575216a609f87e3ca1575910d5512811 --- web/plugins/wato/builtin_attributes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 338f515..360c981 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -184,7 +184,8 @@ declare_host_attribute( "contacting this host via SNMP v1/v2 or v3. It is possible to configure the SNMP community by " "using the <a href=\"%s\">SNMP Communities</a> ruleset, but when you configure " "a community here, this will override the community defined by the rules.") % \ - html.makeuri([('mode', 'edit_ruleset'), ('varname', 'snmp_communities')]), + html.makeuri_contextless([('mode', 'edit_ruleset'), ('varname', 'snmp_communities')], + filename="wato.py"), default_value = None, ) ),

7 years, 3 months

Cleaned up some hand crafted HTML code

by Lars Michelsen

Module: check_mk Branch: master Commit: 4222729b6e43fc8bf2a81dcebc4cab32b0867625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4222729b6e43fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 08:42:42 2017 +0100 Cleaned up some hand crafted HTML code Change-Id: I57d2354f6f2297e8c129f367619cdd654ad38163 --- web/htdocs/wato.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d7a1130..b90dceb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -794,8 +794,9 @@ def show_hosts(folder): # Column with actions (buttons) if show_checkboxes: - table.cell("<input type=button class=checkgroup name=_toggle_group" - " onclick=\"toggle_all_rows();\" value=\"X\" />", sortable=False) + table.cell(html.render_input("_toggle_group", type_="button", + class_="checkgroup", onclick="toggle_all_rows();", + value='X'), sortable=False, css="checkbox") # Use CSS class "failed" in order to provide information about # selective toggling inventory-failed hosts for Javascript html.input(name="_c_%s" % hostname, type_="checkbox", value=colspan, @@ -3306,9 +3307,9 @@ class ModeDiscovery(WatoMode): table.cell(css="checkbox") return - table.cell("<input type=button class=checkgroup name=_toggle_group" - " onclick=\"toggle_group_rows(this);\" value=\"X\" />", sortable=False, - css="checkbox") + table.cell(html.render_input("_toggle_group", type_="button", + class_="checkgroup", onclick="toggle_group_rows(this);", + value='X'), sortable=False, css="checkbox") html.checkbox(self._checkbox_name(check_source,check_type, item), True, add_attr = ['title="%s"' % _('Temporarily ignore this service')]) @@ -10422,9 +10423,9 @@ def mode_users(phase): table.row() # Checkboxes - table.cell("<input type=button class=checkgroup name=_toggle_group" - " onclick=\"toggle_all_rows();\" value=\"%s\" />" % _('X'), - sortable=False, css="buttons") + table.cell(html.render_input("_toggle_group", type_="button", + class_="checkgroup", onclick="toggle_all_rows();", + value='X'), sortable=False, css="checkbox") if id != config.user.id: html.checkbox("_c_user_%s" % id)

7 years, 3 months

4501 Bulk delete possible for bookmark lists, graph collections and custom graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 0919648e871dcd2f3740d89bbaacccd3723459f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0919648e871dcd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 17 09:00:41 2017 +0100 4501 Bulk delete possible for bookmark lists, graph collections and custom graphs A bulk deletion option has been added to the bookmark lists, graph collections and custom graphs. A users own elements and elements of other users can now be deleted in bulk (if permitted). Change-Id: I8dcea4745a755837b99d5f3cf3d7dce3f4d918dd --- .werks/4501 | 11 +++++++++ web/htdocs/js/checkmk.js | 2 +- web/htdocs/pagetypes.py | 61 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/.werks/4501 b/.werks/4501 new file mode 100644 index 0000000..4b13217 --- /dev/null +++ b/.werks/4501 @@ -0,0 +1,11 @@ +Title: Bulk delete possible for bookmark lists, graph collections and custom graphs +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489737551 +Class: feature + +A bulk deletion option has been added to the bookmark lists, graph collections and custom graphs. +A users own elements and elements of other users can now be deleted in bulk (if permitted). diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 454d594..e003e14 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1624,7 +1624,7 @@ function iter_cells(checkbox, func) { function get_all_checkboxes(container) { var checkboxes = []; - if(typeof(container) === 'object' && container.length) { + if(typeof(container) === 'object' && container.length && !container.tagName) { // Array given - at the moment this is a list of TR objects // Skip the header checkboxes for(var i = 0; i < container.length; i++) { diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index c591fb7..3fb2216 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -824,6 +824,16 @@ class Overridable(Base): html.write("<div class=error>%s</div>\n" % e.message) html.add_user_error(e.varname, e.message) + # Bulk delete + if html.var("_bulk_delete_my") and html.transaction_valid(): + if self._bulk_delete_after_confirm("my") == False: + html.footer() + return + + elif html.var("_bulk_delete_foreign") and html.transaction_valid(): + if self._bulk_delete_after_confirm("foreign") == False: + html.footer() + return my_instances = [] foreign_instances = [] @@ -838,20 +848,30 @@ class Overridable(Base): or instance.may_delete() or instance.may_edit(): foreign_instances.append(instance) - for title, instances in [ - (_('Customized'), my_instances), - (_('Owned by other users'), foreign_instances), - (_('Builtin'), builtin_instances), + + for what, title, instances in [ + ("my", _('Customized'), my_instances), + ("foreign", _('Owned by other users'), foreign_instances), + ("builtin", _('Builtin'), builtin_instances), ]: if not instances: continue html.write('<h3>' + title + '</h3>') + if what != "builtin": + html.begin_form("bulk_delete_%s" % what, method="POST") + table.begin(limit = None) for instance in instances: table.row() + if what != "builtin" and instance.may_delete(): + table.cell(html.render_input("_toggle_group", type_="button", + class_="checkgroup", onclick="toggle_all_rows(this.form);", + value='X'), sortable=False, css="checkbox") + html.checkbox("_c_%s+%s+%s" % (what, instance.owner(), instance.name())) + # Actions table.cell(_('Actions'), css = 'buttons visuals') @@ -895,11 +915,44 @@ class Overridable(Base): # TODO: Haeeh? Another custom columns ### if render_custom_columns: ### render_custom_columns(visual_name, visual) + table.end() + if what != "builtin": + html.button("_bulk_delete_%s" % what, _("Bulk delete"), "submit", + style="margin-top:10px") + html.hidden_fields() + html.end_form() + html.footer() return + + @classmethod + def _bulk_delete_after_confirm(cls, what): + to_delete = [] + for varname in html.all_varnames_with_prefix("_c_%s+" % what): + if html.get_checkbox(varname): + checkbox_ident = varname.split("_c_%s+" % what)[-1] + to_delete.append(checkbox_ident.split("+", 1)) + + if not to_delete: + return + + c = html.confirm(_("Do you really want to delete %d %s?") % + (len(to_delete), cls.phrase("title_plural"))) + + if c: + for owner, instance_id in to_delete: + cls.remove_instance((owner, instance_id)) + + for owner in set([ e[0] for e in to_delete]): + cls.save_user_instances(owner) + + html.reload_sidebar() + elif c == False: + return False + # Override this in order to display additional columns of an instance # in the table of all instances. def render_extra_columns(self):

7 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017