Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: fsc_fans: Added support for Wato configuration and upper limits

by Bastian Kuhn

Module: check_mk Branch: master Commit: 376bf5bd48b3804d53f36a5b81d48b9a9fa1a2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=376bf5bd48b380… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 22 11:30:42 2014 +0200 fsc_fans: Added support for Wato configuration and upper limits --- .werks/152 | 8 ++++---- ChangeLog | 2 +- checkman/fsc_fans | 7 +++++++ checks/fsc_fans | 24 +++++++++++++++++------- web/htdocs/images/icons/klipper.png | Bin 3364 -> 0 bytes 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/152 b/.werks/152 index bed4540..04392a6 100644 --- a/.werks/152 +++ b/.werks/152 @@ -1,8 +1,8 @@ -Title: windows_updates: Added Error Handling (Thanks to Stefan Kick) +Title: fsc_fans: Added support for Wato configuration and upper limits Level: 1 Component: checks Version: 1.2.5i3 -Date: 1397744176 -Class: fix +Date: 1398159011 +Class: feature + -The windows_update plugin now also handles windows servers with deactivated update function. diff --git a/ChangeLog b/ChangeLog index e7698e8..a634b46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices + * 0152 fsc_fans: Added support for Wato configuration and upper limits * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection @@ -44,7 +45,6 @@ * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... - * 0152 FIX: windows_updates: Added Error Handling (Thanks to Stefan Kick)... * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore Multisite: diff --git a/checkman/fsc_fans b/checkman/fsc_fans index af94484..617d5d4 100644 --- a/checkman/fsc_fans +++ b/checkman/fsc_fans @@ -16,3 +16,10 @@ description: inventory: The check creates one service for each FAN provided in the SNMP data. + +[parameters] +parameters(dict): parameters is a dictionary with two keys + + {"lower"}: a tuple of lower warning and critical values for the fan rpm + + {"upper"}: a tuple of upper warning and critical values for the fan rpm diff --git a/checks/fsc_fans b/checks/fsc_fans index 78bc2bb..01644cc 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -29,20 +29,29 @@ def inventory_fsc_fans(info): return [ (line[0], line[1], (int(line[1]) * 0.9, int(line[1]) * 0.8)) for line in info if int(line[1]) > 0 ] def check_fsc_fans(item, params, info): - warn, crit = params + if type(params) == tuple: + low_warn, low_crit = params + up_warn, up_crit = None, None + else: + low_warn, low_crit = params['lower'] + up_warn, up_crit = params['upper'] + for line in info: # , value1, value2 in info: name = line[0] if name != item: continue rpm = int(line[1]) - perfdata = [ ( 'rpm', rpm, warn, crit, 0 ) ] + perfdata = [ ( 'rpm', rpm, low_warn, low_crit, 0 ) ] infotext = "%d RPM" % rpm - if rpm < crit: - return (2, "%s" % infotext, perfdata) - elif rpm < warn: - return (1, "%s" % infotext, perfdata) + levels = "Warn/Crit Lower: %d/%d " % (low_warn, low_crit ) + if up_crit: + levels += "Upper: %d/%d" % ( up_warn, up_crit ) + if rpm < low_crit or (up_crit and rpm > up_crit): + return 2, infotext + levels, perfdata + elif rpm < low_warn or (up_warn and rpm > up_warn): + return 1, infotext + levels, perfdata else: - return (0, "%s" % infotext, perfdata) + return 0, infotext, perfdata return (3, "FAN %s not found in SNMP data" % item) @@ -50,6 +59,7 @@ def check_fsc_fans(item, params, info): check_info["fsc_fans"] = { 'check_function': check_fsc_fans, 'inventory_function': inventory_fsc_fans, + 'group': "hw_fans", 'service_description': 'FSC %s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.231.2.10.2.2.5.2.2.1', [16, 8]), diff --git a/web/htdocs/images/icons/klipper.png b/web/htdocs/images/icons/klipper.png deleted file mode 100644 index ea9c78e..0000000 Binary files a/web/htdocs/images/icons/klipper.png and /dev/null differ

