Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: FIX Fixed processing of cached agent plugins / local scripts

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ce2caab61801c6bea17ef2508bcae34e9b8edef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ce2caab61801c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 7 09:25:32 2014 +0100 FIX Fixed processing of cached agent plugins / local scripts Werk #0345 introduced a bug which resulted in cached plugins / local scripts were executed, the cache was storred, but never processed. This change fixes the names of such cache files to make them being processed again. --- .werks/426 | 12 ++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/426 b/.werks/426 new file mode 100644 index 0000000..6c42d39 --- /dev/null +++ b/.werks/426 @@ -0,0 +1,12 @@ +Title: Fixed processing of cached agent plugins / local scripts +Level: 2 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389082939 +Targetversion: future + +Werk #0345 introduced a bug which resulted in cached plugins / local scripts +were executed, the cache was storred, but never processed. This change +fixes the names of such cache files to make them being processed again. diff --git a/ChangeLog b/ChangeLog index 13737e3..408da54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 0314 FIX: Fix CMC not executing any Check_MK checks after config reload... * 0401 FIX: Fix rule precedence in WATO-configured manual checks... * 0402 FIX: Fix exception in case of missing agent sections of cluster-aware checks... + * 0426 FIX: Fixed processing of cached agent plugins / local scripts... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 7c24e92..1649568 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -88,7 +88,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "set -o noclobber ; exec > $CACHEFILE.new || exit 1 ; $CMDLINE && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new" | nohup bash 2>/dev/null & + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash 2>/dev/null & fi }

10 years, 5 months

