Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1545 FIX Terminating with exit code 3 now when duplicate host has been found

by Lars Michelsen

Module: check_mk Branch: master Commit: b9eefe019a130a5650b1ed4096f21357d1f2d610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9eefe019a130a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 10:18:36 2014 +0100 #1545 FIX Terminating with exit code 3 now when duplicate host has been found --- .bugs/2167 | 7 +++++-- .bugs/2183 | 7 +++++-- .werks/1545 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.bugs/2167 b/.bugs/2167 index 5a97049..ba5564d 100644 --- a/.bugs/2167 +++ b/.bugs/2167 @@ -1,12 +1,15 @@ Title: Edit view: Unable to save because of an empty selection Component: multisite -State: open +Class: bug +State: done Date: 2014-10-02 10:37:41 Targetversion: future -Class: bug 1) Edit any view 2) Press "Add column". Do not select an entry 3) Press "Save" causes an empty selection warning 4) Remove this empty selection 5) Press "Save" -> Warning persists + +2014-12-01 10:10:28: changed state open -> done +Already fixed some days/weeks ago. diff --git a/.bugs/2183 b/.bugs/2183 index 80523ac..b78ff08 100644 --- a/.bugs/2183 +++ b/.bugs/2183 @@ -1,11 +1,14 @@ Title: cmk --check-inventory fails with exit code 4 on invalid configuration Component: core -State: open +Class: bug +State: done Date: 2014-09-19 11:01:41 Targetversion: future -Class: bug If you have a duplicate host, for example, then the Inventory check fails with 4. This makes Nagios unhappy. Solution: Fail with code 3 and a useful error message + +2014-12-01 10:18:05: changed state open -> done +Fixed. Using exit code 3 now diff --git a/.werks/1545 b/.werks/1545 new file mode 100644 index 0000000..6c20340 --- /dev/null +++ b/.werks/1545 @@ -0,0 +1,9 @@ +Title: Terminating with exit code 3 now when duplicate host has been found +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417425490 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5875a2a..be0385f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 1439 mk-job: now also available on solaris systems... * 1483 FIX: Savely replace illegal vertical bars in check plugin output... * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... + * 1545 FIX: Terminating with exit code 3 now when duplicate host has been found Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/modules/check_mk.py b/modules/check_mk.py index 426962a..55e80c0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5733,7 +5733,7 @@ def read_config_files(with_autochecks=True, with_conf_d=True): for hostname in strip_tags(all_hosts + clusters.keys()): if hostname in seen_hostnames: sys.stderr.write("Error in configuration: duplicate host '%s'\n" % hostname) - sys.exit(4) + sys.exit(3) seen_hostnames.add(hostname) # Add WATO-configured explicit checks to (possibly empty) checks

9 years, 9 months

Check_MK Git: check_mk: #1546 FIX Fixed adding cluster nodes to new cluster in complain phase

by Lars Michelsen

Module: check_mk Branch: master Commit: e9fee081dab0924735d97756cc1bffd6cc832a4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fee081dab092… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 10:48:25 2014 +0100 #1546 FIX Fixed adding cluster nodes to new cluster in complain phase When adding a cluster without node, getting into the complain phase and then adding a node, the cluster node field list did not extend to make it possible to add multiple nodes. --- .bugs/2162 | 7 +++++-- .bugs/2166 | 7 +++++-- .werks/1546 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 10 +++------- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.bugs/2162 b/.bugs/2162 index 56dbf0a..63edbd8 100644 --- a/.bugs/2162 +++ b/.bugs/2162 @@ -1,8 +1,11 @@ Title: WATO diag page: "Retry this test" only works once Component: wato -State: open +Class: bug +State: done Date: 2014-05-05 18:14:16 Targetversion: future -Class: bug The javascript only receives one extra transaction id.. + +2014-12-01 10:19:17: changed state open -> done +Transids had been removed here. diff --git a/.bugs/2166 b/.bugs/2166 index 7e9dc6d..f1d187d 100644 --- a/.bugs/2166 +++ b/.bugs/2166 @@ -1,10 +1,13 @@ Title: WATO new cluster: Can only add one cluster node in the formular Component: wato -State: open +Class: bug +State: done Date: 2014-08-12 14:30:05 Targetversion: future -Class: bug - Create a new cluster within WATO, but omit the nodes field - Save formular. A warning appears, the nodes field is highlighted - The list of nodes does not auto-enlarge, so you can only add one node + +2014-12-01 10:43:09: changed state open -> done +Fixed. diff --git a/.werks/1546 b/.werks/1546 new file mode 100644 index 0000000..72fd17a --- /dev/null +++ b/.werks/1546 @@ -0,0 +1,11 @@ +Title: Fixed adding cluster nodes to new cluster in complain phase +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417426992 +Class: fix + +When adding a cluster without node, getting into the complain phase +and then adding a node, the cluster node field list did not extend to +make it possible to add multiple nodes. diff --git a/ChangeLog b/ChangeLog index be0385f..6f7f6cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 1540 FIX: Host diagnose page: Some tests were failing randomly * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule * 1542 FIX: Changed text of "debug_log" option to be clearer in distributed setups... + * 1546 FIX: Fixed adding cluster nodes to new cluster in complain phase... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2b0fcfb..cac4fb6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1495,13 +1495,9 @@ function list_of_strings_init(divid) { function list_of_strings_add_focus(oLastChild) { /* look for <input> in last child node and attach focus handler to it. */ - for (var j in oLastChild.childNodes) { - var o = oLastChild.childNodes[j]; - if (o.tagName == "INPUT") { - o.onfocus = function(e) { return list_of_strings_extend(this); }; - return; - } - } + var input = oLastChild.getElementsByTagName("input"); + if (input.length == 1) + input[0].onfocus = function(e) { return list_of_strings_extend(this); }; }

9 years, 9 months

Check_MK Git: check_mk: Removed old WATO icon gif

by Lars Michelsen

Module: check_mk Branch: master Commit: aa1097057e48e6fe2ee1cdaea0f2fc378cb64b0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1097057e48e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 11:06:16 2014 +0100 Removed old WATO icon gif --- .bugs/2132 | 7 +++++-- web/htdocs/htmllib.py | 10 ++++++++++ web/htdocs/images/icon_wato.gif | Bin 1506 -> 0 bytes web/plugins/icons/wato.py | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.bugs/2132 b/.bugs/2132 index 407ab21..70195ba 100644 --- a/.bugs/2132 +++ b/.bugs/2132 @@ -1,11 +1,14 @@ Title: WATO context button on quicksearch result page broken Component: multisite -State: open +Class: bug +State: works4me Date: 2014-07-04 09:30:24 Targetversion: 1.2.5i1 -Class: bug When searching for a host substring, for example "node", results in a page listing all services of the hosts node1 and node2. When clicking on the context button WATO, it displays a red error message that the host "node" (the substring) is not managed by WATO. + +2014-12-01 11:05:43: changed state open -> works4me +old bug, already fixed. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1727e0f..618f67d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,6 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Notes for future rewrite: +# +# - Make clear which functions return values and which write out values +# render_*, add_*, write_* (e.g. icon() -> outputs directly, +# render_icon() -> returns icon +# render_icon() -> returns icon +# +# - Order of arguments: +# e.g. icon(help, icon) -> change and make help otional? + import time, os, pwd, urllib, random from lib import * diff --git a/web/htdocs/images/icon_wato.gif b/web/htdocs/images/icon_wato.gif deleted file mode 100644 index 5aae7e8..0000000 Binary files a/web/htdocs/images/icon_wato.gif and /dev/null differ diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 6f0b705..053b301 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -35,11 +35,11 @@ def wato_link(folder, site, hostname, where): (html.urlencode(folder), html.urlencode(hostname)) if where == "inventory": url += "&mode=inventory" - help = _("Edit services in WATO - the Check_MK Web Administration Tool") + help = _("Edit services") else: url += "&mode=edithost" - help = _("Open this host in WATO - the Check_MK Web Administration Tool") - return '<a href="%s"><img class=icon src="images/icon_wato.gif" ' \ + help = _("Edit this host") + return '<a href="%s"><img class=icon src="images/icon_wato.png" ' \ 'title="%s"></a>' % (url, help) else: return ""

9 years, 9 months

