Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64178 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf9384eda24f3b1202eacb55d8cc736d12e428eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf9384eda24f3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 16:07:48 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: ValueSpec dicctionary: allow mandatory keys

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 21d57f167d45bf0844585ea66eea27ccaa02f0ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d57f167d45bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 15:11:17 2012 +0100 ValueSpec dicctionary: allow mandatory keys --- modules/check_mk.py | 8 +++-- web/htdocs/valuespec.py | 74 ++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b331c5b..508c0b7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1141,9 +1141,11 @@ def host_contactgroups_of(hostlist): # recognized. first_list = True for entry in host_extra_conf(host, host_contactgroups): - if type(entry) == list and first_list: - cgrs += entry - first_list = False + if type(entry) == list: + if first_list: + cgrs += entry + first_list = False + # else: silenty ignore any further matching rules else: cgrs.append(entry) return list(set(cgrs)) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index fe7907f..4eb9180 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -169,12 +169,13 @@ class Age(ValueSpec): class Integer(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._size = kwargs.get("size", 5) - self._minvalue = kwargs.get("minvalue") - self._maxvalue = kwargs.get("maxvalue") - self._label = kwargs.get("label") - self._unit = kwargs.get("unit", "") - self._thousand_sep = kwargs.get("thousand_sep") + self._size = kwargs.get("size", 5) + self._minvalue = kwargs.get("minvalue") + self._maxvalue = kwargs.get("maxvalue") + self._label = kwargs.get("label") + self._unit = kwargs.get("unit", "") + self._thousand_sep = kwargs.get("thousand_sep") + self._display_format = kwargs.get("display_format", "%d") if "size" not in kwargs and "maxvalue" in kwargs: self._size = 1 + int(math.log10(self._maxvalue)) @@ -186,13 +187,13 @@ class Integer(ValueSpec): return 0 def render_input(self, varprefix, value): - html.number_input(varprefix, str(value), size = self._size) - if self._label or self._unit: + if self._label: + html.write(self._label) html.write(" ") - if self._label: - html.write(self._label) - elif self._unit: - html.write(self._unit) + html.number_input(varprefix, self._display_format % value, size = self._size) + if self._unit: + html.write(" ") + html.write(self._unit) def from_html_vars(self, varprefix): try: @@ -202,7 +203,7 @@ class Integer(ValueSpec): _("The text <b><tt>%s</tt></b> is not a valid integer number." % html.var(varprefix))) def value_to_text(self, value): - text = str(value) + text = self._display_format % value if self._thousand_sep: sepped = "" rest = text @@ -929,14 +930,8 @@ class Dictionary(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] - -## def help(self): -## h = [] -## for key, vs in self._elements: -## hh = vs.help() -## if hh: -## h.append("</i>%s<br><i>%s" % (vs.title(), hh)) -## return "<br><br>".join(h) + self._optional_keys = kwargs.get("optional_keys", True) + self._columns = kwargs.get("columns", 1) # possible: 1 or 2 def render_input(self, varprefix, value): html.write("<table class=dictionary>") @@ -944,13 +939,24 @@ class Dictionary(ValueSpec): html.write("<tr><td>") vp = varprefix + "_" + param div_id = vp - visible = html.get_checkbox(vp + "_USE") - if visible == None: - visible = param in value - html.checkbox(vp + "_USE", param in value, - onclick="valuespec_toggle_option(this, %r)" % div_id) - html.write(" %s<br>" % vs.title()) - html.write('<div class=dictelement id="%s" style="display: %s">' % ( + if self._optional_keys: + visible = html.get_checkbox(vp + "_USE") + if visible == None: + visible = param in value + html.checkbox(vp + "_USE", param in value, + onclick="valuespec_toggle_option(this, %r)" % div_id) + else: + visible = True + + if self._columns == 2: + html.write('<div style="float: left">') + html.write(" %s" % vs.title()) + if self._columns == 2: + html.write(': </div>') + else: + html.write("<br>") + + html.write('<div class=dictelement id="%s" style="float: left; display: %s">' % ( div_id, not visible and "none" or "")) if vs.help(): html.write("<ul class=help>%s</ul>" % vs.help()) @@ -962,7 +968,11 @@ class Dictionary(ValueSpec): self._elements[0][1].set_focus(varprefix + self._elements[0][0]) def canonical_value(self): - return {} + if self._optional_keys: + return {} + else: + return dict([ + (name, vs.canonical_value()) for (name, vs) in self._elements]) def value_to_text(self, value): parts = [] @@ -975,7 +985,7 @@ class Dictionary(ValueSpec): value = {} for param, vs in self._elements: vp = varprefix + "_" + param - if html.get_checkbox(vp + "_USE"): + if not self._optional_keys or html.get_checkbox(vp + "_USE"): value[param] = vs.from_html_vars(vp) return value @@ -987,6 +997,8 @@ class Dictionary(ValueSpec): if param in value: vp = varprefix + "_" + param vs.validate_datatype(value[param], vp) + elif not self._optional_keys: + raise MKUserError(varprefix, _("The entry %s is missing") % vp.title()) # Check for exceeding keys allowed_keys = [ p for (p,v) in self._elements ] @@ -1000,6 +1012,8 @@ class Dictionary(ValueSpec): if param in value: vp = varprefix + "_" + param vs.validate_value(value[param], vp) + elif not self._optional_keys: + raise MKUserError(varprefix, _("The entry %s is missing") % vp.title()) # Base class for selection of a Nagios element out

