Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: Fixed handling of check_mk commandline parameter " -c"

by Lars Michelsen

Module: check_mk Branch: master Commit: 7becaf944895e433c14aee6cd4117ff6e2aa5016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7becaf944895e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 9 15:28:59 2015 +0100 Fixed handling of check_mk commandline parameter "-c" --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b48ff95..dc76305 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5500,7 +5500,7 @@ for o,a in opts: elif o in [ '-f', '--force' ]: opt_force = True elif o == '-c': - if check_mk_configfile != 'a': + if check_mk_configfile != a: sys.stderr.write("Please use the option -c separated by the other options.\n") sys.exit(1) elif o == '--cache':

9 years, 6 months

Check_MK Git: check_mk: #1225 sansymphony_alerts, sansymphony_pool,

by Bastian Kuhn

sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony Message-ID: <54fd9c8d.95++TRjYoPTwXhJN%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 42025e46358aaff76ecddbc9291cd101275ab3e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42025e46358aaf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 9 14:13:45 2015 +0100 #1225 sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony The new Checks need the agent Plugin sansymphony.ps1 configured with username in password to work. Prerequisites ------------- 1. Datacore SANsymphony V8 or V9 must be installed SANmelody and Sansymphony are not supported. 2. The SANsymphony CMDlets need to be installed on the monitored Datacore Server If not installed you need to install the CMDlets with the SANsymphony V installation routine. - Enabling of .net 4 Framwork support in PowerShell Support for .net 4 must be enabled. To achieve this, create a file with the name powershell.exe.config with the following content: <?xml version="1.0" encoding="utf-8" ?> <configuration> <startup useLegacyV2RuntimeActivationPolicy="true"> <supportedRuntime version="v4.0"/> <supportedRuntime version="v2.0.50727" /> </startup> </configuration> --- .werks/1225 | 27 +++++++++++++++++++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 15 +++++++-------- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.werks/1225 b/.werks/1225 new file mode 100644 index 0000000..6519ec4 --- /dev/null +++ b/.werks/1225 @@ -0,0 +1,27 @@ +Title: sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425906288 +Class: feature + +The new Checks need the agent Plugin sansymphony.ps1 configured with username in password to work. + +Prerequisites +------------- +1. Datacore SANsymphony V8 or V9 must be installed +SANmelody and Sansymphony are not supported. + +2. The SANsymphony CMDlets need to be installed on the monitored Datacore Server +If not installed you need to install the CMDlets with the SANsymphony V installation routine. +- Enabling of .net 4 Framwork support in PowerShell +Support for .net 4 must be enabled. To achieve this, create a file with the name powershell.exe.config with the following content: + +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup useLegacyV2RuntimeActivationPolicy="true"> + <supportedRuntime version="v4.0"/> + <supportedRuntime version="v2.0.50727" /> + </startup> +</configuration> diff --git a/ChangeLog b/ChangeLog index d62f04b..d0566a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 1867 ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM * 2099 ibm_svc_portsas, ibm_svc_portfc: checks now have a more meaningful service description if the device firmware supports it... NOTE: Please refer to the migration notes! + * 1225 sansymphony_alerts,sansymphony_pool,sansymphony_ports,sansymphony_serverstatus,sansymphony_virtualdiskstatus: New Checks for Datacore Sansymphony... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fd5bb6c..01a9565 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6429,34 +6429,33 @@ register_check_parameters( register_check_parameters( subgroup_applications, - "datacore_poolallocation", - _("Datacore: pool allocation"), + "sansymphony_pool", + _("Sansymphony: pool allocation"), Tuple( - help = _("This rule sets the warn and crit levels for the number of allocated pools"), + help = _("This rule sets the warn and crit levels for the percentage of allocated pools"), elements = [ Integer( title = _("Warning at"), - unit = _("pools"), + unit = _("percent"), default_value = 80, ), Integer( title = _("Critical at"), - unit = _("pools"), + unit = _("percent"), default_value = 90, ), ] ), TextAscii( title = _("Name of the pool"), - allow_empty = False, ), "first" ) register_check_parameters( subgroup_applications, - "datacore_alerts", - _("Datacore: Number of unacknowlegded alerts"), + "sansymphony_alerts", + _("Sansymphony: Number of unacknowlegded alerts"), Tuple( help = _("This rule sets the warn and crit levels for the number of unacknowlegded alerts"), elements = [

9 years, 6 months

Check_MK Git: check_mk: #2099 ibm_svc_portsas, ibm_svc_portfc:

by Goetz Golla

checks now have a more meaningful service description if the device firmware supports it Message-ID: <54fd7f7e.FYl8CnVGYxiur6UB%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1b09aef4bc48e9f51e63942eb832dc404bb6a8c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b09aef4bc48e9… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 9 12:09:31 2015 +0100 #2099 ibm_svc_portsas, ibm_svc_portfc: checks now have a more meaningful service description if the device firmware supports it Please redo a service discovery --- .werks/2099 | 10 ++++++++++ ChangeLog | 2 ++ checkman/ibm_svc_portfc | 4 +++- checkman/ibm_svc_portsas | 3 ++- checks/ibm_svc_portfc | 26 +++++++++++++++----------- checks/ibm_svc_portsas | 36 ++++++++++++++++++++++++++++++++---- 6 files changed, 64 insertions(+), 17 deletions(-) diff --git a/.werks/2099 b/.werks/2099 new file mode 100644 index 0000000..d41aa56 --- /dev/null +++ b/.werks/2099 @@ -0,0 +1,10 @@ +Title: ibm_svc_portsas, ibm_svc_portfc: checks now have a more meaningful service description if the device firmware supports it +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1425899308 +Class: feature + +Please redo a service discovery + diff --git a/ChangeLog b/ChangeLog index 4ca21e1..d62f04b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,8 @@ * 1894 hwg_humidity: New check to monitor humidity sensors attached to HWg-STE... * 1866 ibm_imm_fan, ibm_imm_temp: new checks to monitor fans and temp sensors on IBM Servers via the IMM * 1867 ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM + * 2099 ibm_svc_portsas, ibm_svc_portfc: checks now have a more meaningful service description if the device firmware supports it... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/ibm_svc_portfc b/checkman/ibm_svc_portfc index 0421b7c..b5cd8f6 100644 --- a/checkman/ibm_svc_portfc +++ b/checkman/ibm_svc_portfc @@ -15,7 +15,9 @@ description: can be configured by WATO. item: - The ID of the FC Port. + The item name is "Node <node_id> Slot <adapter_location> Port <adapter_port_id>" + or "Port <port_id>" for older versions of the device. + inventory: Creates one check for every FC Port in the IBM SVC / Storwize V3700 / V7000 device diff --git a/checkman/ibm_svc_portsas b/checkman/ibm_svc_portsas index ff4e1d8..0b61534 100644 --- a/checkman/ibm_svc_portsas +++ b/checkman/ibm_svc_portsas @@ -15,7 +15,8 @@ description: can be configured by WATO. item: - The ID of the SAS Port. + The item name is "Node <node_id> Slot <adapter_location> Port <adapter_port_id>" + or "Port <port_id>" for older versions of the device. inventory: Creates one check for every SAS Port in the IBM SVC / Storwize V3700 / V7000 device diff --git a/checks/ibm_svc_portfc b/checks/ibm_svc_portfc index bcae05f..b5894af 100644 --- a/checks/ibm_svc_portfc +++ b/checks/ibm_svc_portfc @@ -53,25 +53,29 @@ def inventory_ibm_svc_portfc(info): for line in info: - if len(line) in (11, 12, 14) and line[9] == "active": - yield line[0], None + if len(line) in (11, 12) and line[9] == "active": + item = "Port %s" % line[0] + yield item, None + elif len(line) == 14 and line[9] == "active": + item = "Node %s Slot %s Port %s" % (line[5], line[12], line[13]) + yield item, None def check_ibm_svc_portfc(item, _no_params, info): for line in info: - if len(line) in (11, 12, 14): - if line[0] == item: - fc_port_status = line[9] + if ( len(line) in (11, 12) and "Port %s" % line[0] == item) or \ + ( len(line) == 14 and "Node %s Slot %s Port %s" % (line[5], line[12], line[13]) ) == item: + infotext = "Status: %s, Speed: %s, WWPN: %s" % (line[9], line[4], line[7]) - if fc_port_status == "active": - state = 0 - else: - state = 2 + if line[9] == "active": + state = 0 + else: + state = 2 - return state, fc_port_status + return state, infotext check_info["ibm_svc_portfc"] = { "check_function" : check_ibm_svc_portfc, "inventory_function" : inventory_ibm_svc_portfc, - "service_description" : "FC Port %s", + "service_description" : "FC %s", } diff --git a/checks/ibm_svc_portsas b/checks/ibm_svc_portsas index 276617c..01ee3af 100644 --- a/checks/ibm_svc_portsas +++ b/checks/ibm_svc_portsas @@ -25,10 +25,37 @@ # Boston, MA 02110-1301 USA. +# Example agent output: +# <<<ibm_svc_portsas:sep(58)>>> +# 0:1:6Gb:1:node1:500507680305D3C0:online::host:host_controller:0:1 +# 1:2:6Gb:1:node1:500507680309D3C0:online::host:host_controller:0:2 +# 2:3:6Gb:1:node1:50050768030DD3C0:online::host:host_controller:0:3 +# 3:4:6Gb:1:node1:500507680311D3C0:offline:500507680474F03F:none:enclosure:0:4 +# 4:5:N/A:1:node1:500507680315D3C0:offline_unconfigured::none:host_controller:1:1 +# 5:6:N/A:1:node1:500507680319D3C0:offline_unconfigured::none:host_controller:1:2 +# 6:7:N/A:1:node1:50050768031DD3C0:offline_unconfigured::none:host_controller:1:3 +# 7:8:N/A:1:node1:500507680321D3C0:offline_unconfigured::none:host_controller:1:4 +# 8:1:6Gb:2:node2:500507680305D3C1:online::host:host_controller:0:1 +# 9:2:6Gb:2:node2:500507680309D3C1:online::host:host_controller:0:2 +# 10:3:6Gb:2:node2:50050768030DD3C1:online::host:host_controller:0:3 +# 11:4:6Gb:2:node2:500507680311D3C1:offline:500507680474F07F:none:enclosure:0:4 +# 12:5:N/A:2:node2:500507680315D3C1:offline_unconfigured::none:host_controller:1:1 +# 13:6:N/A:2:node2:500507680319D3C1:offline_unconfigured::none:host_controller:1:2 +# 14:7:N/A:2:node2:50050768031DD3C1:offline_unconfigured::none:host_controller:1:3 +# 15:8:N/A:2:node2:500507680321D3C1:offline_unconfigured::none:host_controller:1:4 + +# the corresponding header line +#id:port_id:port_speed:node_id:node_name:WWPN:status:switch_WWPN:attachment:type:adapter_location:adapter_port_id + def inventory_ibm_svc_portsas(info): for line in info: - if len(line) in (10, 12) and line[6] != "offline_unconfigured": - yield line[0], {'current_state' : line[6]} + if line[6] != "offline_unconfigured": + if len(line) == 12: + item = "Node %s Slot %s Port %s" % (line[3], line[10], line[11]) + yield item, {'current_state' : line[6]} + elif len(line) == 10: + item = "Port %s" % line[0] + yield item, {'current_state' : line[6]} def check_ibm_svc_portsas(item, params, info): # This can be removed soon, because the age of the check @@ -36,7 +63,8 @@ def check_ibm_svc_portsas(item, params, info): if not params: params = { 'current_state' : 'offline' } for line in info: - if len(line) in (10, 12) and line[0] == item: + if ( len(line) == 12 and item == "Node %s Slot %s Port %s" % (line[3], line[10], line[11]) ) or \ + ( len(line) == 10 and item == "Port %s" % line[0] ): sasport_status = line[6] sasport_speed = line[2] sasport_type = line[9] @@ -54,5 +82,5 @@ def check_ibm_svc_portsas(item, params, info): check_info["ibm_svc_portsas"] = { "check_function" : check_ibm_svc_portsas, "inventory_function" : inventory_ibm_svc_portsas, - "service_description" : "SAS Port %s", + "service_description" : "SAS %s", }

