Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Fixed werk wording

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e124697cbb309ec0f4329d710e40405447878ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e124697cbb309… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 16:46:34 2014 +0100 Fixed werk wording --- .werks/1545 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1545 b/.werks/1545 index 6c20340..0cc99e7 100644 --- a/.werks/1545 +++ b/.werks/1545 @@ -1,4 +1,4 @@ -Title: Terminating with exit code 3 now when duplicate host has been found +Title: Check_MK Inventory check is now resulting in correct state on duplicate host Level: 1 Component: core Compatible: compat diff --git a/ChangeLog b/ChangeLog index ed40651..c553423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +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 + * 1545 FIX: Check_MK Inventory check is now resulting in correct state on duplicate host * 1555 FIX: Improved validation on timeperiod references of non existing periods... * 1574 FIX: Hosts named like used python modules do not break precompiled checks anymore...

9 years, 9 months

Check_MK Git: check_mk: #1577 FIX Fixed editing of views using the " Downtime for host/service" sorter or column

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a2412591606afe41fccc88c00c20ff6c7f07876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a2412591606af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 16:56:59 2014 +0100 #1577 FIX Fixed editing of views using the "Downtime for host/service" sorter or column Views which were using the "Downtime for host/service" (downtime_what) sorter or column were loosing this information when opening the view for editing and saving it again. --- .werks/1577 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 1 + web/plugins/views/painters.py | 8 ++++---- web/plugins/views/sorters.py | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/1577 b/.werks/1577 new file mode 100644 index 0000000..c33902d --- /dev/null +++ b/.werks/1577 @@ -0,0 +1,10 @@ +Title: Fixed editing of views using the "Downtime for host/service" sorter or column +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417449307 +Class: fix + +Views which were using the "Downtime for host/service" (downtime_what) sorter or column +were loosing this information when opening the view for editing and saving it again. diff --git a/ChangeLog b/ChangeLog index c553423..c15ce1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * 1544 FIX: Fixed exception in complain phase in view editor... * 1573 FIX: WATO Quickaccess snapin: Pending button is not overlapped by icons anymore * 1557 FIX: Fix sorting of hostnames that only differ in lower/uppercaseness + * 1577 FIX: Fixed editing of views using the "Downtime for host/service" sorter or column... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 0a81be9..f7115a7 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -548,6 +548,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, if load_handler: load_handler(visual) + else: mode = 'create' single_infos = [] diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f264933..0f1c01d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1625,8 +1625,8 @@ multisite_painters["downtime_comment"] = { } multisite_painters["downtime_fixed"] = { - "title" : _("Type of Downtime"), - "short" : _("Type"), + "title" : _("Downtime start mode"), + "short" : _("Start"), "columns" : ["downtime_fixed"], "paint" : lambda row: (None, row["downtime_fixed"] == 0 and _("flexible") or _("fixed")), } @@ -1634,8 +1634,8 @@ multisite_painters["downtime_fixed"] = { multisite_painters["downtime_what"] = { "title" : _("Downtime for host/service"), "short" : _("for"), - "columns" : ["is_service"], - "paint" : lambda row: (None, row["is_service"] and _("Service") or _("Host")), + "columns" : ["downtime_is_service"], + "paint" : lambda row: (None, row["downtime_is_service"] and _("Service") or _("Host")), } multisite_painters["downtime_type"] = { diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index bbe2815..1c02cdc 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -300,7 +300,7 @@ declare_1to1_sorter("downtime_author", cmp_simple_string) declare_1to1_sorter("downtime_comment", cmp_simple_string) declare_1to1_sorter("downtime_fixed", cmp_simple_number) declare_1to1_sorter("downtime_type", cmp_simple_number) -declare_simple_sorter("downtime_what", _("Downtime type (host/service)"), "is_service", cmp_simple_number) +declare_simple_sorter("downtime_what", _("Downtime for host/service"), "downtime_is_service", cmp_simple_number) declare_simple_sorter("downtime_start_time", _("Downtime start"), "downtime_start_time", cmp_simple_number) declare_simple_sorter("downtime_end_time", _("Downtime end"), "downtime_end_time", cmp_simple_number) declare_simple_sorter("downtime_entry_time", _("Downtime entry time"), "downtime_entry_time", cmp_simple_number)

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2137