10 years, 4 months

Check_MK Git: check_mk: Minor preparations for baking agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e54c542256f5affa982b2f02df96b308a1ee891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e54c542256f5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 21 22:45:42 2014 +0200 Minor preparations for baking agents --- modules/automation.py | 3 +++ modules/check_mk.py | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 5fca771..b4d26b6 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -725,6 +725,9 @@ def automation_restart(job="restart"): else: do_create_cmc_config(opt_cmc_relfilename) + if bake_agents_on_restart: + do_bake_agents() + except Exception, e: if backup_path: os.rename(backup_path, objects_file) diff --git a/modules/check_mk.py b/modules/check_mk.py index b5bd412..ee3bd47 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -347,6 +347,7 @@ inv_exports = {} # Rulesets for inventory export hooks # Rulesets for agent bakery agent_config = {} +bake_agents_on_restart = True # global variables used to cache temporary values (not needed in check_mk_base) @@ -372,7 +373,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', ] + modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery' ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -4824,6 +4825,13 @@ def do_create_config(): create_nagios_config(out) sys.stdout.write(tty_ok + "\n") + if bake_agents_on_restart and 'do_bake_agents' in globals(): + sys.stdout.write("Baking agents...") + sys.stdout.flush() + do_bake_agents() + sys.stdout.write(tty_ok + "\n") + + def do_output_nagios_conf(args): if len(args) == 0: args = None @@ -6032,11 +6040,7 @@ if __name__ == "__main__": do_create_rrd(args) done = True elif o in [ '-A', '--bake-agents' ]: - try: - execfile(modules_dir + "/agent_bakery.py") - except: - if opt_debug: - raise + if 'do_bake_agents' not in globals(): sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n") sys.exit(1) if args:

10 years, 4 months

Check_MK Git: check_mk: First step towards new agent bakery

by Mathias Kettner

Module: check_mk Branch: master Commit: 60c843c1f82382f27276d73fa3746a666c2b1ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60c843c1f82382… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 17 16:58:28 2014 +0200 First step towards new agent bakery --- modules/check_mk.py | 32 ++++++++++++++++++++++------ web/htdocs/wato.py | 4 ++-- web/plugins/wato/builtin_modules.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0439188..b5bd412 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -345,6 +345,9 @@ check_periods = [] snmp_check_interval = [] inv_exports = {} # Rulesets for inventory export hooks +# Rulesets for agent bakery +agent_config = {} + # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -369,7 +372,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp' ] + modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -4690,6 +4693,7 @@ def usage(): cmk --create-rrd [--keepalive|SPEC] create round robin database cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin + cmk -A, --bake-agents [H1 H2 ..] Bake agents for hosts (no in all versions) cmk -V, --version print version cmk -h, --help print this help @@ -4797,16 +4801,16 @@ NOTES: hosts's parents. It creates the file conf.d/parents.mk which defines gateway hosts and parent declarations. - The core can call check_mk without options and the hostname and its IP - address as arguments. Much faster is using precompiled host checks, - though. + -A, --bake-agents creates RPM/DEB/MSI packages with host-specific + monitoring agents. Note: this feature is only contained in the + subscription version of Check_MK. """ % (check_mk_configfile, precompiled_hostchecks_dir, snmpwalks_dir, snmpwalks_dir, - local_mibs_dir and ("\n You can add further mibs to %s" % local_mibs_dir) or "", + local_mibs_dir and ("\n You can add further MIBs to %s" % local_mibs_dir) or "", ) @@ -5819,11 +5823,11 @@ def output_profile(): # Do option parsing and execute main function - # if check_mk is not called as module if __name__ == "__main__": - short_options = 'SHVLCURODMmd:Ic:nhvpXPNBil' + short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBil' long_options = [ "help", "version", "verbose", "compile", "debug", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", - "snmptranslate", + "snmptranslate", "bake-agents", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", @@ -6027,6 +6031,20 @@ if __name__ == "__main__": execfile(modules_dir + "/rrd.py") do_create_rrd(args) done = True + elif o in [ '-A', '--bake-agents' ]: + try: + execfile(modules_dir + "/agent_bakery.py") + except: + if opt_debug: + raise + sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n") + sys.exit(1) + if args: + hostnames = parse_hostname_list(args, with_clusters = False) + else: + hostnames = None + do_bake_agents(hostnames) + done = True except MKGeneralException, e: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4d231c9..81370ad 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16760,16 +16760,16 @@ modes = { loaded_with_language = False def load_plugins(): - global extra_buttons global loaded_with_language if loaded_with_language == current_language: return # Reset global vars - global extra_buttons, configured_host_tags, host_attributes + global extra_buttons, configured_host_tags, host_attributes, modules extra_buttons = [] configured_host_tags = None host_attributes = [] + modules = [] load_notification_table() diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index f1481f9..c680c20 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -28,7 +28,7 @@ # defined in a plugin because they contain i18n strings. # fields: mode, title, icon, permission, help -modules = [ +modules += [ ( "folder", _("Hosts"), "folder", "hosts", _("Manage monitored hosts and services and the hosts' folder structure.")), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6e5818e..63cafb0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -499,7 +499,7 @@ register_configvar(group, domain = "multisite") #. -# .--User Mgmt-----------------------------------------------------------. +# .--User Management-----------------------------------------------------. # | _ _ __ __ _ | # | | | | |___ ___ _ __ | \/ | __ _ _ __ ___ | |_ | # | | | | / __|/ _ \ '__| | |\/| |/ _` | '_ ` _ \| __| |

