Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64239 discussions

Check_MK Git: check_mk: win_dhcp_pools: do not alert if a pool is unusued with no configured ip ranges

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c29233e58c27b1e31ed9bae7b9b60f8daef5d4c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c29233e58c27b1… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Mar 19 17:02:02 2012 +0100 win_dhcp_pools: do not alert if a pool is unusued with no configured ip ranges --- checks/win_dhcp_pools | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index b6f57e2..ff9b234 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -104,6 +104,10 @@ def check_win_dhcp_pools(item, params, info): used, free, pending = poolStats size = used + free + pending + # Catch unused pools + if size == 0: + return (3, "UNKNOWN - DHCP Pool contains no IP addresses") + if free > 0: percFree = 100 - size / free else:

12 years, 6 months

Check_MK Git: check_mk: WATO: fixed missing host parameters(.name) in validate_host()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9de9d8ab246435463946603d03581e969cdbe2d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9de9d8ab246435… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 15 22:26:26 2012 +0100 WATO: fixed missing host parameters(.name) in validate_host() --- 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 3d8f160..b90dcb4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1801,7 +1801,7 @@ def mode_edithost(phase, new, cluster): call_hook_hosts_changed(g_folder) reload_hosts(g_folder) - errors = validate_all_hosts([hostname]).get(hostname, []) + validate_host(host, g_folder) + errors = validate_all_hosts([hostname]).get(hostname, []) + validate_host(g_folder[".hosts"][hostname], g_folder) if errors: # keep on this page if host does not validate return elif new:

12 years, 6 months

Check_MK Git: check_mk: WATO - Fixed js error when trying to detect SELECT elements in edit dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b8478710fdda19db85518a53403441dafa7ccf98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8478710fdda19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 13:21:55 2012 +0100 WATO - Fixed js error when trying to detect SELECT elements in edit dialog --- web/htdocs/js/wato.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 9b6a3b9..42a9eb0 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -96,8 +96,7 @@ function wato_fix_visibility() { var oElement = oTr.childNodes[2].childNodes[0].childNodes[0]; if( oElement.type == 'checkbox' && oElement.checked ){ // <checkbox> currentTags = currentTags.concat(oElement.getAttribute('tags').split("|")); - } - else{ // <select> + } else if(oElement.tagName == 'SELECT') { // <select> currentTags = currentTags.concat(oElement.value.split("|")); } }

12 years, 6 months

Check_MK Git: check_mk: Contactgroup attribute star was shown regardles of the real state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 75e90b91d3a8c7275bf551b304587f70351263b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75e90b91d3a8c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 10:43:45 2012 +0100 Contactgroup attribute star was shown regardles of the real state --- 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 cc8d2f0..3d8f160 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3884,7 +3884,7 @@ class ContactGroupsAttribute(Attribute): display_name = alias and alias or name texts.append('<a href="wato.py?mode=edit_contact_group&edit=%s">%s</a>' % (name, display_name)) result = ", ".join(texts) - if texts: + if texts and use: result += "<span title='%s'><b>*</b></span>" % \ _("These contact groups are also used in the monitoring configuration.") return "", result

12 years, 6 months

Check_MK Git: check_mk: Fixed localication problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e78e9713d257235482a3f90fdc17bf6fc727281 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e78e9713d2572… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 10:26:39 2012 +0100 Fixed localication problem --- 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 e6ee8d8..cc8d2f0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9015,7 +9015,7 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): alias = tag_alias(tag) if alias: if negate: - html.write(_("Host is <b>" + _("not") + "</b> of type ")) + html.write(_("Host is <b>not</b> of type ")) else: html.write(_("Host is of type ")) html.write("<b>" + alias + "</b>")

12 years, 6 months

Check_MK Git: check_mk: FIX: Fixed encoding problem in "custom notification " message

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1366f477668201bc6aea7413835820636b29266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1366f47766820… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 14 09:14:29 2012 +0100 FIX: Fixed encoding problem in "custom notification" message --- ChangeLog | 3 +++ web/plugins/views/commands.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e892377..28ac828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ WATO: * FIX: deletion of automation accounts now works + Multisite + * FIX: Fixed encoding problem in "custom notification" message + 1.2.0b1: Core, Setup, etc.: * new tool 'livedump' for dumping configuration and status diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 5b94590..1e088c4 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -197,7 +197,7 @@ config.declare_permission("action.customnotification", def command_custom_notification(cmdtag, spec, row): if html.var("_customnotification"): - comment = html.var("_cusnot_comment") + comment = html.var_utf8("_cusnot_comment") broadcast = html.get_checkbox("_cusnot_broadcast") and 1 or 0 forced = html.get_checkbox("_cusnot_forced") and 2 or 0 command = "SEND_CUSTOM_%s_NOTIFICATION;%s;%s;%s;%s" % \

12 years, 6 months

Check_MK Git: check_mk: New host attribute: HOstSelectionAttribute

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 55e645f7188d6f0dffe69b3e85d54f95a27b20c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55e645f7188d6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 13 16:53:49 2012 +0100 New host attribute: HOstSelectionAttribute --- web/htdocs/wato.py | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b65adab..e6ee8d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3821,6 +3821,40 @@ class ValueSpecAttribute(Attribute): self._valuespec.validate_value(value, self._name) +# Attribute for selecting the name of an other host +class HostSelectionAttribute(Attribute): + def __init__(self, name, title, help=None, hostfilter = lambda h: True): + Attribute.__init__(self, name, title, help) + self._hostfilter = hostfilter + + def paint(self, value, hostname): + return "", (value and value or "") + + def render_input(self, value): + hosts = api.get_all_hosts().items() + hosts.sort() + selections = [("", _("-- not connected --"))] + for n, h in hosts: + if self._hostfilter(h): + selections.append((n, n)) + if len(selections) == 1: + html.write(_("There are no possible hosts.")) + else: + html.select(self._name, selections, value) + + def from_html_vars(self): + hostname = html.var(self._name).strip() + if not hostname: + return None + folder = find_host(hostname) + if not folder: + raise MKUserError(self._name, _("This host is not configured.")) + host = api.get_host(folder, hostname) + if not self._hostfilter(host): + raise MKUserError(self._name, _("This host is not possible.")) + return hostname and hostname or None + + # Attribute needed for folder permissions class ContactGroupsAttribute(Attribute): # The constructor stores name and title. If those are @@ -4185,6 +4219,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute defvalue = values[0] else: defvalue = attr.default_value() + attr.render_input(defvalue) html.write("</div>")

12 years, 6 months

Check_MK Git: check_mk: ValueSpec Tuple: fix complain handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 239abd0aa64594e859ab5b54dea8bfd3a3821980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=239abd0aa64594… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 15:20:15 2012 +0100 ValueSpec Tuple: fix complain handling --- web/htdocs/valuespec.py | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 602dbd9..09b610f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -563,9 +563,6 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): - if html.has_var(varprefix + "_count"): # already filled in, complain - value = self.from_html_vars(varprefix) - html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix)) @@ -584,6 +581,12 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) + if html.has_var(varprefix + "_count"): # already filled in, complain + value = [None] * int(html.var(varprefix + "_count")) + # the underlying render_input-functions should ignore the + # value in this case themselves, so that the "None" should not + # harm here. + for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') @@ -1351,6 +1354,12 @@ class Tuple(ValueSpec): html.write('<table class="valuespec_tuple">') if not self._vertical: html.write("<tr>") + + # If the form is already filled in and we are in complain mode, + # the value in value must be ignored + if html.form_filled_in(): + value = (None,) * len(self._elements) + for no, (element, val) in enumerate(zip(self._elements, value)): vp = varprefix + "_" + str(no) if element.help():

12 years, 6 months

Check_MK Git: check_mk: ValueSpec ListOf(): fix complain situation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ccf18817b08ec85fc8362884c95978dd5c59348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ccf18817b08ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 15:14:24 2012 +0100 ValueSpec ListOf(): fix complain situation --- web/htdocs/check_mk.css | 6 +++--- web/htdocs/valuespec.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5017605..e59458c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -321,8 +321,8 @@ table.valuespec_listof td.vlof_buttons { white-space: nowrap; } table.valuespec_listof td.vlof_content { - border: 1px solid white; - box-shadow: 1px 1px 2px #808080; - background-image: url("images/form_background.png"); + /* border: 1px solid white; + box-shadow: 1px 1px 2px #808080; */ + background-image: url("images/form_background.png"); background-repeat: repeat; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5bd8b5b..602dbd9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -563,6 +563,9 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): + if html.has_var(varprefix + "_count"): # already filled in, complain + value = self.from_html_vars(varprefix) + html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix))

12 years, 6 months

Check_MK Git: check_mk: New ValueSpec for IPv4 Network

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b020459e54b25113faaf4a74bcfcf2e526ec55c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b020459e54b251… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 12 14:40:19 2012 +0100 New ValueSpec for IPv4 Network --- web/htdocs/valuespec.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d43887e..5bd8b5b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -328,6 +328,49 @@ class EmailAddress(TextAscii): def value_to_text(self, value): return '<a href="mailto:%s">%s</a>' % (value, value) + +# Network as used in routing configuration, such as +# "10.0.0.0/8" or "192.168.56.1" +class IPv4Network(TextAscii): + def __init__(self, **kwargs): + kwargs.setdefault("size", 12) + TextAscii.__init__(self, **kwargs) + + def validate_value(self, value, varprefix): + if "/" in value: + try: + network, bits = value.split("/") + bits = int(bits) + except: + raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) + else: + network = value + bits = 32 + + if bits < 0 or bits > 32: + raise MKUserError(varprefix, _("Invalid number of bits. Must be in range 1 ... 32")) + + if value.count(".") != 3: + raise MKUserError(varprefix, _("The network must contain three dots")) + try: + octets = map(int, network.split(".")) + if len(octets) != 4: + raise MKUserError(varprefix, _("Please specify four octets (X.X.X.X/YY)")) + for o in octets: + if o < 0 or o > 255: + raise MKUserError(varprefix, _("Invalid octet %d (must be in range 1 ... 255)") % o) + except MKUserError: + raise + except: + raise MKUserError(varprefix, _("Please use the syntax X.X.X.X/YY")) + + # Make sure that non-network bits are zero + l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) + (octets[3]) + for b in range(bits, 32): + if l & (2 ** (31-b)) != 0: + raise MKUserError(varprefix, _("Please make sure that only the %d non-network bits are non-zero") % bits) + + # Valuespec for a HTTP Url (not HTTPS), that # automatically adds http:// to the value class HTTPUrl(TextAscii):

12 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits