Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 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: 37e371341993bbdb346072286023cecac296f728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37e371341993bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 22 17:30:24 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66fb202547da1e0fdfc87a337e940072e475d6ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66fb202547da1e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Mar 20 08:13:41 2012 +0100 Reserved 20 bug IDS --- .bugs/581 | 9 +++++++++ .bugs/first_free | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/.bugs/581 b/.bugs/581 new file mode 100644 index 0000000..da16c11 --- /dev/null +++ b/.bugs/581 @@ -0,0 +1,9 @@ +Title: windows dhcp check doesnt if its needed on a server +Component: checks +State: open +Date: 2012-03-19 16:38:29 +Targetversion: 1.2.0 +Class: cleanup + +If would be nice if the windows agent plugin for dhcp pools checked if its run on an active dhcp server. +then it would be unix-like so that the plugins autodetects applicable checks. diff --git a/.bugs/first_free b/.bugs/first_free index 8b8e485..5a9a141 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -707 +727

12 years, 3 months

Check_MK Git: check_mk: win_dhcp_pools: more understandable comment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80b08d7a3abd9bf491c92a99ba241728671c2925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b08d7a3abd9b… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Mar 19 17:03:16 2012 +0100 win_dhcp_pools: more understandable comment --- checks/win_dhcp_pools | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index ff9b234..1da4c77 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -106,7 +106,7 @@ def check_win_dhcp_pools(item, params, info): # Catch unused pools if size == 0: - return (3, "UNKNOWN - DHCP Pool contains no IP addresses") + return (3, "UNKNOWN - DHCP Pool contains no IP addresses / is deactivated") if free > 0: percFree = 100 - size / free

12 years, 3 months

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, 3 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, 3 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, 3 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, 3 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, 3 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, 3 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, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012