Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: GUI: Added more details to exception logs

by Lars Michelsen

Module: check_mk Branch: master Commit: c5120b828497e91b7f7ab446fe522a537f8bf040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5120b828497e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 16:03:29 2015 +0200 GUI: Added more details to exception logs --- web/htdocs/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 4375857..e411dd0 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -99,7 +99,6 @@ def handler(req, fields = None, profiling = True): response_code = apache.OK try: - # Ajax-Functions want no HTML output in case of an error but # just a plain server result code of 500 fail_silently = html.has_var("_ajaxid") @@ -300,7 +299,8 @@ def handler(req, fields = None, profiling = True): except Exception, e: html.unplug() - msg = "%s %s: %s" % (req.uri, _('Internal error'), e) + import traceback + msg = "%s %s: %s" % (req.uri, _('Internal error'), traceback.format_exc()) if type(msg) == unicode: msg = msg.encode('utf-8') logger(LOG_ERR, msg)

9 years, 3 months

Check_MK Git: check_mk: #2338 FIX Logging internal GUI exceptions to web.log instead of apache error_log

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a5b2e9885ce7b59cfdec4b5662b741c3f960dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a5b2e9885ce7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 15:52:33 2015 +0200 #2338 FIX Logging internal GUI exceptions to web.log instead of apache error_log This cleanup moves log entries about exceptions occured while rendering the GUI pages from the apache error_log to the <tt>var/log/web.log</tt> file. --- .werks/2338 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/index.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2338 b/.werks/2338 new file mode 100644 index 0000000..a775de9 --- /dev/null +++ b/.werks/2338 @@ -0,0 +1,10 @@ +Title: Logging internal GUI exceptions to web.log instead of apache error_log +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1433339472 +Class: fix + +This cleanup moves log entries about exceptions occured while rendering the +GUI pages from the apache error_log to the <tt>var/log/web.log</tt> file. diff --git a/ChangeLog b/ChangeLog index 5126fe9..d8aa284 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 2262 FIX: Fixed deletion of foreign views/dashboards... * 2335 FIX: Fixed PNP default template for active checks with arguments... * 2337 FIX: Fixed problem with long hanging pnp graph rendering calls + * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... BI: * 2336 FIX: BI compilation diagnostics are now logged to the generic web.log... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 01c3905..4375857 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -303,7 +303,7 @@ def handler(req, fields = None, profiling = True): msg = "%s %s: %s" % (req.uri, _('Internal error'), e) if type(msg) == unicode: msg = msg.encode('utf-8') - apache.log_error(msg, apache.APLOG_ERR) # log in all cases + logger(LOG_ERR, msg) if plain_error: html.write(_("Internal error") + ": %s\n" % html.attrencode(e)) elif not fail_silently:

9 years, 3 months

Check_MK Git: check_mk: additional fixes for default pnp template handling

by Lars Michelsen

Module: check_mk Branch: master Commit: d487ff0933b1340631ca6a566b822a0f949627fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d487ff0933b134… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 15:39:59 2015 +0200 additional fixes for default pnp template handling --- pnp-templates/default.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 8a7e4bc..48d7ef1 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -50,17 +50,15 @@ if ($cache_state != "uptodate") $data .= fread($fd, 4096); } fclose($fd); - if ($data) { - $fd = fopen($template_cache_path, "w"); - fwrite($fd, $data); - fclose($fd); - $cache_state = "uptodate"; - } + $fd = fopen($template_cache_path, "w"); + fwrite($fd, $data); + fclose($fd); + $cache_state = "uptodate"; } } # Now read template information from cache file, if present -if ($cache_state == "uptodate") { +if (($cache_state == "uptodate" || $cache_state == "stale") && filesize($template_cache_path) > 0) { $rrdbase = substr($NAGIOS_XMLFILE, 0, strlen($NAGIOS_XMLFILE) - 4); $fd = fopen($template_cache_path, "r"); while (!feof($fd)) {

9 years, 3 months

Check_MK Git: check_mk: #2305 FIX agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon

by Andreas Boesl

