Checkmk git commits January 2014

checkmk-commits@lists.checkmk.com

6 participants
256 discussions

Check_MK Git: check_mk: Internal code cleanup of hitachi_hnas_fc_if

by Mathias Kettner

Module: check_mk Branch: master Commit: 40e5f042c3a1a80f16ba4ea8461672c68fed7db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40e5f042c3a1a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 14:20:58 2014 +0100 Internal code cleanup of hitachi_hnas_fc_if --- checks/hitachi_hnas_fc_if | 68 +++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/checks/hitachi_hnas_fc_if b/checks/hitachi_hnas_fc_if index b8a1821..f30ac6f 100644 --- a/checks/hitachi_hnas_fc_if +++ b/checks/hitachi_hnas_fc_if @@ -24,42 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def hitachi_hnas_fc_if_convert_info(info): converted = [] for line in info: - convertedline = [] - convertedline.append("%d%03d" % (int(line[0]), int(line[1]))) # ifIndex - # use ClusterNode.InterfaceIndex as description too, because - # we have no explicit Descr - convertedline.append(line[0] + "." + line[1]) # ifDescr - # ifType 56 fibreChannel - convertedline.append("56") # ifType - convertedline.append(str(int(line[3]) * 1000000000)) # ifHighSpeed - if line[2] == "1": # ifOperStatus - convertedline.append("1") - else: - convertedline.append("2") - convertedline.append(line[4]) # ifHCInOctets - convertedline.append("0") # ifHCInUcastPkts - convertedline.append("0") # ifHCInMulticastPkts - convertedline.append("0") # ifHCInBroadcastPkts - convertedline.append(line[11]) # ifInDiscards - convertedline.append(str(int(line[6]) + int(line[7]) + int(line[8]) \ - + int(line[9]) + int(line[10]) + int(line[12]) + int(line[13]))) - # ifInErrors - convertedline.append(line[5]) # ifHCOutOctets - convertedline.append("0") # ifHCOutUcastPkts - convertedline.append("0") # ifHCOutMulticastPkts - convertedline.append("0") # ifHCOutBroadcastPkts - convertedline.append("0") # ifOutDiscards - convertedline.append("0") # ifOutErrors - convertedline.append("0") # ifOutQLen - # use ClusterNode.InterfaceIndex as alias too, because - # we have no explicit alias - convertedline.append(line[0] + "." + line[1]) # ifAlias - convertedline.append("") # ifPhysAddress - - converted.append(convertedline) + converted.append(map(str, [ + "%d%03d" % (int(line[0]), int(line[1])), # ifIndex + line[0] + "." + line[1], # ifDescr (use ClusterNode.InterfaceIndex) + 56, # ifType 56 (fibreChannel) + int(line[3]) * 1000000000, # ifHighSpeed + line[2] == "1" and 1 or 2, # ifOperStatus (map other states to down) + line[4], # ifHCInOctets + 0, # ifHCInUcastPkts + 0, # ifHCInMulticastPkts + 0, # ifHCInBroadcastPkts + line[13], # ifInDiscards + sum(map(int, line[6:13])), # ifInErrors + line[5], # ifHCOutOctets + 0, # ifHCOutUcastPkts + 0, # ifHCOutMulticastPkts + 0, # ifHCOutBroadcastPkts + 0, # ifOutDiscards + 0, # ifOutErrors + 0, # ifOutQLen + line[0] + "." + line[1], # ifAlias, same as description + "", # ifPhysAddress + ])) return converted def inventory_hitachi_hnas_fc_if(info): @@ -69,12 +59,11 @@ def inventory_hitachi_hnas_fc_if(info): def check_hitachi_hnas_fc_if(item, params, info): converted = hitachi_hnas_fc_if_convert_info(info) return check_if_common(item, params, converted) - + check_info["hitachi_hnas_fc_if"] = { "check_function" : check_hitachi_hnas_fc_if, "inventory_function" : inventory_hitachi_hnas_fc_if, - "includes": [ "if.include" ], "service_description" : "Interface FC %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.3.6.25.1", [ @@ -89,12 +78,13 @@ check_info["hitachi_hnas_fc_if"] = { 15, # fcStatsLossSyncErrors 8 16, # fcStatsLinkFailErrors 9 17, # fcStatsRXEOFErrors 10 - 18, # fcStatsDiscardedFrameErrors 11 - 19, # fcStatsBadCRCErrors 12 - 20, # fcStatsProtocolErrors 13 + 19, # fcStatsBadCRCErrors 11 + 20, # fcStatsProtocolErrors 12 + 18, # fcStatsDiscardedFrameErrors 13 ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), - "group": "if", + "group" : "if", "default_levels_variable": "if_default_levels", + "includes" : [ "if.include" ], }