Check_MK Git: check_mk: #1555 FIX Improved validation on timeperiod references of non existing periods

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ab16d2d1e20e54accaedb503d6d8ea48dac4b63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab16d2d1e20e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 11:53:11 2014 +0100 #1555 FIX Improved validation on timeperiod references of non existing periods configured notification, check etc. periods were not validated for their existance correctly. --- .bugs/1010 | 7 +++++-- .bugs/1066 | 7 +++++-- .bugs/2103 | 7 +++++-- .bugs/2104 | 7 +++++-- .bugs/2130 | 7 +++++-- .werks/1555 | 10 ++++++++++ ChangeLog | 1 + 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.bugs/1010 b/.bugs/1010 index 2495a4b..4aee187 100644 --- a/.bugs/1010 +++ b/.bugs/1010 @@ -1,8 +1,11 @@ Title: wato global settings, empty line Component: wato -State: open +Class: bug +State: done Date: 2014-11-05 22:34:21 Targetversion: future -Class: bug in global settings - configuration gui (wato) there is an empty line which can be switched ON or OFF + +2014-12-01 11:09:33: changed state open -> done +Has already been fixed. diff --git a/.bugs/1066 b/.bugs/1066 index d2b88df..90b2d12 100644 --- a/.bugs/1066 +++ b/.bugs/1066 @@ -1,12 +1,15 @@ Title: cmk -m does not start if manpages without catalog: header Component: docu -State: open +Class: bug +State: done Date: 2014-03-26 11:19:32 Targetversion: 1.2.5i1 -Class: bug if you installed some mkp packages from the exchange or so and their check manpages do not contain a catalog: header then cmk -m does not start at all (failing) missing catalog: header must be caught + +2014-12-01 11:08:58: changed state open -> done +Has already been fixed. diff --git a/.bugs/2103 b/.bugs/2103 index 02c5bb8..36c1062 100644 --- a/.bugs/2103 +++ b/.bugs/2103 @@ -1,9 +1,9 @@ Title: Quicksearch of hosts: incorrect WATO link Component: multisite -State: open +Class: bug +State: done Date: 2014-02-10 14:24:58 Targetversion: 1.2.5i1 -Class: bug For example: Doint a quicksearch on "x" returns the hosts esx_host and winxp @@ -18,3 +18,6 @@ htdocs/views.py: lines following: # WATO: If we have a host context, then show button to WATO, if permissions allow this Note: checking if a WATO host exist might take some time... + +2014-12-01 11:07:48: changed state open -> done +Is already fixed. diff --git a/.bugs/2104 b/.bugs/2104 index 9040e87..9be62eb 100644 --- a/.bugs/2104 +++ b/.bugs/2104 @@ -1,9 +1,9 @@ Title: creating core config: check if used timeperiod actually exists Component: core -State: open +Class: bug +State: done Date: 2014-03-10 13:03:53 Targetversion: 1.2.5i1 -Class: bug On creating the configuration for the core, there is now validation if a timeperiod used in any rules is actually defined. This causes a crash @@ -19,3 +19,6 @@ extra_service_conf['notification_period'] = [ ( 'office-hours', [], ALL_HOSTS, ALL_SERVICES ), ] + extra_service_conf['notification_period'] + +2014-12-01 11:51:29: changed state open -> done +Has been fixed. Added validation to cmc config generator. Nagios does validation on its own diff --git a/.bugs/2130 b/.bugs/2130 index dd94b0f..80c0fcf 100644 --- a/.bugs/2130 +++ b/.bugs/2130 @@ -1,9 +1,12 @@ Title: Dynamic file system levels can not be edited Component: wato -State: open +Class: bug +State: done Date: 2014-06-16 15:38:54 Targetversion: 1.2.5i1 -Class: bug When a df rule has dynamic file system levels configured, this is saved and can be used, but when opened in WATO again, the value can not be loaded again. + +2014-12-01 11:12:14: changed state open -> done +Has already been fixed. diff --git a/.werks/1555 b/.werks/1555 new file mode 100644 index 0000000..20a345b --- /dev/null +++ b/.werks/1555 @@ -0,0 +1,10 @@ +Title: Improved validation on timeperiod references of non existing periods +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417431125 +Class: fix + +configured notification, check etc. periods were not validated for their +existance correctly. diff --git a/ChangeLog b/ChangeLog index 6f7f6cd..c009d79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1483 FIX: Savely replace illegal vertical bars in check plugin output... * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... * 1545 FIX: Terminating with exit code 3 now when duplicate host has been found + * 1555 FIX: Improved validation on timeperiod references of non existing periods... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices

9 years, 9 months