Module: check_mk Branch: master Commit: cbbfca5aeb4cd82a866f226e756e60bdebb06950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbbfca5aeb4cd8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 3 14:43:07 2015 +0200 #2305 FIX agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon The esx_vsphere_sensors check crashed when there was a semicolon in the sensor name E.g. <tt>Controller 500605B002DB9F70 (ServeRAID M5015 SAS/SATA Controller) n/a (Package); 12.7.0-0020 (Fw)</tt> --- .werks/2305 | 12 ++++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2305 b/.werks/2305 new file mode 100644 index 0000000..5d81b40 --- /dev/null +++ b/.werks/2305 @@ -0,0 +1,12 @@ +Title: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433335253 + +The esx_vsphere_sensors check crashed when there was a semicolon in the sensor name +E.g. <tt>Controller 500605B002DB9F70 (ServeRAID M5015 SAS/SATA Controller) n/a (Package); 12.7.0-0020 (Fw)</tt> + diff --git a/ChangeLog b/ChangeLog index c37dd47..5126fe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information + * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 156e329..84f97eb 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -919,7 +919,7 @@ if not error: data = hostsystems_sensors[hostname][key] if data["key"] in ["green", "unknown"]: continue - line = '%s;%s;%s;%s;%s;' % (data["name"], data["baseUnits"], data["currentReading"], + line = '%s;%s;%s;%s;%s;' % (data["name"].replace(";", "_"), data["baseUnits"], data["currentReading"], data["sensorType"], data["unitModifier"]) if "rateUnits" in data: line += data["rateUnits"]

9 years, 3 months

Check_MK Git: check_mk: #2337 FIX Fixed problem with long hanging pnp graph rendering calls

by Lars Michelsen

Module: check_mk Branch: master Commit: a270e946230c8e6f5a9e995c33477c74fc26e027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a270e946230c8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 14:26:51 2015 +0200 #2337 FIX Fixed problem with long hanging pnp graph rendering calls --- .werks/2337 | 10 ++++++++++ ChangeLog | 1 + pnp-templates/default.php | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2337 b/.werks/2337 new file mode 100644 index 0000000..bbd0415 --- /dev/null +++ b/.werks/2337 @@ -0,0 +1,10 @@ +Title: Fixed problem with long hanging pnp graph rendering calls +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433334397 + + diff --git a/ChangeLog b/ChangeLog index f4b300e..c37dd47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... * 2262 FIX: Fixed deletion of foreign views/dashboards... * 2335 FIX: Fixed PNP default template for active checks with arguments... + * 2337 FIX: Fixed problem with long hanging pnp graph rendering calls BI: * 2336 FIX: BI compilation diagnostics are now logged to the generic web.log... diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 067c58f..8a7e4bc 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -39,6 +39,10 @@ else # cache file missing or stale: try to fetch live template via HTTP if ($cache_state != "uptodate") { + // always speaking to local host, so a small connect timeout is good to + // catch to long hanging requests when e.g. the system apache is not + // listening on localhost + ini_set('default_socket_timeout', 2); $fd = @fopen($url . "pnp_template.py?id=" . urlencode($id_string), "r"); if ($fd) { $data = "";

9 years, 3 months

Check_MK Git: check_mk: Fixed mkeventd naming in different places

by Lars Michelsen

Module: check_mk Branch: master Commit: e5c984de73fec2997e12c2f4c916340446e05980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c984de73fec2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 12:00:35 2015 +0200 Fixed mkeventd naming in different places --- mkeventd/web/plugins/wato/mkeventd.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 8e486f6..928691a 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2090,7 +2090,7 @@ if mkeventd_enabled: elements = [ Integer( title = _("Port number:"), - help = _("If you are running the mkeventd as a non-root (such as in an OMD site) " + help = _("If you are running the Event Console as a non-root (such as in an OMD site) " "please choose port number greater than 1024."), minvalue = 1, maxvalue = 65535, @@ -2301,7 +2301,7 @@ if mkeventd_enabled: "log_level", DropdownChoice( title = _("Log level"), - help = _("You can configure the mkeventd to log more details about it's actions. " + help = _("You can configure the Event Console to log more details about it's actions. " "These information are logged into the file <tt>%s</tt>") % site_neutral_path(defaults.log_dir + "/mkeventd.log"), choices = [ @@ -2316,10 +2316,10 @@ if mkeventd_enabled: register_configvar(group, "log_rulehits", Checkbox(title = _("Log rule hits"), - label = _("Log hits for rules in log of mkeventd"), + label = _("Log hits for rules in log of Event Console"), help = _("If you enable this option then every time an event matches a rule " "(by normal hit, cancelling, counting or dropping) a log entry will be written " - "into the log file of the mkeventd. Please be aware that this might lead to " + "into the log file of the Event Console. Please be aware that this might lead to " "a large number of log entries. "), default_value = False), domain = "mkeventd", @@ -2327,10 +2327,10 @@ if mkeventd_enabled: register_configvar(group, "debug_mkeventd_queries", - Checkbox(title = _("Debug queries to mkeventd"), - label = _("enable debugging of queries"), - help = _("With this option turned on all queries made to the event daemon " - "will be displayed."), + Checkbox(title = _("Debug queries to Event Console"), + label = _("Enable debugging of queries"), + help = _("With this option turned on all queries asking for data of the Event Console " + "will be displayed in the views."), default_value = False), domain = "mkeventd", )

9 years, 3 months

Check_MK Git: check_mk: #2336 FIX BI compilation diagnostics are now logged to the generic web.log

by Lars Michelsen

Module: check_mk Branch: master Commit: babe935698cd6eacfd560feca5b4dfb11a67676c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=babe935698cd6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 11:56:19 2015 +0200 #2336 FIX BI compilation diagnostics are now logged to the generic web.log It is possible to enable diagnostic information for compiling the BI rules. These information were written to an explicit configured log file, which leads to problems in distributed setups. This logging has now been changed to use the generic <tt>web.log</tt>. --- .werks/2336 | 12 ++++++++ ChangeLog | 3 ++ web/htdocs/bi.py | 43 ++++++++++++++-------------- web/plugins/wato/check_mk_configuration.py | 22 +++++++------- 4 files changed, 47 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=babe935698…

9 years, 3 months

Check_MK Git: check_mk: Fixed syntax error

by Lars Michelsen

Module: check_mk Branch: master Commit: 158fb2a4509461c2a9e00078844bb8f95f435d17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=158fb2a4509461… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 11:33:42 2015 +0200 Fixed syntax error --- mkeventd/web/plugins/wato/mkeventd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 14203a2..8e486f6 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2300,16 +2300,16 @@ if mkeventd_enabled: register_configvar(group, "log_level", DropdownChoice( + title = _("Log level"), + help = _("You can configure the mkeventd to log more details about it's actions. " + "These information are logged into the file <tt>%s</tt>") % + site_neutral_path(defaults.log_dir + "/mkeventd.log"), choices = [ (0, _("Normal logging")), (1, _("Verbose logging")), ], default_value = 0, ), - title = _("Log level"), - help = _("You can configure the mkeventd to log more details about it's actions. " - "These information are logged into the file <tt>%s</tt>") % - site_neutral_path(defaults.log_dir + "/mkeventd.log"), domain = "mkeventd", )

9 years, 3 months

Check_MK Git: check_mk: #2335 FIX Fixed PNP default template for active checks with arguments

by Lars Michelsen

Module: check_mk Branch: master Commit: a3cf62d83d3fd12c344da0462cb536990577e582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3cf62d83d3fd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 3 10:55:35 2015 +0200 #2335 FIX Fixed PNP default template for active checks with arguments The graph popups were not rendered and PNP showed up a message <tt>$def[]</tt> not defined. --- .werks/2335 | 11 +++++++++++ ChangeLog | 1 + pnp-templates/default.php | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2335 b/.werks/2335 new file mode 100644 index 0000000..c48e411 --- /dev/null +++ b/.werks/2335 @@ -0,0 +1,11 @@ +Title: Fixed PNP default template for active checks with arguments +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433321671 + +The graph popups were not rendered and PNP showed up a message <tt>$def[]</tt> +not defined. diff --git a/ChangeLog b/ChangeLog index a62ba9c..d8fee1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 2324 FIX: Add icon for those checks that cannot be rescheduled... * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... * 2262 FIX: Fixed deletion of foreign views/dashboards... + * 2335 FIX: Fixed PNP default template for active checks with arguments... Event Console: * 2333 The Event Console log level can now be configured via GUI... diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 384c3f2..067c58f 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -39,7 +39,7 @@ else # cache file missing or stale: try to fetch live template via HTTP if ($cache_state != "uptodate") { - $fd = @fopen($url . "pnp_template.py?id=" . $id_string, "r"); + $fd = @fopen($url . "pnp_template.py?id=" . urlencode($id_string), "r"); if ($fd) { $data = ""; while (!feof($fd)) {

9 years, 3 months

Check_MK Git: check_mk: #2325 oracle_tablespaces: correctly handle case where check runs in clustered mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 90c3a6a36b74865e552045448008f1abebdbfc4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90c3a6a36b7486… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 3 10:50:20 2015 +0200 #2325 oracle_tablespaces: correctly handle case where check runs in clustered mode The check for the ORACLE tablespaces now works correctly when Check_MK cluster hosts are being used. In such a case data files may appear twice in the agent output - once for each node of the cluster. The check now considers that node that has the most data files as the active node and uses the data from that node. --- .werks/2325 | 13 +++ ChangeLog | 1 + checks/oracle_tablespaces | 262 ++++++++++++++++++++++++++++----------------- 3 files changed, 177 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90c3a6a36b…

9 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015