10 years, 5 months

Check_MK Git: check_mk: FIX df_netapp32 / df_netapp: Fixed bug with negative size in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 59dd42a1716d390e47c02bccf1059bdee67eaf11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59dd42a1716d39… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 22 12:37:51 2014 +0100 FIX df_netapp32 / df_netapp: Fixed bug with negative size in check output The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes). Unfortunately not all netapp interfaces start at .1, so some netapp devices where wrongly inventorized as df_netapp32 checks. --- .werks/261 | 14 ++++++++++++++ ChangeLog | 1 + checks/df_netapp | 2 +- checks/df_netapp32 | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/261 b/.werks/261 new file mode 100644 index 0000000..ba33d8b --- /dev/null +++ b/.werks/261 @@ -0,0 +1,14 @@ +Title: df_netapp32 / df_netapp: Fixed bug with negative size in check output +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390390390 + +The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking +the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes). +Depending on the 64 Bit counter a df_netapp check is created, otherwise df_netapp32 is used. +Unfortunately not all netapp interfaces start at .1, so some netapp devices where wrongly +inventorized as df_netapp32 checks. <br> +Those checks reported negative volume sizes whenever the 32 bit counter overflowed. diff --git a/ChangeLog b/ChangeLog index e0257f1..939aafd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 0120 FIX: stulz_humidity, apc_humidity: Fixed bug while processing check params... * 0460 FIX: endless waiting for printer queues fixed... * 0260 FIX: Fixed incorrect formatting of checks with long output... + * 0261 FIX: df_netapp32 / df_netapp: Fixed bug with negative size in check output... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/df_netapp b/checks/df_netapp index 29e1a63..055ed7c 100644 --- a/checks/df_netapp +++ b/checks/df_netapp @@ -36,7 +36,7 @@ check_info["df_netapp"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 29, 30]), 'snmp_scan_function': \ - lambda oid: is_netapp_filer(oid) and oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"), + lambda oid: is_netapp_filer(oid) and oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"), 'group': 'filesystem', 'default_levels_variable': 'filesystem_default_levels', } diff --git a/checks/df_netapp32 b/checks/df_netapp32 index 6d6da91..51c07f3 100644 --- a/checks/df_netapp32 +++ b/checks/df_netapp32 @@ -36,7 +36,7 @@ check_info["df_netapp32"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 3, 4]), 'snmp_scan_function': \ - lambda oid: is_netapp_filer(oid) and not oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"), + lambda oid: is_netapp_filer(oid) and not oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"), 'group': 'filesystem', 'default_levels_variable': 'filesystem_default_levels', }

10 years, 5 months

Check_MK Git: check_mk: Fixed help text in EC actions

by Mathias Kettner

Module: check_mk Branch: master Commit: 981bea6535571ffecd19c13f8b26e4f4f623be03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=981bea6535571f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:46:24 2014 +0100 Fixed help text in EC actions --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2038676..dd7b71b 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -70,7 +70,7 @@ The following placeholdes will be substituted by value from the actual event: <tr><td class=tt>$STATE$</td><td>State of the event (0/1/2/3)</td></tr> <tr><td class=tt>$PHASE$</td><td>Phase of the event (always open)</td></tr> <tr><td class=tt>$OWNER$</td><td>Owner of the event</td></tr> -<tr><td class=tt>$MATCH_GROUPS$</td><td>Text groups from regular expression match, separated by spaces/td></tr> +<tr><td class=tt>$MATCH_GROUPS$</td><td>Text groups from regular expression match, separated by spaces</td></tr> <tr><td class=tt>$MATCH_GROUP_1$</td><td>Text of the first match group from expression match</td></tr> <tr><td class=tt>$MATCH_GROUP_2$</td><td>Text of the second match group from expression match</td></tr> <tr><td class=tt>$MATCH_GROUP_3$</td><td>Text of the third match group from expression match (and so on...)</td></tr>

10 years, 5 months

Check_MK Git: check_mk: Omit comments after # from notification plugin name

by Mathias Kettner

Module: check_mk Branch: master Commit: 530508af21655bdc882174342af939d5f766c975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=530508af21655b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:42:40 2014 +0100 Omit comments after # from notification plugin name --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d1a9bcc..e787a0a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8856,7 +8856,7 @@ def load_notification_scripts_from(adir): lines.next() line = lines.next().strip() if line.startswith("#"): - title = line.lstrip("#").strip() + title = line.lstrip("#").strip().split("#", 1)[0] except: pass scripts[entry] = title

10 years, 5 months

Check_MK Git: check_mk: FIX Move view "Stale services" to Problems folder

by Mathias Kettner

Module: check_mk Branch: master Commit: 4aa8c1b85fec610deea26a274c8ad223c514f8a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa8c1b85fec61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:40:04 2014 +0100 FIX Move view "Stale services" to Problems folder --- .werks/676 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/676 b/.werks/676 new file mode 100644 index 0000000..0f0e9ee --- /dev/null +++ b/.werks/676 @@ -0,0 +1,9 @@ +Title: Move view "Stale services" to Problems folder +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390379986 + + diff --git a/ChangeLog b/ChangeLog index 1197778..bb456e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 0431 FIX: LDAP: Fixed group syncrhonisation when nested group sync is enabled * 0122 FIX: Multisite view editor not longer throwing a exception when loading views from other users * 0569 FIX: recurring updates of serial numbers of disabled ldap users fixed... + * 0676 FIX: Move view "Stale services" to Problems folder WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f21f2e4..c4cdfa8 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1764,7 +1764,6 @@ multisite_builtin_views.update({ 'mustsearch': False, 'name': 'uncheckedsvc', 'num_columns': 1, - 'owner': 'omdadmin', 'painters': [('service_state', None, ''), ('service_description', 'service', ''), ('svc_plugin_output', None, ''), @@ -1776,6 +1775,7 @@ multisite_builtin_views.update({ 'show_filters': [], 'sorters': [('site_host', False), ('svcdescr', False)], 'title': u'Stale services', + 'topic': _('Problems'), 'user_sortable': 'on'}, 'events': {'browser_reload': 0, 'column_headers': 'pergroup',

10 years, 5 months

Check_MK Git: check_mk: Activate inline SNMP per default (if available)

by Mathias Kettner

Module: check_mk Branch: master Commit: b3a912d3e539dfb659c21783b799e6b15754cddd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3a912d3e539df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:37:04 2014 +0100 Activate inline SNMP per default (if available) If the inline implementation of SNMP is available (in our subscription builds) then it is now activated per default. Inline SNMP saves about 50% of the CPU ressources when monitoring hosts via SNMP. --- .werks/675 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/675 b/.werks/675 new file mode 100644 index 0000000..da01444 --- /dev/null +++ b/.werks/675 @@ -0,0 +1,10 @@ +Title: Activate inline SNMP per default (if available) +Level: 2 +Component: core +Version: 1.2.5i1 +Date: 1390379776 +Class: feature + +If the inline implementation of SNMP is available (in our subscription +builds) then it is now activated per default. Inline SNMP saves about +50% of the CPU ressources when monitoring hosts via SNMP. diff --git a/ChangeLog b/ChangeLog index 7ea2049..1197778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 0386 Added all active checks to check_mk -L output... * 0452 Speedup generation of configuration... * 0124 Support multiline plugin output for Check_MK Checks... + * 0675 Activate inline SNMP per default (if available)... * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory diff --git a/modules/check_mk.py b/modules/check_mk.py index 0c03c6a..28a2513 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -239,7 +239,7 @@ max_num_processes = 50 # SNMP communities and encoding has_inline_snmp = False # is set to True by inline_snmp module, when available -use_inline_snmp = False +use_inline_snmp = True snmp_default_community = 'public' snmp_communities = [] snmp_timing = []

10 years, 5 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c538e43f809daa7d70ba2008e45843a5cd366dd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c538e43f809daa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:36:08 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a5b667a..e0f6509 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -675 +695

10 years, 5 months

Check_MK Git: check_mk: Add output of traceroute to host diagnostic page

by Mathias Kettner

Module: check_mk Branch: master Commit: fe62316db62d68c49460e372ec83aa5a62b38da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe62316db62d68… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:33:13 2014 +0100 Add output of traceroute to host diagnostic page --- .werks/454 | 8 ++++++++ ChangeLog | 1 + modules/automation.py | 12 +++++++++++- web/htdocs/wato.py | 3 ++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/454 b/.werks/454 new file mode 100644 index 0000000..ca3d6e8 --- /dev/null +++ b/.werks/454 @@ -0,0 +1,8 @@ +Title: Add output of traceroute to host diagnostic page +Level: 2 +Component: wato +Version: 1.2.5i1 +Date: 1390379579 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c2bd82a..7ea2049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -173,6 +173,7 @@ * 0428 Changed user profiles (e.g. pw changes) are now replicated in distributed setups... * 0114 User Custom Attributes can now be exported to the core... * 0448 New button in WATO service list for displaying check parameters... + * 0454 Add output of traceroute to host diagnostic page * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/modules/automation.py b/modules/automation.py index 66e5d5d..89b00f9 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -684,6 +684,8 @@ def automation_scan_parents(args): raise MKAutomationError(str(e)) def automation_diag_host(args): + import subprocess + hostname, test, ipaddress, snmp_community = args[:4] agent_port, snmp_timeout, snmp_retries = map(int, args[4:7]) cmd = args[7] @@ -696,7 +698,6 @@ def automation_diag_host(args): try: if test == 'ping': - import subprocess p = subprocess.Popen('ping -A -i 0.2 -c 2 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) response = p.stdout.read() return (p.wait(), response) @@ -710,6 +711,15 @@ def automation_diag_host(args): else: return 0, get_agent_info_tcp(hostname, ipaddress, agent_port or None) + elif test == 'traceroute': + traceroute_prog = find_bin_in_path('traceroute') + if not traceroute_prog: + return 1, "Cannot find binary <tt>traceroute</tt>." + else: + p = subprocess.Popen('traceroute -n %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) + response = p.stdout.read() + return (p.wait(), response) + elif test.startswith('snmp'): if snmp_community: explicit_snmp_communities[hostname] = snmp_community diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 481de8b..d1a9bcc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2192,7 +2192,8 @@ def diag_host_tests(): ('agent', _('Agent')), ('snmpv1', _('SNMPv1')), ('snmpv2', _('SNMPv2c')), - ('snmpv2_nobulk', _('SNMPv2c (without Bulkwalk)')) + ('snmpv2_nobulk', _('SNMPv2c (without Bulkwalk)')), + ('traceroute', _('Traceroute')), ] def mode_diag_host(phase):

10 years, 5 months

Check_MK Git: check_mk: FIX Fix ugly Python exception in host diagnosis page in case of SNMP error

by Mathias Kettner

Module: check_mk Branch: master Commit: 7310f2f1b5f52120330c8a247954fe5a357b64ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7310f2f1b5f521… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 22 09:21:51 2014 +0100 FIX Fix ugly Python exception in host diagnosis page in case of SNMP error The stderr output of the SNMP commands is now captured correctly and displayed at the correct place in case of an error. --- .werks/453 | 10 ++++++++++ ChangeLog | 1 + modules/snmp.py | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/453 b/.werks/453 new file mode 100644 index 0000000..6ab454a --- /dev/null +++ b/.werks/453 @@ -0,0 +1,10 @@ +Title: Fix ugly Python exception in host diagnosis page in case of SNMP error +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1390378855 + +The stderr output of the SNMP commands is now captured correctly and displayed +at the correct place in case of an error. diff --git a/ChangeLog b/ChangeLog index e0257f1..c2bd82a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0426 FIX: Fixed processing of cached agent plugins / local scripts... * 0451 FIX: Ignore missing check types when creating configuration for Nagios * 0259 FIX: Fixed htpasswd permission problem in check_mk standalone installation... + * 0453 FIX: Fix ugly Python exception in host diagnosis page in case of SNMP error... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/snmp.py b/modules/snmp.py index 1df83b1..17b2e91 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -407,7 +407,7 @@ def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False): if opt_debug: sys.stderr.write(' Running %s\n' % (command,)) - snmp_process = subprocess.Popen(command, shell = True, stdout = subprocess.PIPE) + snmp_process = subprocess.Popen(command, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE) # Ugly(1): in some cases snmpwalk inserts line feed within one # dataset. This happens for example on hexdump outputs longer @@ -441,9 +441,10 @@ def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False): except StopIteration: pass + error = snmp_process.stderr.read() exitstatus = snmp_process.wait() if exitstatus: if opt_verbose: - sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error\n") - raise MKSNMPError("SNMP Error on %s (Exit-Code: %d)" % (ip, exitstatus)) + sys.stderr.write(tty_red + tty_bold + "ERROR: " + tty_normal + "SNMP error: %s\n" % error.strip()) + raise MKSNMPError("SNMP Error on %s: %s (Exit-Code: %d)" % (ip, error.strip(), exitstatus)) return rowinfo

10 years, 5 months

Check_MK Git: check_mk: fixed comments...

by Andreas Boesl

Module: check_mk Branch: master Commit: e5c9dbf3f0e8a8b53769c60db0eff2a454e73cbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c9dbf3f0e8a8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 21 17:57:31 2014 +0100 fixed comments... --- modules/check_mk_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 72f7160..c4c50a5 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1298,7 +1298,7 @@ def submit_to_core(host, service, state, output): # Send to Nagios/Icinga command pipe elif check_submission == "pipe": -# output = output.replace("\n", "\\n") + output = output.replace("\n", "\\n") open_command_pipe() if nagios_command_pipe: nagios_command_pipe.write("[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n" % @@ -1309,7 +1309,7 @@ def submit_to_core(host, service, state, output): # Create check result files for Nagios/Icinga elif check_submission == "file": -# output = output.replace("\n", "\\n") + output = output.replace("\n", "\\n") open_checkresult_file() if checkresult_file_fd: now = time.time()

10 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2014