Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Updated bug entries #0691

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90b3eb190de3332565d161eacb865886f7d1030b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90b3eb190de333… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:55:20 2012 +0200 Updated bug entries #0691 --- .bugs/691 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/691 b/.bugs/691 index 0f37013..bc75964 100644 --- a/.bugs/691 +++ b/.bugs/691 @@ -1,9 +1,12 @@ Title: Remove/Secure eval() on html.var() Component: wato -State: open +Class: nastiness +State: done Date: 2012-04-11 11:39:35 Targetversion: 1.2.0 -Class: nastiness It is VERY insecure and VERY easy to do bad things at these places. They must be secured/removed in some way. + +2012-04-17 16:55:16: changed state open -> done +Has been fixed for direct reading from HTML parameters

12 years, 5 months

Check_MK Git: check_mk: Fixed latest IE7 JS fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2df957304a331e72d39776559817af741caee73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2df957304a331… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:57:50 2012 +0200 Fixed latest IE7 JS fix --- web/htdocs/js/wato.js | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 542d1d1..cb14b46 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -145,14 +145,14 @@ function wato_fix_visibility() { // Prepare current visibility information which is used // within the attribut validation in wato // Hidden attributes are not validated at all - oAttrDisp = document.getElementById("attr_display_" + attrname); - if (!oAttrDisp){ - var newInput = document.createElement("input"); - newInput.name = "attr_display_" + attrname; - newInput.id = "attr_display_" + attrname; - newInput.type = "hidden"; - newInput.className = "text"; - oTr.appendChild(newInput); + var oAttrDisp = document.getElementById("attr_display_" + attrname); + if (!oAttrDisp) { + var oAttrDisp = document.createElement("input"); + oAttrDisp.name = "attr_display_" + attrname; + oAttrDisp.id = "attr_display_" + attrname; + oAttrDisp.type = "hidden"; + oAttrDisp.className = "text"; + oTr.appendChild(oAttrDisp); } if ( display == "none" ) { oAttrDisp.value = "0";

12 years, 5 months

Check_MK Git: check_mk: FIX: Only showing sudo hint message on sudo error message in automation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9c28992b815782600ab5604edeae787bb340f5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c28992b81578… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 15:59:37 2012 +0200 FIX: Only showing sudo hint message on sudo error message in automation command --- ChangeLog | 2 ++ web/htdocs/wato.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a1766d..94152ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ all host related wato configuration files to distribute changed tags * WATO: Added new internal hook pre-activate-changes to execute custom code BEFORE Check_MK is called to restart Nagios + * FIX: Only showing sudo hint message on sudo error message in automation + command Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 65e50d0..7b316b1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3405,7 +3405,7 @@ def check_mk_local_automation(command, args=[], indata=""): if config.debug: log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % - (" ".join(cmd), exitcode, hilite_errors(outdata), sudo_msg)) + (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) # On successful "restart" command execute the activate changes hook if command == 'restart':

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0601, #0659, #0654

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b3ed0d9b49d3123a53f1560a1649df9d9e74ac4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b3ed0d9b49d31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 15:59:36 2012 +0200 Updated bug entries #0601, #0659, #0654 --- .bugs/601 | 7 +++++-- .bugs/654 | 7 +++++-- .bugs/659 | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.bugs/601 b/.bugs/601 index 6f86b24..f074e95 100644 --- a/.bugs/601 +++ b/.bugs/601 @@ -1,9 +1,9 @@ Title: Checkboxes in views and brower back in disharmony Component: multisite -State: open +Class: bug +State: works4me Date: 2012-01-17 11:43:07 Targetversion: 1.2.0 -Class: bug Tested on IE8, but might be browser independent. The following steps produce the problem: @@ -18,3 +18,6 @@ The following steps produce the problem: 5. Now again select a command. -> Now the command will be applied to *all* services instead of the one. + +2012-04-17 15:15:51: changed state open -> works4me +Maybe already fixed. Tested in Firefox, IE7-9 diff --git a/.bugs/654 b/.bugs/654 index 770b51a..64cd990 100644 --- a/.bugs/654 +++ b/.bugs/654 @@ -1,10 +1,13 @@ Title: View editor mixes up views on editing Component: multisite -State: open +Class: bug +State: works4me Date: 2012-02-15 08:48:38 Targetversion: future -Class: bug We had a strange problem. We had a view named "offline_locations" using the "All services" table. Then we added a "offline_locations1" view which used the "All hosts" table. BUt after saving the second view had the same options as the first view. + +2012-04-17 15:41:40: changed state open -> works4me +Must have been a user problem. I can not reproduce such problems. diff --git a/.bugs/659 b/.bugs/659 index 011f48a..238c7da 100644 --- a/.bugs/659 +++ b/.bugs/659 @@ -1,11 +1,14 @@ Title: Host validation error does invalidate the _transid of the current page Component: wato -State: open +Class: bug +State: works4me Date: 2012-02-17 15:42:32 Targetversion: future -Class: bug If a host validation error occurs on saving a host, the user needs to return to the folder an re-edit the host from start. It seems that the transaction id of the current page gets invalid, and a subsequent save on the same page wont work + +2012-04-17 15:22:17: changed state open -> works4me +Seems that this has already been fixed. It works foor me over here

12 years, 5 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa693eb494a293270bf745777eec216a16fa2065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa693eb494a293… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:13:39 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94152ef..9eb5eba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ code BEFORE Check_MK is called to restart Nagios * FIX: Only showing sudo hint message on sudo error message in automation command + * FIX: Fixed js eror in IE7 on WATO host edit page Multisite * Added config option default_ts_format to configure default timestamp

12 years, 5 months

Check_MK Git: check_mk: FIX: Using pickle instead of repr/ eval when reading data structures from

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f41427c6e6f2260c03dd72b63927aed8a73f2fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f41427c6e6f22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:54:16 2012 +0200 FIX: Using pickle instead of repr/eval when reading data structures from urls to prevent too big security issues --- ChangeLog | 2 ++ web/htdocs/wato.py | 30 +++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9eb5eba..083c409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ * FIX: Only showing sudo hint message on sudo error message in automation command * FIX: Fixed js eror in IE7 on WATO host edit page + * FIX: Using pickle instead of repr/eval when reading data structures from + urls to prevent too big security issues Multisite * Added config option default_ts_format to configure default timestamp diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7b316b1..708428a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -107,7 +107,7 @@ # `----------------------------------------------------------------------' import sys, pprint, socket, re, subprocess, time, datetime, \ - shutil, tarfile, StringIO, math, fcntl + shutil, tarfile, StringIO, math, fcntl, pickle import config, htmllib, multitar from lib import * from valuespec import * @@ -2051,7 +2051,7 @@ def show_service_table(host, firsttime): url = make_link([("mode", "edit_ruleset"), ("varname", varname), ("host", hostname), - ("item", repr(item))]) + ("item", mk_repr(item))]) try: rulespec["valuespec"].validate_datatype(params, "") rulespec["valuespec"].validate_value(params, "") @@ -6112,8 +6112,8 @@ def check_mk_remote_automation(siteid, command, args, indata): config.site(siteid), "checkmk-automation", [ ("automation", command), # The Check_MK automation command - ("arguments", repr(args)), # The arguments for the command - ("indata", repr(indata)), # The input data + ("arguments", mk_repr(args)), # The arguments for the command + ("indata", mk_repr(indata)), # The input data ]) return response @@ -6550,8 +6550,8 @@ def page_automation(): command = html.var("command") if command == "checkmk-automation": cmk_command = html.var("automation") - args = eval(html.var("arguments")) - indata = eval(html.var("indata")) + args = mk_eval(html.var("arguments")) + indata = mk_eval(html.var("indata")) result = check_mk_local_automation(cmk_command, args, indata) html.write(repr(result)) elif command == "push-snapshot": @@ -8701,7 +8701,7 @@ def mode_edit_ruleset(phase): rulespec = g_rulespecs[varname] hostname = html.var("host", "") if html.has_var("item"): - item = eval(html.var("item")) + item = mk_eval(html.var("item")) else: item = NO_ITEM @@ -8867,7 +8867,7 @@ def mode_edit_ruleset(phase): ("varname", varname), ("rulenr", rel_rulenr), ("host", hostname), - ("item", repr(item)), + ("item", mk_repr(item)), ("rule_folder", folder[".path"])]) html.icon_button(edit_url, _("Edit this rule"), "edit") rule_button("insert", _("Insert a copy of this rule into the folder '%s'") @@ -10119,7 +10119,7 @@ def mode_pattern_editor(phase): ("varname", varname), ("rulenr", rel_rulenr), ("host", hostname), - ("item", repr(item)), + ("item", mk_repr(item)), ("rule_folder", folder[".path"])]) html.icon_button(edit_url, _("Edit this rule"), "edit") html.write('</td></tr>\n') @@ -10456,6 +10456,18 @@ def validate_all_hosts(hostnames, force_all = False): # | Functions needed at various places | # '----------------------------------------------------------------------' +def mk_eval(s): + if config.debug: + return eval(s) + else: + return pickle.loads(s) + +def mk_repr(s): + if config.debug: + return repr(s) + else: + return pickle.dumps(s) + # Returns true when at least one folder is defined in WATO def have_folders(): root_folder = load_folder(root_dir)

