Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

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

Check_MK Git: check_mk: WATO: Rule editor: improve sorting of groups and rulesets

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d20d75ce5c264b6b220cfe7bf16bd95014c49a08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d20d75ce5c264b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 16:09:19 2012 +0200 WATO: Rule editor: improve sorting of groups and rulesets --- ChangeLog | 3 +- web/htdocs/wato.py | 39 +++++-- web/plugins/wato/check_mk_configuration.py | 156 +++++++++++++++------------- web/plugins/wato/check_parameters.py | 4 +- 4 files changed, 116 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d20d75ce5c…

12 years, 5 months

Check_MK Git: check_mk: WATO: removed duplicate "sec" in timeout rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8bbc705ae848d05bda889ed995127c9f23f4088c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bbc705ae848d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:27:46 2012 +0200 WATO: removed duplicate "sec" in timeout rule --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 98e16b0..4a9354a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -201,7 +201,7 @@ register_configvar(group, minvalue = 1.0, default_value = 10.0, unit = "sec", - display_format = "%.1f sec"), + display_format = "%.1f"), domain = "multisite") register_configvar(group,

12 years, 5 months

Check_MK Git: check_mk: Added missing icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 724032f112722edee6b6a250f97958a5248afbdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=724032f112722e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:25:57 2012 +0200 Added missing icon --- web/htdocs/images/icon_host.png | Bin 0 -> 4814 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_host.png b/web/htdocs/images/icon_host.png new file mode 100644 index 0000000..8f07fa9 Binary files /dev/null and b/web/htdocs/images/icon_host.png differ

12 years, 5 months

Check_MK Git: check_mk: WATO: show host context in rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7963b11562b59bbb29d1c7fb62d29aad816a42c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7963b11562b59b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 17 15:25:41 2012 +0200 WATO: show host context in rule editor Also remove obsolete option for showing only rules with local context. Was never really useful. --- .bugs/677 | 7 +++++-- web/htdocs/pages.css | 1 + web/htdocs/wato.css | 1 + web/htdocs/wato.py | 41 +++++++++++++++++++++++++---------------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.bugs/677 b/.bugs/677 index 1ddddd1..6e909e5 100644 --- a/.bugs/677 +++ b/.bugs/677 @@ -1,9 +1,12 @@ Title: WATO rule editor does not show host context Component: wato -State: open +Class: bug +State: done Date: 2012-04-17 14:53:36 Targetversion: 1.2.0 -Class: bug The main rule menu keeps the host context, but does not show it anywhere. + +2012-04-17 15:25:03: changed state open -> done +Should work now diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index adff9bd..3b0816d 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -304,6 +304,7 @@ tr.groupheader td { margin: 0px; padding-top: 2px; font-weight: bold; + color: white; } tr.groupheader a { color: #000; diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 959198b..40ecee5 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -439,6 +439,7 @@ table.validationerror img { .wato table.configmodules { empty-cells: show; border-spacing: 8px; + margin-left: -8px; } .wato table.configmodules td { background-image: url("images/form_background.png"); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 65e50d0..38b6a95 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1925,7 +1925,7 @@ def mode_inventory(phase, firsttime): html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") html.context_button(_("Host properties"), - make_link([("mode", "edithost"), ("host", hostname)]), "back") + make_link([("mode", "edithost"), ("host", hostname)]), "host") html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")])) elif phase == "action": @@ -8504,13 +8504,20 @@ def change_host_tags_in_rules(folder, operations, mode): def mode_ruleeditor(phase): only_host = html.var("host", "") - only_local = html.var("local") + only_local = "" # html.var("local") if phase == "title": - return _("Configuration of Hosts and Services (Ruleeditor)") + if only_host: + return _("Rules effective on host ") + only_host + else: + return _("Configuration of Hosts and Services (Ruleeditor)") elif phase == "buttons": global_buttons() + if only_host: + html.context_button(only_host, + make_link([("mode", "edithost"), ("host", only_host)]), "host") + return elif phase == "action": @@ -8518,6 +8525,8 @@ def mode_ruleeditor(phase): if not only_host: render_folder_path(keepvarnames = ["mode", "local"]) + else: + html.write("<h3>%s: %s</h3>" % (_("Host"), only_host)) # Group names are separated with "/" into main group and optional subgroup groupnames = list(set([ gn.split("/")[0] for gn in g_rulespec_groups.keys() ])) @@ -8537,7 +8546,7 @@ def mode_rulesets(phase): group = html.var("group") # obligatory title, help = g_rulegroups.get(group, (group, None)) only_host = html.var("host", "") - only_local = html.var("local") + only_local = "" # html.var("local") if phase == "title": if only_host: @@ -8550,7 +8559,7 @@ def mode_rulesets(phase): home_button() html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor"), ("host", only_host)]), "back") html.context_button(only_host, - make_link([("mode", "edithost"), ("host", only_host)]), "back") + make_link([("mode", "edithost"), ("host", only_host)]), "host") else: global_buttons() html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") @@ -8567,17 +8576,17 @@ def mode_rulesets(phase): if help: html.write("<div class=info>%s</div>" % help) - html.begin_form("local") - html.checkbox("local", False, onclick="form.submit();") - if only_host: - html.write(" " + _("show only rulesets that contain rules explicitely listing the host <b>%s</b>." % - only_host)) - else: - html.write(" " + _("Show only rulesets that contain rules in the current folder.")) - html.write(' <img align=absbottom class=icon src="images/icon_localrule.png"> ') - html.hidden_fields() - html.end_form() - html.write("<br>") + # html.begin_form("local") + # html.checkbox("local", False, onclick="form.submit();") + # if only_host: + # html.write(" " + _("show only rulesets that contain rules explicitely listing the host <b>%s</b>." % + # only_host)) + # else: + # html.write(" " + _("Show only rulesets that contain rules in the current folder.")) + # html.write(' <img align=absbottom class=icon src="images/icon_localrule.png"> ') + # html.hidden_fields() + # html.end_form() + # html.write("<br>") # Load all rules from all folders. Hope this doesn't take too much time. # We need this information only for displaying the number of rules in

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits