Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: check_mk_agent.linux: prevent creation of nohup.out by cached checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c45263d4714f4d5f0d49b2d9e5b615c1b774faa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c45263d4714f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:29:37 2014 +0100 check_mk_agent.linux: prevent creation of nohup.out by cached checks --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a0d7b78..3dbaaa1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -100,7 +100,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 >/dev/null 2>&1 & fi }

9 years, 9 months

Check_MK Git: check_mk: #1709 FIX Fix exception when a non-Ascii character is part of the variable part of a view title

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b07765f1fc300cf6076773b77a2b97afb4c2371 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b07765f1fc300… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:15:11 2014 +0100 #1709 FIX Fix exception when a non-Ascii character is part of the variable part of a view title --- .werks/1709 | 9 +++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1709 b/.werks/1709 new file mode 100644 index 0000000..62a3480 --- /dev/null +++ b/.werks/1709 @@ -0,0 +1,9 @@ +Title: Fix exception when a non-Ascii character is part of the variable part of a view title +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1418044482 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fd8d079..5e46b51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -185,6 +185,7 @@ * 1680 FIX: Fixed various dashlet designer position/resizing issues... * 1683 FIX: Replaced a lot of old GIF images with better looking PNG images * 1687 FIX: Add visual to dashboard menu can now be closed with click anywhere on page + * 1709 FIX: Fix exception when a non-Ascii character is part of the variable part of a view title 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 ca95af8..9346253 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1179,7 +1179,7 @@ def get_single_info_keys(visual): def get_singlecontext_html_vars(visual): vars = [] for key in get_single_info_keys(visual): - vars.append((key, html.var(key, visual['context'].get(key)))) + vars.append((key, html.var_utf8(key, visual['context'].get(key)))) return vars # Collect all visuals that share a context with visual. For example

9 years, 9 months

Check_MK Git: check_mk: #1708 FIX cups_queues: fix outputting of current printer jobs if printer daemon is CUPS

by Mathias Kettner

Module: check_mk Branch: master Commit: d31c104b2b0c87a9a0aae85ae817182e130baa4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d31c104b2b0c87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 14:09:21 2014 +0100 #1708 FIX cups_queues: fix outputting of current printer jobs if printer daemon is CUPS The fix is in <tt>check_mk_agent.linux</tt> so you need to update the agent if you want to deploy that fix. Thanks to Gerald Schroll. --- .werks/1708 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1708 b/.werks/1708 new file mode 100644 index 0000000..43a7934 --- /dev/null +++ b/.werks/1708 @@ -0,0 +1,10 @@ +Title: cups_queues: fix outputting of current printer jobs if printer daemon is CUPS +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418044064 +Class: fix + +The fix is in <tt>check_mk_agent.linux</tt> so you need to update the agent if you +want to deploy that fix. Thanks to Gerald Schroll. diff --git a/ChangeLog b/ChangeLog index d98610d..fd8d079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 1455 FIX: hp_proliant_mem: avoid a crash of the check when module_condition is empty * 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation * 1658 FIX: agent_vsphere: no longer crashes when decommissioned vms report no hardware information... + * 1708 FIX: cups_queues: fix outputting of current printer jobs if printer daemon is CUPS... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 40d0b7e..a0d7b78 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -454,7 +454,7 @@ if type lpstat > /dev/null 2>&1; then echo '---' lpstat -o | while read LINE do - PRINTER=$(echo $LINE | awk '{print $2}') + PRINTER=${LINE%%-*} if echo "$LOCAL_PRINTERS" | grep -q "$PRINTER"; then echo $LINE fi

9 years, 9 months

Check_MK Git: check_mk: check_mail_loop: Better format of error messages

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b065d5a1bfca20a36592bd20c23b21dcd86009b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b065d5a1bfca2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 12:30:18 2014 +0100 check_mail_loop: Better format of error messages avoid internal Python representation of dict-like Exceptions --- doc/treasures/active_checks/check_mail_loop | 44 +++++++++++++++++---------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index 15b4a8b..90a93e3 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -27,9 +27,15 @@ import sys, getopt, os, time, random, poplib, imaplib, smtplib, email import traceback, socket, re +def parse_exception(e): + e = str(e) + if e[0] == '{': + e = "%d - %s" % eval(e).values()[0] + return str(e) + def bail_out(rc, s): - stxt = ['OK', 'WARN', 'CRIT', 'UNKN'][rc] - sys.stdout.write('%s - %s\n' % (stxt, s)) + stxt = ['OK', 'WARN', 'CRIT', 'UNKNOWN'][rc] + sys.stdout.write('%s - %s\n' % (stxt, parse_exception(s))) sys.exit(rc) def usage(msg=None): @@ -78,8 +84,8 @@ OPTIONS: might make your mailbox grow when you not clean it up manually. - -d Enable debug mode - -h, --help Show this help message and exit + -d, --debug Enable debug mode + -h, --help Show this help message and exit """) sys.exit(1) @@ -88,7 +94,7 @@ short_options = 'dh' long_options = ['smtp-server=', 'smtp-port=', 'smtp-username=', 'smtp-password=', 'smtp-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', 'fetch-password=', 'fetch-ssl', 'mail-from=', 'mail-to=', 'warning=', 'critical=', - 'connect-timeout=', 'delete-messages', 'help', 'status-dir=', 'status-suffix='] + 'connect-timeout=', 'delete-messages', 'help', 'status-dir=', 'status-suffix=', "debug", ] required_params = [ 'smtp-server', 'fetch-server', 'fetch-username', 'fetch-password', @@ -101,7 +107,7 @@ except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) -debug = False +opt_debug = False smtp_server = None smtp_port = None smtp_user = None @@ -125,8 +131,8 @@ status_suffix = None for o,a in opts: if o in [ '-h', '--help' ]: usage() - elif o == '-d': - debug = True + elif o in [ '-d', '--debug' ]: + opt_debug = True elif o == '--smtp-server': smtp_server = a elif o == '--smtp-port': @@ -248,7 +254,7 @@ def fetch_mails(): ty, data = g_M.fetch(num, '(RFC822)') mails[num] = email.message_from_string(data[0][1]) except Exception, e: - raise Exception('Failed to fetch mail %s (%s). Available messages: %r' % (num, e, messages)) + raise Exception('Failed to fetch mail %s (%s). Available messages: %r' % (num, parse_exception(e), messages)) # Now filter out the messages for this check pattern = re.compile('(?:Re: )?Check_MK-Mail-Loop ([^\s]+) ([^\s]+)') @@ -269,7 +275,9 @@ def fetch_mails(): g_mails[ts+'-'+key] = (index, rx_ts) except Exception, e: - bail_out(3, 'Failed to check for mails: %s' % e) + if opt_debug: + raise + bail_out(3, 'Failed to check for mails: %s' % parse_exception(e)) def send_mail(): now = time.time() @@ -291,8 +299,10 @@ def send_mail(): S.quit() add_expected_msg(now, key) - except Exception , e: - bail_out(3, 'Failed to send mail: %s' % e) + except Exception, e: + if opt_debug: + raise + bail_out(3, 'Failed to send mail: %s' % parse_exception(e)) def check_mails(): state = 0 @@ -374,7 +384,9 @@ def cleanup_mailbox(): if fetch_proto == 'IMAP': g_M.expunge() except Exception, e: - bail_out(2, 'Failed to delete mail: %s' % e) + if opt_debug: + raise + bail_out(2, 'Failed to delete mail: %s' % parse_exception(e)) def close_mailbox(): if not g_M: @@ -387,7 +399,7 @@ def close_mailbox(): def main(): # Enable showing protocol messages of imap for debugging - if debug: + if opt_debug: imaplib.Debug = 4 load_expected_mails() @@ -412,6 +424,6 @@ def main(): try: main() except Exception, e: - if debug: + if opt_debug: raise - bail_out(2, 'Unhandled exception: %s' % e) + bail_out(2, 'Unhandled exception: %s' % parse_exception(e))

9 years, 9 months

Check_MK Git: check_mk: #1689 Creating WATO backends for each configured site now

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c2ed2b3a32a559ec1761f8998b872e5bde4a073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c2ed2b3a32a55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 12:24:02 2014 +0100 #1689 Creating WATO backends for each configured site now For each configured site a new backend is created within NagVis. The backend is named equal to the site ID. This only works in OMD envionments. --- .werks/1689 | 12 ++++++++++++ ChangeLog | 2 +- web/htdocs/wato.py | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.werks/1689 b/.werks/1689 new file mode 100644 index 0000000..02cb04e --- /dev/null +++ b/.werks/1689 @@ -0,0 +1,12 @@ +Title: Creating WATO backends for each configured site now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1418037792 +Class: feature + +For each configured site a new backend is created within NagVis. +The backend is named equal to the site ID. + +This only works in OMD envionments. diff --git a/ChangeLog b/ChangeLog index 4bb9c37..d98610d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,6 @@ * 1624 FIX: Remove illegal characters from service descriptions of active checks... * 1628 FIX: Remove trailing backslashes from service descriptions... * 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery... - * 1657 FIX: check_mk_agent.solaris: run_cached: remove cache file if it is older than twice the maximum cache age * 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755... Checks & Agents: @@ -198,6 +197,7 @@ * 1562 Move manual checks into a new WATO module... * 1697 Allow non-Ascii characters in topic of host tag groups * 1707 WATO rule editor: show title of tag group when rendering the conditions of a rule... + * 1689 Creating WATO backends for each configured site now... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7bc521b..52c6a6e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10505,6 +10505,8 @@ def save_sites(sites, activate=True): if config.liveproxyd_enabled: save_liveproxyd_config(sites) + create_nagvis_backends(sites) + # Call the sites saved hook call_hook_sites_saved(sites) @@ -10527,6 +10529,29 @@ def save_liveproxyd_config(sites): except Exception, e: html.show_error(_("Warning: cannot reload Livestatus Proxy-Daemon: %s" % e)) +def create_nagvis_backends(sites): + if not defaults.omd_root: + return # skip when not in OMD environment + cfg = [ + '; MANAGED BY CHECK_MK WATO - Last Update: %s' % time.strftime('%Y-%m-%d %H:%M:%S'), + ] + for site_id, site in sites.items(): + if site == defaults.omd_site: + continue # skip local site, backend already added by omd + if 'socket' not in site: + continue # skip sites without configured sockets + + cfg += [ + '', + '[backend_%s]' % site_id, + 'backendtype="mklivestatus"', + 'socket="%s"' % site['socket'], + ] + + if 'status_host' in site: + cfg.append('statushost="%s"' % ':'.join(site['status_host'])) + + file('%s/etc/nagvis/conf.d/cmk_backends.ini.php' % defaults.omd_root, 'w').write('\n'.join(cfg)) # Makes sure, that in distributed mode we monitor only # the hosts that are directly assigned to our (the local)

9 years, 9 months

Check_MK Git: check_mk: help text for JVM rules now include search keywords Jolokia, Tomcat, to make them easier to find

by Goetz Golla

Module: check_mk Branch: master Commit: e7e564b7edf205400ac8dfc50e6672dcf8916310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7e564b7edf205… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Dec 8 12:07:31 2014 +0100 help text for JVM rules now include search keywords Jolokia, Tomcat, to make them easier to find --- web/plugins/wato/check_parameters.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 890bbaa..dc01fd8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5639,7 +5639,7 @@ register_check_parameters( _("JVM threads"), Tuple( help = _("This rule sets the warn and crit levels for the number of threads " - "running in a JVM."), + "running in a JVM. Other keywords for this rule: Tomcat, Jolokia, JMX."), elements = [ Integer( title = _("Warning if above"), @@ -5666,7 +5666,8 @@ register_check_parameters( "jvm_uptime", _("JVM uptime (since last reboot)"), Dictionary( - help = _("This rule sets the warn and crit levels for the uptime of a JVM. "), + help = _("This rule sets the warn and crit levels for the uptime of a JVM. " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ ( "min", Tuple( @@ -5700,7 +5701,8 @@ register_check_parameters( _("JVM session count"), Tuple( help = _("This rule sets the warn and crit levels for the number of current " - "connections to a JVM application on the servlet level."), + "connections to a JVM application on the servlet level. " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ Integer( title = _("Warning if below"), @@ -5738,7 +5740,8 @@ register_check_parameters( _("JVM request count"), Tuple( help = _("This rule sets the warn and crit levels for the number " - "of incoming requests to a JVM application server"), + "of incoming requests to a JVM application server " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ Integer( title = _("Warning if below"), @@ -5778,7 +5781,8 @@ register_check_parameters( help = _("The BEA application servers have 'Execute Queues' " "in which requests are processed. This rule allows to set " "warn and crit levels for the number of requests that are " - "being queued for processing."), + "being queued for processing. " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ Integer( title = _("Warning if above"), @@ -5807,7 +5811,8 @@ register_check_parameters( _("JVM memory levels"), Dictionary( help = _("This rule allows to set the warn and crit levels of the heap / " - "non-heap and total memory area usage on web application servers."), + "non-heap and total memory area usage on web application servers. " + "Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ ( "totalheap", Alternative( @@ -6834,6 +6839,7 @@ register_check_parameters( "jvm_gc", _("JVM garbage collection levels"), Dictionary( + help = _("Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ ( "CollectionTime", Alternative( @@ -6877,6 +6883,7 @@ register_check_parameters( "jvm_tp", _("JVM tomcat threadpool levels"), Dictionary( + help = _("Other keywords for this rule: Tomcat, Jolokia, JMX. "), elements = [ ( "currentThreadCount", Alternative(

9 years, 9 months

Check_MK Git: check_mk: check_mail_loop: fixed datatype on command line creation

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e92e475eafd4205b7013b32c1ee8caee5817716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e92e475eafd42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 11:51:47 2014 +0100 check_mail_loop: fixed datatype on command line creation --- checks/check_mail_loop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/check_mail_loop b/checks/check_mail_loop index 067240e..2842217 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -36,7 +36,7 @@ def check_mail_loop_arguments(params): args == ' --smtp-tls' if 'smtp_port' in params: - args += ' --smtp-port=%s' % quote_shell_string(params['smtp_port']) + args += ' --smtp-port=%d' % params['smtp_port'] if 'smtp_auth' in params: args += ' --smtp-username=%s' % quote_shell_string(params['smtp_auth'][0]) @@ -54,7 +54,7 @@ def check_mail_loop_arguments(params): if fetch_use_ssl: args += ' --fetch-ssl' if fetch_port != None: - args += ' --fetch-port=%s' % quote_shell_string(fetch_port) + args += ' --fetch-port=%d' % fetch_port args += ' --fetch-username=%s' % quote_shell_string(fetch_params['auth'][0]) args += ' --fetch-password=%s' % quote_shell_string(fetch_params['auth'][1]) @@ -63,7 +63,7 @@ def check_mail_loop_arguments(params): args += ' --mail-to=%s' % quote_shell_string(params['mail_to']) if 'connect_timeout' in params: - args += ' --connect-timeout=%s' % quote_shell_string(params['connect_timeout']) + args += ' --connect-timeout=%d' % params['connect_timeout'] if 'delete_messages' in params: args += ' --delete-messages'

9 years, 9 months

Check_MK Git: check_mk: check_smtp: fix datatype of port number from str to int

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f1bef9dc897d5bf6dd981f604ab6e1c39f54c17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f1bef9dc897d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 11:48:34 2014 +0100 check_smtp: fix datatype of port number from str to int --- checks/check_smtp | 3 ++- modules/check_mk_base.py | 2 +- web/plugins/wato/active_checks.py | 20 ++++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/checks/check_smtp b/checks/check_smtp index 1bd5e4c..bc75c0b 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -32,7 +32,8 @@ def check_smtp_arguments(params): args += ' -e %s' % quote_shell_string(settings["expect"]) if "port" in settings: - args += ' -p %s' % quote_shell_string(settings["port"]) + port = int(settings["port"]) # ValueSpec was broken, convert to int + args += ' -p %d' % port if "ip_version" in settings: if settings['ip_version'] == 'ipv4': diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5b0225f..00008af 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1872,7 +1872,7 @@ def get_age_human_readable(secs): # Quote string for use as arguments on the shell def quote_shell_string(s): - return "'" + str(s).replace("'", "'\"'\"'") + "'" + return "'" + s.replace("'", "'\"'\"'") + "'" # Check if a timeperiod is currently active. We have no other way than diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index cea3cc4..1b5497b 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -935,14 +935,18 @@ register_rule(group, help = _("You can specify a hostname or IP address different from the IP address " "of the host as configured in your host properties."))), ( "port", - TextAscii( - title = _("TCP Port to connect to"), - help = _("The TCP Port the SMTP server is listening on. " - "The default is <tt>25</tt>."), - size = 5, - allow_empty = False, - default_value = "25", - ) + Transform( + Integer( + title = _("TCP Port to connect to"), + help = _("The TCP Port the SMTP server is listening on. " + "The default is <tt>25</tt>."), + size = 5, + minvalue = 1, + maxvalue = 65535, + default_value = "25", + ), + forth = int, + ) ), ( "ip_version", Alternative(

9 years, 9 months

Check_MK Git: check_mk: #1658 FIX agent_vsphere: no longer crashes when decommissioned vms report no hardware information

by Andreas Boesl

Module: check_mk Branch: master Commit: e9777f2c1a5ec3571fe5c50005b53d82547eb74d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9777f2c1a5ec3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 8 11:27:25 2014 +0100 #1658 FIX agent_vsphere: no longer crashes when decommissioned vms report no hardware information When a virtual machine gets decommissioned its hardware information (<tt>config.hardware.device</tt>) is no longer reported. This caused the agent_vsphere to crash, unless all configuration files of this virtual machine were removed. --- .werks/1658 | 12 ++++++++++++ ChangeLog | 2 ++ agents/special/agent_vsphere | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1658 b/.werks/1658 new file mode 100644 index 0000000..00d79c5 --- /dev/null +++ b/.werks/1658 @@ -0,0 +1,12 @@ +Title: agent_vsphere: no longer crashes when decommissioned vms report no hardware information +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418034002 +Class: fix + +When a virtual machine gets decommissioned its hardware information (<tt>config.hardware.device</tt>) is +no longer reported. This caused the agent_vsphere to crash, unless all configuration files of this virtual +machine were removed. + diff --git a/ChangeLog b/ChangeLog index 48b7148..4bb9c37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 1624 FIX: Remove illegal characters from service descriptions of active checks... * 1628 FIX: Remove trailing backslashes from service descriptions... * 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery... + * 1657 FIX: check_mk_agent.solaris: run_cached: remove cache file if it is older than twice the maximum cache age * 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755... Checks & Agents: @@ -124,6 +125,7 @@ * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent * 1455 FIX: hp_proliant_mem: avoid a crash of the check when module_condition is empty * 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation + * 1658 FIX: agent_vsphere: no longer crashes when decommissioned vms report no hardware information... 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 f57e41f..6a04ec7 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -934,7 +934,8 @@ if not error: continue else: # we don't need this in the agent output - del vm_data["config.hardware.device"] + if vm_data.get("config.hardware.device"): + del vm_data["config.hardware.device"] if "runtime.host" in vm_data: vm_data["runtime.host"] = hostsystems.get(vm_data["runtime.host"], vm_data["runtime.host"])

9 years, 9 months

Check_MK Git: check_mk: Fixed type error in check_mk_base

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7b11f132446f548f5a176d9454319e2a6034bdff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b11f132446f54… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 5 14:09:44 2014 +0100 Fixed type error in check_mk_base --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 95bcd6a..a167e06 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1857,7 +1857,7 @@ def get_age_human_readable(secs): # Quote string for use as arguments on the shell def quote_shell_string(s): - return "'" + s.replace("'", "'\"'\"'") + "'" + return "'" + str(s).replace("'", "'\"'\"'") + "'" # Check if a timeperiod is currently active. We have no other way than

9 years, 9 months

← Newer
1
...
24
25
26
27
28
29
30
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014