9 years, 6 months

Check_MK Git: check_mk: Reserved 25 Werk IDS

by Goetz Golla

Module: check_mk Branch: master Commit: aa25d8fb153fddd0780249f6a3807e7862144db6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa25d8fb153fdd… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 9 11:56:50 2015 +0100 Reserved 25 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9644fad..4e14254 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2108 +2133

9 years, 6 months

Check_MK Git: check_mk: Reserved 25 Werk IDS

by Goetz Golla

Module: check_mk Branch: master Commit: cae3d97a887da22fb8a3e3a8f1382a1d0290b7e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cae3d97a887da2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 9 11:54:32 2015 +0100 Reserved 25 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a0a31bc..686b897 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2098 +2123

9 years, 6 months

Check_MK Git: check_mk: Handle exceptions in parse_function() correctly

by Mathias Kettner

Module: check_mk Branch: master Commit: fd0e35722f0e2470dd85e09889a2740b5def9dc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd0e35722f0e24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 9 11:47:31 2015 +0100 Handle exceptions in parse_function() correctly --- modules/check_mk_base.py | 27 ++++++++++++++++++++++++--- modules/discovery.py | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 77a5ef9..81643af 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -42,7 +42,7 @@ import sys # to python module names like "random" sys.path.pop(0) -import socket, os, time, re, signal, math, tempfile +import socket, os, time, re, signal, math, tempfile, traceback # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing @@ -235,6 +235,13 @@ class MKAgentError(Exception): def __str__(self): return self.reason +class MKParseFunctionError(Exception): + def __init__(self, orig_exception, backtrace): + self.orig_exception = orig_exception + self.backtrace = backtrace + def __str__(self): + return str(str(self.orig_exception) + "\n" + self.backtrace) + class MKSNMPError(Exception): def __init__(self, reason): self.reason = reason @@ -268,7 +275,14 @@ def apply_parse_function(info, section_name): if info != None and section_name in check_info: parse_function = check_info[section_name]["parse_function"] if parse_function: - return parse_function(info) + try: + return parse_function(info) + except Exception, e: + if opt_debug: + raise + # In case of a failed parse function return the exception instead of + # an empty result. + raise MKParseFunctionError(e, traceback.format_exc()) return info def get_info_for_check(hostname, ipaddress, section_name, max_cachefile_age=None, ignore_check_interval=False): @@ -1303,6 +1317,9 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): g_broken_agent_hosts.add(hostname) continue + except MKParseFunctionError, e: + info = e + if info or info == []: num_success += 1 try: @@ -1315,6 +1332,10 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): # Call the actual check function reset_wrapped_counters() + + if isinstance(info, MKParseFunctionError): + raise Exception(str(info)) + result = convert_check_result(check_function(item, params, info), check_uses_snmp(checkname)) if last_counter_wrap(): raise last_counter_wrap() @@ -1330,7 +1351,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): except Exception, e: text = "check failed - please submit a crash report!" try: - import traceback, pprint, tarfile, base64 + import pprint, tarfile, base64 # Create a crash dump with a backtrace and the agent output. # This is put into a directory per service. The content is then # put into a tarball, base64 encoded and put into the long output diff --git a/modules/discovery.py b/modules/discovery.py index 1c7008c..901c4d4 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -386,6 +386,9 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): except MKSNMPError, e: if str(e): raise + except MKParseFunctionError, e: + if opt_debug: + raise if info == None: # No data for this check type return []