by Lars Michelsen

Module: check_mk Branch: master Commit: 68d1cfbcfcf06795da8dd846b91060f1e5a30e87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68d1cfbcfcf067… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 18:16:52 2014 +0100 Updated bug entries #2137 --- .bugs/2137 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2137 b/.bugs/2137 index fc51569..db5a919 100644 --- a/.bugs/2137 +++ b/.bugs/2137 @@ -1,9 +1,9 @@ Title: Foldable containers with Umlauts in titles are not expanded on load Component: multisite -State: open +Class: bug +State: done Date: 2014-07-16 10:13:33 Targetversion: 1.2.5i1 -Class: bug When unicode strings with umlauts are used as titles for foldable containers, the states are saved, but can not be read/parsed/compared correctly. This seems @@ -11,3 +11,6 @@ to be related to the pprint.pformat() function which writes the unicode string as key of a dict, but does not re-reads the value correctly as unicode string. It has happened here with the titles of the views snapin. + +2014-12-01 18:16:50: changed state open -> done +Fixed.

9 years, 9 months

Check_MK Git: check_mk: #1578 FIX Folding states of containers with umlauts in titles are now persisted

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cd6466c9d9218b3dc0be048a85bf890b767919a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd6466c9d9218… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 18:09:14 2014 +0100 #1578 FIX Folding states of containers with umlauts in titles are now persisted When a foldable container has umlauts in the title, for example when a view topic has umlauts in it, the folding state was not persisted across page reloads. --- .werks/1578 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/config.py | 2 ++ web/htdocs/js/bi.js | 4 ++-- web/htdocs/js/checkmk.js | 7 ++++--- web/htdocs/js/sidebar.js | 27 ++++++++++++++------------- web/htdocs/js/wato.js | 25 +++++++++++++------------ web/htdocs/lib.py | 11 ++++++++++- web/htdocs/weblib.py | 3 ++- 9 files changed, 58 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0cd6466c9d…

9 years, 9 months

Check_MK Git: check_mk: #1572 FIX Sample configs, plugins etc. for windows agent use windows linebreaks now

by Lars Michelsen

Module: check_mk Branch: master Commit: 878da42a4f41a6f120b07303ce0963a6aaffe834 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=878da42a4f41a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 13:54:16 2014 +0100 #1572 FIX Sample configs, plugins etc. for windows agent use windows linebreaks now Some files which are meant to be used on windows systems had unix style linebreaks, which are not interpreted correctly by some editors, like for example notepad. This has been fixed now. All files in packend agents are now using windows style linebreaks. --- .bugs/2203 | 7 +- .werks/1572 | 12 ++ ChangeLog | 1 + agents/windows/Makefile | 16 ++- agents/windows/check_mk.example.ini | 196 ++++++++++++------------- agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 160296 -> 160305 bytes agents/windows/install_agent.exe | Bin 157225 -> 157231 bytes agents/windows/mrpe/check_crit.bat | 4 +- agents/windows/plugins/dmi_sysinfo.bat | 30 ++-- agents/windows/plugins/hyperv_vms.ps1 | 4 +- agents/windows/plugins/megaraid.bat | 2 +- agents/windows/plugins/mk_inventory.ps1 | 198 +++++++++++++------------- agents/windows/plugins/windows_multipath.vbs | 48 +++---- agents/windows/plugins/windows_tasks.ps1 | 2 +- agents/windows/plugins/wmic_if.ps1 | Bin 3634 -> 3635 bytes 16 files changed, 272 insertions(+), 248 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=878da42a4f…

9 years, 9 months

Check_MK Git: check_mk: #1573 FIX WATO Quickaccess snapin:

by Lars Michelsen

Pending button is not overlapped by icons anymore Message-ID: <547c8c95.Yh4ck0pJWa8quNzp%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: a520a59f03748540adf45e84420b56de47982cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a520a59f037485… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 14:06:08 2014 +0100 #1573 FIX WATO Quickaccess snapin: Pending button is not overlapped by icons anymore --- .bugs/1004 | 7 +++++-- .bugs/844 | 7 +++++-- .werks/1573 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/wato.py | 7 ++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.bugs/1004 b/.bugs/1004 index d0fd33c..d2c8db6 100644 --- a/.bugs/1004 +++ b/.bugs/1004 @@ -1,8 +1,11 @@ Title: Changes in WATO Quickaccess werden durch Icons überdeckt Component: multisite -State: open +Class: bug +State: done Date: 2014-07-11 13:00:39 Targetversion: future -Class: bug Changes in WATO Quickaccess werden durch Icons überdeckt + +2014-12-01 14:05:36: changed state open -> done +Fixed. diff --git a/.bugs/844 b/.bugs/844 index 8e93610..2088a48 100644 --- a/.bugs/844 +++ b/.bugs/844 @@ -1,8 +1,11 @@ Title: apc_rackpdu_power does not work with inline snmp Component: checks -State: open +Class: bug +State: works4me Date: 2014-04-29 14:11:04 Targetversion: 1.2.5i1 -Class: bug The check apc_rackpdu_power does not work with inline snmp, the first value in the snmp_info list (1.1.0) is missing, only the other 3 are queried. + +2014-12-01 13:55:08: changed state open -> works4me +Is working with current inline snmp diff --git a/.werks/1573 b/.werks/1573 new file mode 100644 index 0000000..77ea6cc --- /dev/null +++ b/.werks/1573 @@ -0,0 +1,9 @@ +Title: WATO Quickaccess snapin: Pending button is not overlapped by icons anymore +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417439141 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index adceb05..ada1df0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... * 1543 FIX: Hosttag columns are now available right ater creating a tag... * 1544 FIX: Fixed exception in complain phase in view editor... + * 1573 FIX: WATO Quickaccess snapin: Pending button is not overlapped by icons anymore WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 56c7dca..afbf458 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -59,6 +59,7 @@ def render_wato(mini): num_pending = wato.num_pending_changes() if num_pending: footnotelinks([(_("%d changes") % num_pending, "wato.py?mode=changelog")]) + html.write('<div class=clear></div>') sidebar_snapins["admin"] = { @@ -78,6 +79,7 @@ sidebar_snapins["admin_mini"] = { "styles": """ #snapin_admin_mini { padding-top: 6px; + clear: right; } #snapin_admin_mini img { margin-right: 3.9px; @@ -90,7 +92,10 @@ sidebar_snapins["admin_mini"] = { } #snapin_admin_mini div.footnotelink { - margin-top: -14px; + float: right; +} +#snapin_admin_mini div.clear { + clear: right; } """, }

9 years, 9 months

Check_MK Git: check_mk: #1576 FIX SNMP Community host attribute is now visible for IE<=8

by Lars Michelsen