10 years, 4 months

Check_MK Git: check_mk: New valuespec ListOfIntegers

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c5470536a9ad3b45a77c85644c663a0627398e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c5470536a9ad3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 20 19:26:22 2014 +0200 New valuespec ListOfIntegers --- web/htdocs/valuespec.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ad801f6..b4e90f9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -241,7 +241,10 @@ class Integer(ValueSpec): style = "text-align: right;" else: style = "" - html.number_input(varprefix, self._display_format % convfunc(value), size = self._size, style = style) + if value == "": # This is needed for ListOfIntegers + html.text_input(varprefix, "", "number", size = self._size, style = style) + else: + html.number_input(varprefix, self._display_format % convfunc(value), size = self._size, style = style) if self._unit: html.write(" ") html.write(self._unit) @@ -693,10 +696,12 @@ class ListOfStrings(ValueSpec): def from_html_vars(self, vp): value = [] nr = 0 - while html.has_var(vp + "_%d" % nr): - s = html.var(vp + "_%d" % nr).strip() - if s: - value.append(s) + while True: + varname = vp + "_%d" % nr + if not html.has_var(varname): + break + if html.var(varname, "").strip(): + value.append(self._valuespec.from_html_vars(varname)) nr += 1 return value @@ -719,6 +724,20 @@ class ListOfStrings(ValueSpec): self._valuespec.validate_value(s, vp + "_%d" % nr) ValueSpec.custom_validate(self, value, vp) +class ListOfIntegers(ListOfStrings): + def __init__(self, **kwargs): + int_args = {} + for key in [ "minvalue", "maxvalue" ]: + if key in kwargs: + int_args[key] = kwargs[key] + int_args["display_format"] = "%s" + int_args["convfunc"] = lambda x: x != "" and saveint(x) or "" + int_args["minvalue"] = 17 + int_args["default_value"] = 34 + valuespec = Integer(**int_args) + kwargs["valuespec"] = valuespec + ListOfStrings.__init__(self, **kwargs) + # Generic list-of-valuespec ValueSpec with Javascript-based # add/delete/move class ListOf(ValueSpec):

10 years, 4 months

Check_MK Git: check_mk: AB: fixed detection of do_bake_agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 84cae0a067424fa8fe6eac358abd451a92019459 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cae0a067424f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 22 10:39:17 2014 +0200 AB: fixed detection of do_bake_agents --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index b4d26b6..742a1e3 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -725,7 +725,7 @@ def automation_restart(job="restart"): else: do_create_cmc_config(opt_cmc_relfilename) - if bake_agents_on_restart: + if "do_bake_agents" in globals() and bake_agents_on_restart: do_bake_agents() except Exception, e:

10 years, 4 months

Check_MK Git: check_mk: Better inline docu in mail notification script

by Mathias Kettner

Module: check_mk Branch: master Commit: ba90fa9691746255daa8b364152c6b8d1493df24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba90fa96917462… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 17 16:56:40 2014 +0200 Better inline docu in mail notification script --- notifications/mail | 1 + 1 file changed, 1 insertion(+) diff --git a/notifications/mail b/notifications/mail index c051b73..11a4c32 100755 --- a/notifications/mail +++ b/notifications/mail @@ -4,6 +4,7 @@ # # Argument 1: Full system path to the pnp4nagios index.php for fetching the graphs. Usually auto configured in OMD. # Argument 2: HTTP-URL-Prefix to open Multisite. When provided, several links are added to the mail. +# Example: http://myserv01/prod # # This script creates a nifty HTML email in multipart format with # attached graphs and such neat stuff. Sweet!

10 years, 4 months

Check_MK Git: check_mk: FIX fritz.link: Not inventorizing "unconfigured" interfaces anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 59f86fe5323f70a25668861e49d1ec9f102da46c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f86fe5323f70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 22 08:41:44 2014 +0200 FIX fritz.link: Not inventorizing "unconfigured" interfaces anymore --- .werks/810 | 8 ++++++++ ChangeLog | 1 + checks/fritz | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/810 b/.werks/810 new file mode 100644 index 0000000..efb1929 --- /dev/null +++ b/.werks/810 @@ -0,0 +1,8 @@ +Title: fritz.link: Not inventorizing "unconfigured" interfaces anymore +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398148880 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 477451c..e7698e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... * 0152 FIX: windows_updates: Added Error Handling (Thanks to Stefan Kick)... + * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/fritz b/checks/fritz index 4a43403..d6f7faa 100644 --- a/checks/fritz +++ b/checks/fritz @@ -37,13 +37,15 @@ def fritz_parse_info(info): def inventory_fritz_conn(info): data = fritz_parse_info(info) if 'NewConnectionStatus' in data \ - and 'NewExternalIPAddress' in data: + and 'NewExternalIPAddress' in data \ + and data.get('NewConnectionStatus') != 'Unconfigured': return [(None, {})] fritz_conn_states = { 'Connected': 0, 'Connecting': 1, 'Disconnected': 1, + 'Unconfigured': 1, } def check_fritz_conn(_unused, _no_params, info):

10 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2128

by Lars Michelsen

Module: check_mk Branch: master Commit: 09be677103d3c2dfbdb2c3277f5222b1c5db4d02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09be677103d3c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 22 08:33:52 2014 +0200 Updated bug entries #2128 --- .bugs/2128 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2128 b/.bugs/2128 new file mode 100644 index 0000000..5dd4bef --- /dev/null +++ b/.bugs/2128 @@ -0,0 +1,10 @@ +Title: mk-job: Start time is only available after job finished +Component: checks +State: open +Date: 2014-04-22 08:32:35 +Targetversion: 1.2.5i1 +Class: bug + +This should really be changed. The start time should be available once the job has been +started. The check needs to deal with the old job info and the start time of the just +started and currently running job while the job is running.

10 years, 4 months

Check_MK Git: check_mk: FIX windows_updates: Added Error Handling ( Thanks to Stefan Kick)

by Bastian Kuhn

Module: check_mk Branch: master Commit: e75347fdb48fc5be804938e2b19982bdb93fe6fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75347fdb48fc5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 17 16:17:48 2014 +0200 FIX windows_updates: Added Error Handling (Thanks to Stefan Kick) The windows_update plugin now also handles windows servers with deactivated update function. --- .werks/152 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/windows_updates.vbs | 15 ++++++++++++++- checks/windows_updates | 3 +++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/152 b/.werks/152 new file mode 100644 index 0000000..bed4540 --- /dev/null +++ b/.werks/152 @@ -0,0 +1,8 @@ +Title: windows_updates: Added Error Handling (Thanks to Stefan Kick) +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397744176 +Class: fix + +The windows_update plugin now also handles windows servers with deactivated update function. diff --git a/ChangeLog b/ChangeLog index b34156d..477451c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... + * 0152 FIX: windows_updates: Added Error Handling (Thanks to Stefan Kick)... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 7ef05df..596fce4 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -6,7 +6,7 @@ ' to a new inventorized service. ' ' Author: Lars Michelsen <lm(a)mathias-kettner.de>, 2011-03-21 -' Editor: Patrick Schlüter <ps(a)pdv-systeme.de>, 2011-08-21 +' Editor: Patrick SchlÃŒter <ps(a)pdv-systeme.de>, 2011-08-21 ' ' Updated by Phil Randal, 2012-09-21, to cache results using a randomised check interval ' of 16 to 24 hours @@ -16,6 +16,8 @@ ' ' Updated by Bastian Kuhn, 2014-03-03: Removed all caching functions cause the current agent ' has a native caching support. Make sure that you activate caching for this script in check_mk.ini +' +' 2014-04-17: Fix by Stefan Kick to handle errors. Payed by Adaptron. ' ----------------------------------------------------------------------------------------- Option Explicit @@ -64,7 +66,18 @@ If CreateObject("Microsoft.Update.SystemInfo").RebootRequired Then reboot = 1 End If +On Error Resume Next + Set result = updtSearcher.Search("IsInstalled = 0 and IsHidden = 0") + +If Err.Number <> 0 then + WScript.Echo "<<<windows_updates>>>" + Wscript.Echo "x x x" + Wscript.Echo "There was an error getting update information. Maybe Windows update is not activated. Error Number: " & Err.Number + WScript.Quit() +End If + + Set colDownloads = result.Updates For Each objEntry in colDownloads diff --git a/checks/windows_updates b/checks/windows_updates index 1a6c153..9f04829 100644 --- a/checks/windows_updates +++ b/checks/windows_updates @@ -47,6 +47,9 @@ def inventory_windows_updates(info): def check_windows_updates(_unused, params, info): if info and len(info[0]) == 3: status = 0 + # Workarround to return errors from the plugin + if info[0][0] == 'x': + return 2, ' '.join(info[1]) reboot_required, num_imp, num_opt = map(saveint, info[0]) imp_warn, imp_crit, opt_warn, opt_crit = params[0:4] if len(params) == 7:

10 years, 5 months

Check_MK Git: check_mk: FIX event console view: fixed exception on rendering host tags for unknown hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: f2bd1dffc44596abd212de8b30ab6d0891f2e13e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2bd1dffc44596… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 17 15:05:42 2014 +0200 FIX event console view: fixed exception on rendering host tags for unknown hosts The event console was unable to render specific host tag columns when the monitoring system had no knowledge of the host in question. --- .werks/902 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/902 b/.werks/902 new file mode 100644 index 0000000..adf8c9b --- /dev/null +++ b/.werks/902 @@ -0,0 +1,10 @@ +Title: event console view: fixed exception on rendering host tags for unknown hosts +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1397739863 + +The event console was unable to render specific host tag columns +when the monitoring system had no knowledge of the host in question. diff --git a/ChangeLog b/ChangeLog index b4e41b8..b34156d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ Event Console: * 0885 New option for writing all messages into a syslog-like logfile... + * 0902 FIX: event console view: fixed exception on rendering host tags for unknown hosts... Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bcb8f5c..6029ff1 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2735,7 +2735,7 @@ def get_painter_option(name): return opt.get("value", opt['valuespec'].default_value()) def get_host_tags(row): - if "host_custom_variables" in row: + if type(row.get("host_custom_variables")) == dict: return row["host_custom_variables"].get("TAGS", "") for name, val in zip(row["host_custom_variable_names"],

10 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014