Check_MK Git: check_mk: FIX Fix login loop bug in distributed environments with different auth secrets

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c468c48e98201cd6c091ea8779cb93c6de031b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c468c48e98201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 7 08:06:47 2014 +0100 FIX Fix login loop bug in distributed environments with different auth secrets --- .werks/425 | 10 ++++++++++ ChangeLog | 2 +- web/htdocs/js/checkmk.js | 18 +++++++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/425 b/.werks/425 new file mode 100644 index 0000000..8b39a2c --- /dev/null +++ b/.werks/425 @@ -0,0 +1,10 @@ +Title: Fix login loop bug in distributed environments with different auth secrets +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1389078376 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index c84f1c0..762d9e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,6 @@ * 0354 FIX: Catch exception when check plugins do not return a state... * 0398 FIX: Tolerate debug output in check plugins when using CMC... * 0314 FIX: Fix CMC not executing any Check_MK checks after config reload... - * 0438 FIX: Remove test-code, Micro Core only worked once per host... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets @@ -99,6 +98,7 @@ * 0421 FIX: UserDB: Fixed lost passwords when changing users in large user databases... * 0423 FIX: Users are not logged out anymore during changing their own passwords... * 0424 FIX: Improved error handling in case of incorrect auth config in distributed WATO environments + * 0425 FIX: Fix login loop bug in distributed environments with different auth secrets WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c7b925f..84e460f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -119,19 +119,23 @@ function hilite_icon(oImg, onoff) { } -function get_url(url, handler, data, errorHandler) { +function get_url(url, handler, data, errorHandler, addAjaxId) { if (window.XMLHttpRequest) { var AJAX = new XMLHttpRequest(); } else { var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); } + var addAjaxId = (typeof addAjaxId === "undefined") ? true : addAjaxId; + // Dynamic part to prevent caching - var dyn = "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); - if (url.indexOf('\?') !== -1) { - dyn = "&"+dyn; - } else { - dyn = "?"+dyn; + if (addAjaxId) { + var dyn = "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); + if (url.indexOf('\?') !== -1) { + dyn = "&"+dyn; + } else { + dyn = "?"+dyn; + } } if (!AJAX) { @@ -517,7 +521,7 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn 'host': host, 'service': service, 'with_link': with_link, 'view': pnpview}; get_url(pnp_url + 'index.php/json?&host=' + encodeURIComponent(host) + '&srv=' + encodeURIComponent(service) + '&source=0&view=' + pnpview, - pnp_response_handler, data, pnp_error_response_handler); + pnp_response_handler, data, pnp_error_response_handler, false); } // Renders contents for the PNP hover menus

10 years, 5 months

Check_MK Git: check_mk: Fixed some i18n problems

by Mathias Kettner

Module: check_mk Branch: master Commit: 59a2d3ce76c6004c98448a814ed192265f7e66a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59a2d3ce76c600… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 5 18:27:47 2014 +0100 Fixed some i18n problems --- web/htdocs/bi.py | 4 ++-- web/htdocs/lib.py | 6 +++--- web/htdocs/multitar.py | 2 +- web/htdocs/wato.py | 10 +++++----- web/plugins/views/bi.py | 4 ++-- web/plugins/views/builtin.py | 22 +++++++++++----------- web/plugins/views/filters.py | 6 +++--- web/plugins/views/painters.py | 4 ++-- web/plugins/wato/active_checks.py | 2 +- web/plugins/wato/check_mk_configuration.py | 4 ++-- web/plugins/wato/check_parameters.py | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59a2d3ce76…

10 years, 5 months

Check_MK Git: check_mk: FIX Fix rule precedence in WATO-configured manual checks

by Mathias Kettner

Module: check_mk Branch: master Commit: ad0aacd5af32f856ebe01f898f0b8f81cf198711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad0aacd5af32f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 31 14:40:45 2013 +0100 FIX Fix rule precedence in WATO-configured manual checks When configuring rules for Manual Checks via WATO and having several rules for the same combination of host, check type and item, then the last of these rules would specify the parameters of the check. This has now been fixed and the first matching rule has precedence. --- .werks/401 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 14 +++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/401 b/.werks/401 new file mode 100644 index 0000000..957b4a6 --- /dev/null +++ b/.werks/401 @@ -0,0 +1,14 @@ +Title: Fix rule precedence in WATO-configured manual checks +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1388497148 +Targetversion: future + +When configuring rules for Manual Checks via WATO and +having several rules for the same combination of host, check type +and item, then the last of these rules would specify the +parameters of the check. This has now been fixed and the first +matching rule has precedence. diff --git a/ChangeLog b/ChangeLog index 567a1aa..bea7e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory * 0354 FIX: Catch exception when check plugins do not return a state... * 0398 FIX: Tolerate debug output in check plugins when using CMC... + * 0401 FIX: Fix rule precedence in WATO-configured manual checks... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 1b723b5..b0dd374 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5341,9 +5341,21 @@ def read_config_files(with_autochecks=True, with_conf_d=True): params[key] = value static.append((taglist, hostlist, checktype, item, params)) + + # Note: We need to reverse the order of the static_checks. This is because + # users assume that earlier rules have precedence over later ones. For static + # checks that is important if there are two rules for a host with the same + # combination of check type and item. When the variable 'checks' is evaluated, + # *later* rules have precedence. This is not consistent with the rest, but a + # result of this "historic implementation". + static.reverse() + + # Now prepend to checks. That makes that checks variable have precedence + # over WATO. checks = static + checks - # Read autochecks and append them to explicit checks + # Read autochecks and prepend them to explicit checks. That way autochecks + # will have the *least* precedence! if with_autochecks: read_all_autochecks() checks = autochecks + checks

10 years, 5 months

Check_MK Git: check_mk: FIX Fix exception in case of missing agent sections of cluster-aware checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 9641bb4346df6a341f15570b778b01e91ee11348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9641bb4346df6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 31 14:50:54 2013 +0100 FIX Fix exception in case of missing agent sections of cluster-aware checks If you configure (by mistake) an <tt>ps</tt> check on an SNMP device - which obviously does not have that agent information - Check_MK would crash with an exception. This has been fixed. --- .werks/402 | 12 ++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/402 b/.werks/402 new file mode 100644 index 0000000..b6fe3f4 --- /dev/null +++ b/.werks/402 @@ -0,0 +1,12 @@ +Title: Fix exception in case of missing agent sections of cluster-aware checks +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1388497781 +Targetversion: future + +If you configure (by mistake) an <tt>ps</tt> check on an SNMP device - which +obviously does not have that agent information - Check_MK would crash with +an exception. This has been fixed. diff --git a/ChangeLog b/ChangeLog index bea7e32..cb41fac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0354 FIX: Catch exception when check plugins do not return a state... * 0398 FIX: Tolerate debug output in check plugins when using CMC... * 0401 FIX: Fix rule precedence in WATO-configured manual checks... + * 0402 FIX: Fix exception in case of missing agent sections of cluster-aware checks... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bab5a00..2c8f358 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -306,7 +306,7 @@ def get_host_info(hostname, ipaddress, checkname): return info else: info = get_realhost_info(hostname, ipaddress, checkname, check_max_cachefile_age) - if add_nodeinfo: + if info != None and add_nodeinfo: return [ [ None ] + line for line in info ] else: return info

10 years, 5 months

Check_MK Git: check_mk: Updated all inline docu headers in check_mk. py to new style

by Mathias Kettner

Module: check_mk Branch: master Commit: 861a6c64bda33106bfcb2b65affaf09fa5169606 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=861a6c64bda331… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 31 15:09:56 2013 +0100 Updated all inline docu headers in check_mk.py to new style --- modules/check_mk.py | 151 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=861a6c64bd…

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014