9 years, 6 months

Check_MK Git: check_mk: mknotifyd: output connection error message in text , allow DNS names for connections

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e212a0112f0e7e7533dccfe00cac778743e73c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e212a0112f0e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 9 11:17:50 2015 +0100 mknotifyd: output connection error message in text, allow DNS names for connections --- checks/mknotifyd | 7 ++++-- doc/treasures/mknotifyd | 51 +++++++++++++++++++++++++++++------------ web/plugins/wato/mknotifyd.py | 6 ++--- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/checks/mknotifyd b/checks/mknotifyd index c56a891..b9ee50b 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -80,7 +80,7 @@ def parse_mknotifyd(info): else: if value == "None": value = None - elif value and varname not in [ "Type", "State", "Version" ]: + elif value and varname not in [ "Type", "State", "Version", "Status Message" ]: value = int(value.split()[0]) sub_entry[varname] = value @@ -193,7 +193,7 @@ def check_mknotifyd_connection(item, _no_params, parsed): "connecting" : (2, "Trying to connect"), } - site_name, connection_name = item.split('-') + site_name, connection_name = item.split('-', 1) if site_name not in parsed: raise MKCounterWrapped("No status information about spooler available") @@ -204,6 +204,9 @@ def check_mknotifyd_connection(item, _no_params, parsed): state, state_name = states[connection["State"]] yield state, state_name + if "Status Message" in connection: + yield 0, connection["Status Message"] + # Show uptime if connection["State"] == "established": now = time.time() diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 5c48c6f..21975fc 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -424,8 +424,11 @@ def connect_outgoing(connection): connection["socket"] = s try: - s.connect(connection["target"]) + host_name, port = connection["target"] + ipaddress = socket.gethostbyname(host_name) + s.connect((ipaddress, port)) connection["state"] = "established" + connection["statustext"] = "Successfully connected to %s at port %d" % (ipaddress, port) except socket.error, e: try: errno = e.errno @@ -434,14 +437,17 @@ def connect_outgoing(connection): if e.errno == 115: # "Operation now in progress" connection["state"] = "connecting" + connection["statustext"] = "Trying connecting to %s port %d" % (ipaddress, port) else: - connecting["state"] = "cooldown" + connection["state"] = "cooldown" + connection["statustext"] = str(e) log(WARNING, "Error: cannot create TCP channel to %s:%d: %s" % (connection["target"] + (e,))) except Exception, e: - connecting["state"] = "cooldown" + connection["state"] = "cooldown" + connection["statustext"] = str(e) log(EMERG, "Error: cannot create TCP channel to %s:%d: %s" % (connection["target"] + (e,))) @@ -453,13 +459,17 @@ def complete_connections(writable): connection["since"] = time.time() connection["socket"].send("") connection["socket"].setblocking(1) - verbose("Successfully connected to %s:%d" % connection["target"]) + msg = "Successfully connected to %s:%d" % connection["target"] + verbose(msg) connection["state"] = "established" + connection["statustext"] = msg except Exception, e: if opt_debug: raise - log(WARNING, "Failed to connect to %s:%d: %s" % (connection["target"] + (e,))) + msg = "Failed to connect to %s:%d: %s" % (connection["target"] + (e,)) + log(WARNING, msg) connection["state"] = "cooldown" + connection["statustext"] = msg def accept_new_connections(readable): @@ -507,11 +517,15 @@ def receive_data(readable): raise if str(e): - log(ERR, "Error reading data from %s:%d: %s" % (connection["target"] + (e,))) + msg = "Error reading data from %s:%d: %s" % (connection["target"] + (e,)) + log(ERR, msg) + else: + msg = "Error reading data" + if connection["type"] == "incoming": to_remove.append(connection) else: - close_outgoing_connection(connection) + close_outgoing_connection(connection, msg) for connection in to_remove: g_connections.remove(connection) @@ -530,10 +544,11 @@ def send_pending_data(writable): connection["outgoing_data"] = connection["outgoing_data"][sent_bytes:] vverbose("Successfully sent %d bytes to %s:%d" % ((sent_bytes,) + connection["target"])) except Exception, e: - log(ERR, "Cannot send data to %s:%d: %s. Regarding connection as dead." % ( - connection["target"] + (e,))) + msg = "Cannot send data to %s:%d: %s. Regarding connection as dead." % ( + connection["target"] + (e,)) + log(ERR, msg) if connection["type"] == "outgoing": - close_outgoing_connection() + close_outgoing_connection(connection, msg) else: to_remove.append(connection) @@ -541,7 +556,7 @@ def send_pending_data(writable): g_connections.remove(connection) -def close_outgoing_connection(connection): +def close_outgoing_connection(connection, statustext): if "socket" in connection: del connection["socket"] connection["outgoing_data"] = "" @@ -549,6 +564,7 @@ def close_outgoing_connection(connection): connection["notifications_sent"] = 0 connection["notifications_received"] = 0 connection["state"] = "cooldown" + connection["statustext"] = statustext connection["since"] = time.time() @@ -560,8 +576,9 @@ def handle_incoming_data(connection): try: length = int(data[:10]) except: - log(CRIT, "Bogus message header '%s': should be an int. Closing connection" % (data[:10])) - close_outgoing_connection(connection) + msg = "Bogus message header '%s': should be an int. Closing connection" % (data[:10]) + log(CRIT, msg) + close_outgoing_connection(connection, msg) return if len(data) >= length + 10: # message complete! @@ -651,11 +668,13 @@ def handle_heartbeat_timeouts(): if connection["type"] == "outgoing": ref_time = max(connection.get("last_heartbeat"), connection["since"]) if now - ref_time > connection["heartbeat_interval"] + connection["heartbeat_timeout"]: - log(ERR, "No heartbeat from %s:%d for %d seconds! Declaring as dead." % ( - connection["target"] + (now - ref_time,))) + msg = "No heartbeat from %s:%d for %d seconds! Declaring as dead." % ( + connection["target"] + (now - ref_time,)) + log(ERR, msg) del connection["socket"] connection["since"] = now connection["state"] = "cooldown" + connection["statustext"] = msg # Incoming connections send heartbeats else: @@ -728,6 +747,8 @@ def connection_stats(connection): text += "Connection: %s:%d\n" % connection["target"] text += "Type: %s\n" % connection["type"] text += "State: %s\n" % connection["state"] + if connection.get("statustext"): + text += "Status Message: %s\n" % connection["statustext"] text += "Since: %s\n" % format_date(connection["since"]) text += "Notifications Sent: %d\n" % connection["notifications_sent"] text += "Notifications Received: %d\n" % connection["notifications_received"] diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index 6451f0e..5f21afd 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -117,13 +117,13 @@ if mknotifyd_enabled: columns = 2, elements = [ ( "address", - IPv4Address( - title = _("Address of target notification spooler"), + Hostname( + title = _("DNS name or IP address of target notification spooler"), )), ( "port", Integer( title = _("TCP Port"), - minvalue = 1024, + minvalue = 1, maxvalue = 65535, default_value = 6555, )),

9 years, 6 months

Check_MK Git: check_mk: Removed some trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: eec12d1e6c19242c72ea9d6de12a9e7c73c9190e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec12d1e6c1924… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 9 10:58:09 2015 +0100 Removed some trailing spaces --- doc/treasures/notifications/opcmsg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/treasures/notifications/opcmsg b/doc/treasures/notifications/opcmsg index 0c8cd21..1adfdf6 100755 --- a/doc/treasures/notifications/opcmsg +++ b/doc/treasures/notifications/opcmsg @@ -1,13 +1,13 @@ #!/usr/bin/python # Create message for HPOpenView -# This notification plugin forwards the notification to the +# This notification plugin forwards the notification to the # local HPOpenView instance # # Note: Some paths are still hardcoded here. import os, sys, re -def substitute_context(template, context): +def substitute_context(template, context): # First replace all known variables for varname, value in context.items(): template = template.replace('$'+varname+'$', value) @@ -39,7 +39,7 @@ def main(): severity = state_map[context["SERVICESTATEID"]] except: severity = "normal" - + # application application = "RWWS4.0" @@ -56,7 +56,7 @@ def main(): node = context['MONITORING_HOST'] # Assemble the command - command = "%s severity=%s application=%s object=\"%s\" msg_grp=\"%s\" msg_t=\"%s\" node=%s" % ( + command = "%s severity=%s application=%s object=\"%s\" msg_grp=\"%s\" msg_t=\"%s\" node=%s" % ( opcmsg_bin, severity, application, the_object, msg_grp, msg_t, node) # Execute the command

9 years, 6 months

Check_MK Git: check_mk: Cleaned up treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 4e97c6372133392e8f6eba619467ec0183387448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e97c637213339… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 9 10:57:41 2015 +0100 Cleaned up treasures --- doc/treasures/{ => notifications}/opcmsg | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/treasures/opcmsg b/doc/treasures/notifications/opcmsg similarity index 100% rename from doc/treasures/opcmsg rename to doc/treasures/notifications/opcmsg

9 years, 6 months

Check_MK Git: check_mk: Internal code comment

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c55d03675531a7ccf29e90c642d923ab2616a48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c55d03675531a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 9 10:56:39 2015 +0100 Internal code comment --- agents/special/agent_vsphere | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 503daeb..2c52738 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -522,6 +522,9 @@ socket.setdefaulttimeout(opt_timeout) def get_agent_info_tcp(hostname): output = "" try: + # TODO: gethostbyname() automatically detects IP addresses and does + # *not* contact any nameserver in that case. So the following two + # lines of code should not be neccessary: if hostname[0] in "123456789": ipaddress = hostname else:

9 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015