Module: check_mk Branch: master Commit: e36a03cf537d6e1dfed23df15c1cb904b69c6861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e36a03cf537d6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 16:13:11 2014 +0100 #1576 FIX SNMP Community host attribute is now visible for IE<=8 The SNMP Community was not visible on host edit page for hosts using the snmp tag when opening the page with Internet Explorer version 8 or below. --- .bugs/2184 | 7 +++++-- .werks/1576 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/js/wato.js | 19 ++++++++++--------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.bugs/2184 b/.bugs/2184 index 9f39b7c..fd548b3 100644 --- a/.bugs/2184 +++ b/.bugs/2184 @@ -1,12 +1,15 @@ Title: SNMP Community in host properties not shown on IE? Component: wato -State: open +Class: bug +State: done Date: 2014-09-25 16:13:09 Targetversion: future -Class: bug A host that is tagged as SNMP host is opened in WATO. Nevertheless the attribute SNMP Community is not visible. In Firefox it is visible. Looks like some JS problem with IE... Switching back and forth the tag seems not help. + +2014-12-01 16:09:41: changed state open -> done +Fixed. diff --git a/.werks/1576 b/.werks/1576 new file mode 100644 index 0000000..ccb1c87 --- /dev/null +++ b/.werks/1576 @@ -0,0 +1,11 @@ +Title: SNMP Community host attribute is now visible for IE<=8 +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417446679 +Class: fix + +The SNMP Community was not visible on host edit page for hosts +using the snmp tag when opening the page with Internet Explorer +version 8 or below. diff --git a/ChangeLog b/ChangeLog index d46cc47..adebc73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 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... + * 1576 FIX: SNMP Community host attribute is now visible for IE<=8... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 9961431..afe109f 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -86,7 +86,8 @@ function wato_fix_visibility() { var oTable = oHostTags.childNodes[0]; /* tbody */ oHostTags = null; - for (var i in oTable.childNodes) { + + for (var i = 0; i < oTable.childNodes.length; i++) { var oTr = oTable.childNodes[i]; if (oTr.tagName == 'TR') { var oTdLegend = oTr.childNodes[0]; @@ -119,7 +120,7 @@ function wato_fix_visibility() { stored in the global variable wato_depends_on_tags, which is filled during the creation of the web page. */ - for (var i in wato_check_attributes) { + for (var i = 0; i < wato_check_attributes.length; i++) { var attrname = wato_check_attributes[i]; /* Now comes the tricky part: decide whether that attribute should be visible or not: */ @@ -132,8 +133,8 @@ function wato_fix_visibility() { // Visibility depends on roles if( display == "" && attrname in wato_depends_on_roles){ - for (var i in wato_depends_on_roles[attrname]) { - var role = wato_depends_on_roles[attrname][i]; + for (var index = 0; index < wato_depends_on_roles[attrname].length; index++) { + var role = wato_depends_on_roles[attrname][index]; var negate = role[0] == '!'; var rolename = negate ? role.substr(1) : role; var have_role = user_roles.indexOf(rolename) != -1; @@ -146,8 +147,8 @@ function wato_fix_visibility() { // Visibility depends on tags if( display == "" && attrname in wato_depends_on_tags){ - for (var i in wato_depends_on_tags[attrname]) { - var tag = wato_depends_on_tags[attrname][i]; + for (var index = 0; index < wato_depends_on_tags[attrname].length; index++) { + var tag = wato_depends_on_tags[attrname][index]; var negate = tag[0] == '!'; var tagname = negate ? tag.substr(1) : tag; var have_tag = currentTags.indexOf(tagname) != -1; @@ -199,9 +200,9 @@ function wato_fix_visibility() { // FIXME: use generic identifier for each form var available_forms = [ "form_edithost", "form_editfolder", "form_bulkedit" ]; - for ( var try_form in available_forms ){ - var my_form = document.getElementById(available_forms[try_form]); - if (my_form != null) { + for (var try_form = 0; try_form < available_forms.length; try_form++) { + var my_form = document.getElementById(available_forms[try_form]); + if (my_form != null) { for (var child in my_form.childNodes){ oTr = my_form.childNodes[child]; if (oTr.className == "nform"){

9 years, 9 months

Check_MK Git: check_mk: #1575 FIX vSphere Monitoring works with RedHat 5.x now

by Lars Michelsen

Module: check_mk Branch: master Commit: 687fa31d09312891a41a0412e13155d069e45c31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=687fa31d093128… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 15:12:30 2014 +0100 #1575 FIX vSphere Monitoring works with RedHat 5.x now The vSphere agent is now compatible to at least Python 2.4. Before it was only compatible to Python >= 2.6. --- .bugs/2186 | 7 +++++-- .werks/1575 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 5 +---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bugs/2186 b/.bugs/2186 index f03ab4e..c44f1d8 100644 --- a/.bugs/2186 +++ b/.bugs/2186 @@ -1,8 +1,11 @@ Title: agent_vsphere not running on RedHat 5 Component: checks -State: open +Class: bug +State: done Date: 2014-10-16 10:43:36 Targetversion: 1.2.5i1 -Class: bug Reason is the Python version. Shouldn't be too hard to fix. + +2014-12-01 15:08:55: changed state open -> done +Fixed. diff --git a/.werks/1575 b/.werks/1575 new file mode 100644 index 0000000..5f05382 --- /dev/null +++ b/.werks/1575 @@ -0,0 +1,10 @@ +Title: vSphere Monitoring works with RedHat 5.x now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417442938 +Class: fix + +The vSphere agent is now compatible to at least Python 2.4. Before +it was only compatible to Python >= 2.6. diff --git a/ChangeLog b/ChangeLog index 20b4989..d46cc47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 1536 FIX: fritz!Box special agent now deals with new URLs (firmware >= 6.0) correctly * 1550 FIX: zfs_arc_cache: do not inventorize of no cache information available... * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... + * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 050a22a..fd0e780 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -582,7 +582,6 @@ if tracefile: my_cookie = None server_handle = None -transport = None def query_server(payload, payload_params = {}): # Finalize payload payload_params.update(systeminfo) @@ -641,9 +640,7 @@ def encode_url(text): # Initialize server connection try: netloc = host_address + ":" + str(opt_port) - transport = httplib.HTTPSConnection - transdict = {'timeout': opt_timeout} - server_handle = transport(netloc, None, **transdict) + server_handle = httplib.HTTPSConnection(netloc) if opt_debug: sys.stderr.write("Connecting to %s..." % netloc)