12 years, 5 months

Check_MK Git: check_mk: Fixed js eror in IE7 on WATO host edit page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b75dabc039dfcc64fdffc114128c5e6f4d6a3eff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b75dabc039dfcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:13:24 2012 +0200 Fixed js eror in IE7 on WATO host edit page --- .bugs/653 | 8 +++++- web/htdocs/js/wato.js | 51 +++++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.bugs/653 b/.bugs/653 index 453180e..c09d1d4 100644 --- a/.bugs/653 +++ b/.bugs/653 @@ -1,10 +1,14 @@ Title: bulk inventory in omd shared mode Component: wato -State: open +Class: bug +State: done Date: 2012-02-14 16:06:33 Targetversion: future -Class: bug At the moment the message about modifying the /etc/sudoers file is shown on every cmk --automation problem during inventory. This is misleading. The message should only occur when the entries are really missing in /etc/sudoers + +2012-04-17 16:00:21: changed state open -> done +Has just been fixed. The sudo hint message is only shown when the sudo command fails "sudo: +" in error message. diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 42a9eb0..542d1d1 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -139,32 +139,35 @@ function wato_fix_visibility() { } var oTr = document.getElementById("attr_" + attrname); - oTr.style.display = display; - - // Prepare current visibility information which is used - // within the attribut validation in wato - // Hidden attributes are not validated at all - if ( !document.getElementById("attr_display_" + attrname) ){ - var newInput = document.createElement("input"); - newInput.name = "attr_display_" + attrname; - newInput.id = "attr_display_" + attrname; - newInput.type = "hidden"; - newInput.className = "text"; - oTr.appendChild(newInput); - } - var display_info = document.getElementById("attr_display_" + attrname) - if ( display == "none" ) { - display_info.value = "0"; - }else{ - display_info.value = "1"; - } - - // There is at least one item in this topic -> show it - var topic = oTr.parentNode.parentNode.parentNode.id.substr(21); - if( display == "" ){ - var index = hide_topics.indexOf(topic); - if( index != -1 ) - delete hide_topics[index]; + if(oTr) { + oTr.style.display = display; + + // Prepare current visibility information which is used + // within the attribut validation in wato + // Hidden attributes are not validated at all + oAttrDisp = document.getElementById("attr_display_" + attrname); + if (!oAttrDisp){ + var newInput = document.createElement("input"); + newInput.name = "attr_display_" + attrname; + newInput.id = "attr_display_" + attrname; + newInput.type = "hidden"; + newInput.className = "text"; + oTr.appendChild(newInput); + } + if ( display == "none" ) { + oAttrDisp.value = "0"; + } else { + oAttrDisp.value = "1"; + } + oAttrDisp = null; + + // There is at least one item in this topic -> show it + var topic = oTr.parentNode.parentNode.parentNode.id.substr(21); + if( display == "" ){ + var index = hide_topics.indexOf(topic); + if( index != -1 ) + delete hide_topics[index]; + } } } for (var item in volatile_topics){

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ec59db5060f7eeae88d2929065df2ada32cd439 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec59db5060f7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 17 16:54:46 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 5 months

Check_MK Git: check_mk: Do not put users in dummy contact group check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d04510157dfde25bb5ba1c32a4978f1dcd74120 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d04510157dfde… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 16:50:54 2012 +0200 Do not put users in dummy contact group check_mk --- .bugs/675 | 6 ++++-- ChangeLog | 2 ++ modules/check_mk.py | 16 +++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.bugs/675 b/.bugs/675 index ab69d9d..99bb7bb 100644 --- a/.bugs/675 +++ b/.bugs/675 @@ -1,9 +1,9 @@ Title: User is added to default contact group check_mk, but should not Component: core -State: open +Class: bug +State: done Date: 2012-04-10 16:30:42 Targetversion: 1.2.0 -Class: bug We did: - Create a contact group "alle" @@ -16,3 +16,5 @@ Happened: - BUT: hh and omdadmin are members of check_mk automatically (and should not) - and thus hh receives notifications, but should not + +2012-04-17 16:50:38: changed state open -> done diff --git a/ChangeLog b/ChangeLog index d5444b3..2d46bf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * FIX: Automation try-inventory: Fixed problem on where checks which produce equal service descriptions could lead to invalid inventory results on cluster hosts. + * FIX: do not create contacts if they won't be assigned to any host + or service. Do *not* assign to dummy catch-all group "check_mk". WATO: * Added new permission "move hosts" to allow/deny moving of hosts in WATO diff --git a/modules/check_mk.py b/modules/check_mk.py index 535674d..3f03bd2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1877,6 +1877,15 @@ def create_nagios_config_contacts(outfile): cnames.sort() for cname in cnames: contact = contacts[cname] + # If the contact is in no contact group or all of the contact groups + # of the contact have neither hosts nor services assigned - in other + # words if the contact is not assigned to any host or service, then + # we do not create this contact in Nagios. It's useless and wil produce + # warnings. + cgrs = [ cgr for cgr in contact.get("contactgroups", []) if cgr in contactgroups_to_define ] + if not cgrs: + continue + outfile.write("define contact {\n contact_name\t\t\t%s\n" % cname) if "alias" in contact: outfile.write(" alias\t\t\t\t%s\n" % contact["alias"].encode("utf-8")) @@ -1891,13 +1900,6 @@ def create_nagios_config_contacts(outfile): outfile.write(" %s_notification_period\t%s\n" % (what, contact.get("notification_period", "24X7"))) outfile.write(" %s_notification_commands\tcheck-mk-notify\n" % what) - # Refer only to those contact groups that actually have objects assigned to. Otherwise - # we will run into problems since Nagios does not allow contact groups that - # are not assigned to at least one host or service? - cgrs = [ cgr for cgr in contact.get("contactgroups", []) if cgr in contactgroups_to_define ] - # Use dummy group if none is set. Nagios will not start otherwise - if not cgrs: - cgrs = [ "check_mk" ] outfile.write(" contactgroups\t\t\t%s\n" % ", ".join(cgrs)) outfile.write("}\n\n")

12 years, 5 months

Check_MK Git: check_mk: WATO: fix focus in user dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cbe4c7bd8bcb8c8eb7b42d082c30f56469f25a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbe4c7bd8bcb8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 16:29:25 2012 +0200 WATO: fix focus in user dialog --- web/htdocs/htmllib.py | 2 +- web/htdocs/wato.py | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e180460..df141c6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -786,7 +786,7 @@ class html: obj = formname + "." + varname self.write("<script language=\"javascript\" type=\"text/javascript\">\n" "<!--\n" - "if(document.%s) {" + "if (document.%s) {" " document.%s.focus();\n" " document.%s.select();\n" "}\n" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 19ec6bf..9087772 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9751,7 +9751,6 @@ def select_language(user_language): (inactive and "display: none" or "", default_label)) html.write('<div id="attr_entry_language" style="%s">' % ((not inactive) and "display: none" or "")) html.select("language", languages, user_language) - html.set_focus("lang") html.write("</div></td></tr>") def page_user_profile():

12 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012