12 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80f750551107eba09e1b3e0086f3a4121065d0a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f750551107eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 16:07:08 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Various optimizations in ValueSpecs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9773f152af9780829e88fc32b4c33e229a37365e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9773f152af9780… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 16:07:41 2012 +0100 Various optimizations in ValueSpecs --- web/htdocs/check_mk.css | 51 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/valuespec.py | 24 +++++++++++----------- web/htdocs/wato.css | 31 ---------------------------- 3 files changed, 63 insertions(+), 43 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 57802d8..078cef3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -241,3 +241,54 @@ div.warning { border-color: #fc0; } +/*-ValueSpec---------------------------------------------------------------. +| __ __ _ ____ | +| \ \ / /_ _| |_ _ ___/ ___| _ __ ___ ___ | +| \ \ / / _` | | | | |/ _ \___ \| '_ \ / _ \/ __| | +| \ V / (_| | | |_| | __/___) | |_) | __/ (__ | +| \_/ \__,_|_|\__,_|\___|____/| .__/ \___|\___| | +| |_| | ++--------------------------------------------------------------------------+ +| Styles needed for HTML code produced by valuespec.py. | +'-------------------------------------------------------------------------*/ + +td.content ul.help { + color: white; + font-style: italic; + font-size: 8pt; + padding: 0; + margin: 0 0 5px 0; + /* width: 300px; */ +} + +table.dictionary { +} + +table.dictionary td.dictright { + white-space: nowrap; + padding: 0px; + border-style: none; +} + +div.dictelement * { + font-size: 8pt; +} +div.dictelement { + font-size: 8pt; + padding-left: 10px; + border-left: 2px solid #ccc; + margin-left: 8px; + margin-bottom: 10px; + margin-top: 3px; + float: none; +} + +td.content table.valuespec_tuple td.left { + padding-right: 10px; +} + +td.content table.valuespec_tuple td.right, +td.content table.valuespec_tuple td.left { + vertical-align: top; + padding-bottom: 10px; +} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4eb9180..e72bf38 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -190,7 +190,7 @@ class Integer(ValueSpec): if self._label: html.write(self._label) html.write(" ") - html.number_input(varprefix, self._display_format % value, size = self._size) + html.number_input(varprefix, str(value), size = self._size) if self._unit: html.write(" ") html.write(self._unit) @@ -686,19 +686,18 @@ class OptionalDropdownChoice(ValueSpec): if val == value: defval = str(n) options.append(("other", self._otherlabel)) - html.select(varprefix, options, defval, attrs={"style":"float:left;"}, + html.select(varprefix, options, defval, # attrs={"style":"float:left;"}, onchange="valuespec_toggle_dropdown(this, '%s_ex');" % varprefix ) - if html.form_submitted(): div_is_open = html.var(varprefix) == "other" else: div_is_open = self.value_is_explicit(value) - html.write('<div id="%s_ex" style="white-space: nowrap; %s">' % ( + html.write('<span id="%s_ex" style="white-space: nowrap; %s">' % ( varprefix, not div_is_open and "display: none;" or "")) - html.write("   ") + html.write(" ") self._explicit.render_input(varprefix + "_ex", value) - html.write("</div>") + html.write("</span>") def value_to_text(self, value): return self._explicit.value_to_text(value) @@ -936,7 +935,7 @@ class Dictionary(ValueSpec): def render_input(self, varprefix, value): html.write("<table class=dictionary>") for param, vs in self._elements: - html.write("<tr><td>") + html.write("<tr><td class=dictleft>") vp = varprefix + "_" + param div_id = vp if self._optional_keys: @@ -948,17 +947,18 @@ class Dictionary(ValueSpec): else: visible = True - if self._columns == 2: - html.write('<div style="float: left">') html.write(" %s" % vs.title()) if self._columns == 2: - html.write(': </div>') + html.write(':') + if vs.help(): + html.write("<ul class=help>%s</ul>" % vs.help()) + html.write('</td><td class=dictright>') else: html.write("<br>") - html.write('<div class=dictelement id="%s" style="float: left; display: %s">' % ( + html.write('<div class=dictelement id="%s" style="display: %s">' % ( div_id, not visible and "none" or "")) - if vs.help(): + if self._columns == 1 and vs.help(): html.write("<ul class=help>%s</ul>" % vs.help()) vs.render_input(vp, value.get(param, vs.canonical_value())) html.write("</div></td></tr>") diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 4021bac..62de082 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -303,37 +303,6 @@ Boston, MA 02110-1301 USA. position: relative; top: -3px; } -.wato table.ruleeditor td.content ul.help { - color: white; - font-style: italic; - font-size: 8pt; - padding: 0; - margin: 0 0 5px 0; - width: 300px; -} - -.wato div.dictelement * { - font-size: 8pt; -} -.wato div.dictelement { - font-size: 8pt; - padding-left: 10px; - border-left: 2px solid #ccc; - margin-left: 8px; - margin-bottom: 10px; - margin-top: 3px; - float: none; -} - -.wato table.form.ruleeditor td.content table.valuespec_tuple td.left { - padding-right: 10px; -} - -.wato table.form.ruleeditor td.content table.valuespec_tuple td.right, -.wato table.form.ruleeditor td.content table.valuespec_tuple td.left { - vertical-align: top; - padding-bottom: 10px; -} .wato div.rule div.title { position: absolute;

12 years, 8 months

Check_MK Git: check_mk: Added missing localizable strings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3c1914dbae9e9c2dba7801835dbaf41e10f1844 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3c1914dbae9e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:42:02 2012 +0100 Added missing localizable strings --- web/htdocs/config.py | 63 ++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 07dfe98..0197bfd 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -154,86 +154,85 @@ def declare_permission(name, title, description, defaults): def declare_permission_section(name, title): permission_sections[name] = title -# TODO: _(...) declare_permission("use", - "Use Multisite at all", - "Users without this permission are not let in at all", + _("Use Multisite at all"), + _("Users without this permission are not let in at all"), [ "admin", "user", "guest" ]) declare_permission("edit_permissions", - "Configure permissions", - "Configure, which user role has which permissions", + _("Configure permissions"), + _("Configure, which user role has which permissions"), [ "admin" ]) declare_permission("see_all", - "See all Nagios objects", - "See all objects regardless of contacts and contact groups. If combined with 'perform commands' then commands may be done on all objects.", + _("See all Nagios objects"), + _("See all objects regardless of contacts and contact groups. If combined with 'perform commands' then commands may be done on all objects."), [ "admin", "guest" ]) declare_permission("edit_views", - "Edit views", - "Create own views and customize builtin views", + _("Edit views"), + _("Create own views and customize builtin views"), [ "admin", "user" ]) declare_permission("publish_views", - "Publish views", - "Make views visible and usable for other users", + _("Publish views"), + _("Make views visible and usable for other users"), [ "admin", "user" ]) declare_permission("force_views", - "Modify builtin views", - "Make own published views override builtin views for all users", + _("Modify builtin views"), + _("Make own published views override builtin views for all users"), [ "admin" ]) declare_permission("view_option_columns", - "Change view display columns", - "Interactively change the number of columns being displayed by a view (does not edit or customize the view)", + _("Change view display columns"), + _("Interactively change the number of columns being displayed by a view (does not edit or customize the view)"), [ "admin", "user", "guest" ]) declare_permission("view_option_refresh", - "Change view display refresh", - "Interactively change the automatic browser reload of a view being displayed (does not edit or customize the view)", + _("Change view display refresh"), + _("Interactively change the automatic browser reload of a view being displayed (does not edit or customize the view)"), [ "admin", "user" ]) declare_permission("painter_options", - "Change column display options", - "Some of the display columns offer options for customizing their output. " + _("Change column display options"), + _("Some of the display columns offer options for customizing their output. " "For example time stamp columns can be displayed absolute, relative or " - "in a mixed style. This permission allows the user to modify display options", + "in a mixed style. This permission allows the user to modify display options"), [ "admin", "user", "guest" ]) declare_permission("act", - "Perform commands", - "Allows users to perform Nagios commands. If now futher permissions are granted, actions can only be done one objects one is a contact for", + _("Perform commands"), + _("Allows users to perform Nagios commands. If now futher permissions are granted, actions can only be done one objects one is a contact for"), [ "admin", "user" ]) declare_permission("see_sidebar", - "Use Check_MK sidebar", - "Without this permission the Check_MK sidebar will be invisible", + _("Use Check_MK sidebar"), + _("Without this permission the Check_MK sidebar will be invisible"), [ "admin", "user", "guest" ]) declare_permission("configure_sidebar", - "Configure sidebar", - "This allows the user to add, move and remove sidebar snapins.", + _("Configure sidebar"), + _("This allows the user to add, move and remove sidebar snapins."), [ "admin", "user" ]) declare_permission('edit_profile', - 'Edit the user profile', - 'Permits the user to change the user profile settings.', + _('Edit the user profile'), + _('Permits the user to change the user profile settings.'), [ 'admin', 'user' ] ) declare_permission('change_password', - 'Edit the user password', - 'Permits the user to change the password.', + _('Edit the user password'), + _('Permits the user to change the password.'), [ 'admin', 'user' ] ) declare_permission('logout', - 'Logout', - 'Permits the user to logout.', + _('Logout'), + _('Permits the user to logout.'), [ 'admin', 'user', 'guest' ] )

12 years, 8 months

Check_MK Git: check_mk: FIX: Fixed problem with duplicate permissions when using the i18n of multiisite

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a23232de1942c371dba3e3d47895d9b2999ecfa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a23232de1942c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:59:45 2012 +0100 FIX: Fixed problem with duplicate permissions when using the i18n of multiisite --- ChangeLog | 1 + web/htdocs/config.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa96d20..1673ec2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite + * FIX: Fixed problem with duplicate permissions when using the i18n of multiisite * FIX: Writing single host_contactgroups rules for each selected contactgroup in host edit dialog diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0197bfd..ab1c968 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -148,8 +148,16 @@ permission_sections = {} def declare_permission(name, title, description, defaults): perm = { "name" : name, "title" : title, "description" : description, "defaults" : defaults } + + # Detect if this permission has already been declared before + # The dict value is replaced automatically but the list value + # to be replaced -> INPLACE! + if perm in permissions_by_order: + permissions_by_order[permissions_by_order.index(perm)] = perm + else: + permissions_by_order.append(perm) + permissions_by_name[name] = perm - permissions_by_order.append(perm) def declare_permission_section(name, title): permission_sections[name] = title

12 years, 8 months

Check_MK Git: check_mk: Showing group aliases only in group selection dialog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7de54a69b2f14e62016aa1483e651348563930e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7de54a69b2f14e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:30:57 2012 +0100 Showing group aliases only in group selection dialog --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4cd5732..08cd83a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4772,7 +4772,7 @@ class GroupSelection(ElementSelection): all_groups = load_group_information() this_group = all_groups.get(self._what, {}) # replace the title with the key if the title is empty - return dict([ (k, t and ("%s - %s" % (k,t)) or k) for (k, t) in this_group.items() ]) + return dict([ (k, t and t or k) for (k, t) in this_group.items() ]) class CheckTypeGroupSelection(ElementSelection):

12 years, 8 months

Check_MK Git: check_mk: FIX: Writing single host_contactgroups rules for each selected

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c7b8ae5e31a75c601a887ae84107ccff24b4f97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7b8ae5e31a75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:35:22 2012 +0100 FIX: Writing single host_contactgroups rules for each selected contactgroup in host edit dialog --- ChangeLog | 2 ++ web/htdocs/wato.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa25f7e..fa96d20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,8 @@ * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite + * FIX: Writing single host_contactgroups rules for each selected + contactgroup in host edit dialog BI: * improve doc/treasures/check_bi_local.py: local check that creates diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08cd83a..8be9137 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -624,7 +624,10 @@ def save_hosts(folder = None): if "contactgroups" in host: use, cgs = host["contactgroups"] if use and cgs: - out.write("\nhost_contactgroups.append(( %r, [%r] ))\n" % (cgs, hostname)) + out.write("\nhost_contactgroups += [\n") + for cg in cgs: + out.write(' ( %r, [%r] )\n' % (cg, hostname)) + out.write(']\n\n') for attr, topic in host_attributes: attrname = attr.name()

12 years, 8 months

Check_MK Git: check_mk: FIX: Fixed encoding problems with umlauts in group aliases

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2d8060a086dd064b4ce59fc2f46a8d80de3217a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2d8060a086dd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:07:35 2012 +0100 FIX: Fixed encoding problems with umlauts in group aliases --- ChangeLog | 1 + modules/check_mk.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f9f724..aa25f7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ correctly * cmk --localize update supports an optional ALIAS which is used as display string in the multisite GUI + * FIX: Fixed encoding problems with umlauts in group aliases Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/modules/check_mk.py b/modules/check_mk.py index b099fc7..2063c73 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1782,7 +1782,7 @@ define hostgroup { hostgroup_name\t\t%s alias\t\t\t\t%s } -""" % (hg, alias)) +""" % (hg, alias.encode("utf-8"))) # No creation of host groups but we need to define # default host group @@ -1812,7 +1812,7 @@ define servicegroup { servicegroup_name\t\t%s alias\t\t\t\t%s } -""" % (sg, alias)) +""" % (sg, alias.encode("utf-8"))) def create_nagios_config_contactgroups(outfile): if define_contactgroups: @@ -1829,7 +1829,7 @@ def create_nagios_config_contactgroups(outfile): outfile.write("\ndefine contactgroup {\n" " contactgroup_name\t\t%s\n" " alias\t\t\t\t%s\n" - "}\n" % (name, alias)) + "}\n" % (name, alias.encode("utf-8"))) def create_nagios_config_commands(outfile):