Check_MK Git: check_mk: #1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 19248c4fe5cf665e64b6c12fd8ba24731f86f47a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19248c4fe5cf66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 13:29:36 2014 +0100 #1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore --- .bugs/2142 | 7 +++++-- .werks/1556 | 12 ++++++++++++ ChangeLog | 1 + modules/automation.py | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.bugs/2142 b/.bugs/2142 index 58418a1..add15db 100644 --- a/.bugs/2142 +++ b/.bugs/2142 @@ -1,12 +1,15 @@ Title: Inventory via WATO fails if checks are missing Component: wato -State: open +Class: bug +State: done Date: 2014-01-16 17:29:54 Targetversion: 1.2.5i1 -Class: bug Inventorized Fritzbox-1und1 Failed to inventorize Fritzbox-Alt: 'fritz.uptime' That was because that check was missing. An cmk -II on the commanline could fix it. A WATO Inventory should simply ignore such problems. + +2014-12-01 12:13:11: changed state open -> done +Fixed. diff --git a/.werks/1556 b/.werks/1556 new file mode 100644 index 0000000..2c4a5f7 --- /dev/null +++ b/.werks/1556 @@ -0,0 +1,12 @@ +Title: WATO inventory ignores already inventorized checks which does not exist anymore +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417432395 +Class: fix + +Previous versions totally failed to inventorize when a host already has a service +inventorized which belongs to a check which is not existant anymore. It terminated +with "Failed to inventorize Fritzbox-Alt: 'fritz.uptime'". This error is skipped over +now by simply ignoring the check. diff --git a/ChangeLog b/ChangeLog index c009d79..527d7ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ * 1541 FIX: Fixed missing form fields for notification method when editing rbn default rule * 1542 FIX: Changed text of "debug_log" option to be clearer in distributed setups... * 1546 FIX: Fixed adding cluster nodes to new cluster in complain phase... + * 1556 FIX: WATO inventory ignores already inventorized checks which does not exist anymore... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/modules/automation.py b/modules/automation.py index 4a84981..61e3207 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -353,6 +353,9 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=F opt_no_tcp = True opt_dont_submit = True + if ct not in check_info: + continue # Skip not existing check silently + try: exitcode = None perfdata = []

9 years, 9 months

Check_MK Git: check_mk: Reserved 15 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 753f1ca2b281fce57e5e06e27b2762c6855fa20c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=753f1ca2b281fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 1 13:29:47 2014 +0100 Reserved 15 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1fa85e6..0a02468 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1557 +1572

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2230, #2231

by Mathias Kettner

Module: check_mk Branch: master Commit: 853d978be5d1611d242179b7c5421edadafe7ae9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853d978be5d161… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 1 10:43:10 2014 +0100 Updated bug entries #2230, #2231 --- .bugs/2230 | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/2231 | 9 ++ 2 files changed, 369 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=853d978be5…

9 years, 9 months

Check_MK Git: check_mk: wato.py / Web-API: some internal code improvements.

by Andreas Boesl

Module: check_mk Branch: master Commit: dc1a10ffdbb0ba542260dcde32ee30dd7ceeceee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc1a10ffdbb0ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 1 12:44:39 2014 +0100 wato.py / Web-API: some internal code improvements. its now easier to implement multi-add/edit functions --- web/htdocs/wato.py | 219 +++++++++++++++++++++++++----------------- web/plugins/webapi/webapi.py | 11 ++- 2 files changed, 139 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc1a10ffdb…

9 years, 9 months

Check_MK Git: check_mk: removed html formatted text in title

by Andreas Boesl

Module: check_mk Branch: master Commit: 287f1019a92b57ddbd34ab8dd4ed92d20e979293 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=287f1019a92b57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 1 10:23:30 2014 +0100 removed html formatted text in title --- web/htdocs/logwatch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 50e1f31..49a20be 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -241,12 +241,12 @@ def do_log_ack(host, filename): for int_filename in host_logs(host): file_display = form_file_to_ext(int_filename) todo.append((host, int_filename, file_display)) - ack_msg = _('all logfiles of host <tt>%s</tt>') % html.attrencode(host) + ack_msg = _('all logfiles of host %s') % html.attrencode(host) elif host and filename: # one log on one host int_filename = form_file_to_int(filename) todo = [ (host, int_filename, form_file_to_ext(int_filename)) ] - ack_msg = _('the log file <tt>%s</tt> on host <tt>%s</tt>') % \ + ack_msg = _('the log file %s on host %s') % \ (html.attrencode(filename), html.attrencode(host)) html.header(_("Acknowledge %s") % ack_msg, stylesheets = stylesheets)

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014