9 years, 9 months

Check_MK Git: check_mk: #1574 FIX Hosts named like used python modules do not break precompiled checks anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: daece7c467e22d4c5691be43cf88002d4edf9891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daece7c467e22d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 1 14:24:17 2014 +0100 #1574 FIX Hosts named like used python modules do not break precompiled checks anymore Previously, when creating a host named "random" and using the Nagios core, which is using the precompiled checks, all checks broke with a python exception. --- .bugs/2155 | 7 +++++-- .werks/1574 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 9 ++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.bugs/2155 b/.bugs/2155 index c34b3bc..09bc8f2 100644 --- a/.bugs/2155 +++ b/.bugs/2155 @@ -1,9 +1,9 @@ Title: Host named like a Python module will break precompiled checks Component: core -State: open +Class: bug +State: done Date: 2014-05-14 13:57:30 Targetversion: 1.2.5i1 -Class: bug Operating System: Debian 7 @@ -16,3 +16,6 @@ instead of the real random module. This only seems to affect that indrectly imported module. A test with creating a host with the name 'os' did not show any abnormalities. + +2014-12-01 14:22:43: changed state open -> done +Fixed. diff --git a/.werks/1574 b/.werks/1574 new file mode 100644 index 0000000..2a43ea0 --- /dev/null +++ b/.werks/1574 @@ -0,0 +1,10 @@ +Title: Hosts named like used python modules do not break precompiled checks anymore +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417440175 +Class: fix + +Previously, when creating a host named "random" and using the Nagios core, which is +using the precompiled checks, all checks broke with a python exception. diff --git a/ChangeLog b/ChangeLog index ada1df0..20b4989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 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... + * 1574 FIX: Hosts named like used python modules do not break precompiled checks anymore... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index db6b925..f86fcaf 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -24,7 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, os, sys, time, re, signal, math, tempfile +import sys + +# Remove precompiled directory from sys.path. Leaving it in the path +# makes problems when host names (name of precompiled files) are equal +# to python module names like "random" +sys.path.pop(0) + +import socket, os, time, re, signal, math, tempfile # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets'

9 years, 9 months

Check_MK Git: check_mk: #1557 FIX Fix sorting of hostnames that only differ in lower/ uppercaseness

by Mathias Kettner

Module: check_mk Branch: master Commit: a1d1bd14c6ae8e337a003b7d2a610ce33ff99929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1d1bd14c6ae8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 1 15:23:31 2014 +0100 #1557 FIX Fix sorting of hostnames that only differ in lower/uppercaseness --- .werks/1557 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1557 b/.werks/1557 new file mode 100644 index 0000000..cdc6da3 --- /dev/null +++ b/.werks/1557 @@ -0,0 +1,9 @@ +Title: Fix sorting of hostnames that only differ in lower/uppercaseness +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417443788 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 527d7ab..447cec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 1539 FIX: Fixed refreshing of PNP graphs in dashboards... * 1543 FIX: Hosttag columns are now available right ater creating a tag... * 1544 FIX: Fixed exception in complain phase in view editor... + * 1557 FIX: Fix sorting of hostnames that only differ in lower/uppercaseness WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8076d6a..e330b32 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2327,7 +2327,9 @@ def cmp_simple_string(column, r1, r2): return cmp_insensitive_string(v1, v2) def cmp_num_split(column, r1, r2): - return cmp(num_split(r1[column]), num_split(r2[column])) + c1 = r1[column] + c2 = r2[column] + return cmp(num_split(c1) + (c1,), num_split(c2) + (c2,)) def cmp_string_list(column, r1, r2): v1 = ''.join(r1.get(column, []))

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