12 years, 8 months

Check_MK Git: check_mk: *_contactgroups lists: Single group rules are all appended. When a list

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6fb9c2ca0f1ea458ea943fe5d90dbd91e114c3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6fb9c2ca0f1ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 15:03:58 2012 +0100 *_contactgroups lists: Single group rules are all appended. When a list is found as a value this first list is used exclusively. All other matching rules are ignored --- ChangeLog | 3 +++ modules/check_mk.py | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f05e854..8f9f724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1.1.13i3: Core, Setup, etc.: + * *_contactgroups lists: Single group rules are all appended. When a list + is found as a value this first list is used exclusively. All other + matching rules are ignored * cmk -d does now honor --cache and --no-tcp * cmk -O/-R now uses omd re{start,load} core if using OMD * FIX: setup.sh now setups up permissions for conf.d/wato diff --git a/modules/check_mk.py b/modules/check_mk.py index b331c5b..b099fc7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1136,14 +1136,12 @@ def host_contactgroups_of(hostlist): cgrs = [] for host in hostlist: # host_contactgroups may take single values as well as - # lists as item value. Of all list entries only the first - # one is used. The single-contact-groups entries are all - # recognized. - first_list = True + # lists as item value. When a list is found only this list + # is used. The single-contact-group entries are skipped in + # this case. for entry in host_extra_conf(host, host_contactgroups): - if type(entry) == list and first_list: - cgrs += entry - first_list = False + if type(entry) == list: + return entry else: cgrs.append(entry) return list(set(cgrs))

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits