Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: Updated bug entries #0851

by Bastian Kuhn

Module: check_mk Branch: master Commit: 91bcd4a8cc69bdcb7ddade66b27bbfdc60a4530d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91bcd4a8cc69bd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 15:32:53 2015 +0200 Updated bug entries #0851 --- .bugs/851 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/851 b/.bugs/851 new file mode 100644 index 0000000..1c848cc --- /dev/null +++ b/.bugs/851 @@ -0,0 +1,8 @@ +Title: Using a Macbook it takes somites 3 instead of 2 fingers to scroll the sidebar +Component: multisite +State: open +Date: 2015-08-10 15:31:35 +Targetversion: 1.2.7 +Class: nastiness + +Bug found by MPI

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0850

by Bastian Kuhn

Module: check_mk Branch: master Commit: ec1ba0e0df3b2fd9e47f3c1d7f089761c4cda21f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec1ba0e0df3b2f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 15:31:02 2015 +0200 Updated bug entries #0850 --- .bugs/850 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/850 b/.bugs/850 new file mode 100644 index 0000000..381d7c3 --- /dev/null +++ b/.bugs/850 @@ -0,0 +1,8 @@ +Title: [AWato Hosts: Position of Icons for Bulk operations +Component: wato +State: open +Date: 2015-08-10 15:28:19 +Targetversion: 1.2.7 +Class: nastiness + +Depending on the number of hosts in a folder, the buttons for Delete/ Edit/ Cleanup etc. are on the upper or the lower of the table. This is perplexing and not realy reasonable.

8 years, 10 months

Check_MK Git: check_mk: #1279 check_curl (treasures): Added NTLM support

by Bastian Kuhn

Module: check_mk Branch: master Commit: a8a1a21d3d3322e768d70923ea1d06ed37f1b819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8a1a21d3d3322… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 15:13:02 2015 +0200 #1279 check_curl (treasures): Added NTLM support --- .werks/1279 | 9 +++++++++ ChangeLog | 1 + doc/treasures/check_curl | 15 +++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/1279 b/.werks/1279 new file mode 100644 index 0000000..96daed3 --- /dev/null +++ b/.werks/1279 @@ -0,0 +1,9 @@ +Title: check_curl (treasures): Added NTLM support +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439212036 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 747bcd9..a53f217 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 2523 ipmi: new wato rule to set ignored sensors and activate/deactivate summarizing * 1277 check_ldap: It is now possible to specify a alternative Hostname... * 1278 mssql_blocked_sessions: New Check to show blocked MSSQL Sessions + * 1279 check_curl (treasures): Added NTLM support * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/doc/treasures/check_curl b/doc/treasures/check_curl index d0b5125..bdf6946 100755 --- a/doc/treasures/check_curl +++ b/doc/treasures/check_curl @@ -113,12 +113,20 @@ else PROXYOPTIONS= fi +if [ "$1" = -NTLM ] +then + NTLM=" --ntlm --negotiate -u $2 " + shift + shift +else + NTLM= +fi URL=$1 PURL=$(echo $URL | awk -F "/" '{print $1"//"$3}') if [ -z "$URL" ] then - echo "Usage: [-P PROXYUSER:PROXYPASS PROXYURL] URL [SEARCHTEXT]" + echo "Usage: [-P PROXYUSER:PROXYPASS PROXYURL] [-NTLM NTLM_USER:NTLM_PASSWORD] URL [SEARCHTEXT]" exit 3 fi @@ -127,11 +135,10 @@ CONTENT=$2 # CURL="curl -A """Mozilla/4.0 (compatible; MSIE 6.0;)""" --silent --fail --insecure $PROXYOPTIONS $URL" # CURL="curl -A Mozilla/4.0 (compatible; MSIE 6.0;) --silent --fail --insecure $PROXYOPTIONS $URL" # CURL="curl --silent --fail --insecure $PROXYOPTIONS $URL" - if [ "$CONTENT" ] then # if $CURL 2>&1 | fgrep -q "$CONTENT" - if curl -A "Mozilla/4.0 (compatible; MSIE 6.0;)" --silent --fail --insecure $PROXYOPTIONS $URL 2>&1 | fgrep -q "$CONTENT" + if curl $NTLM -A "Mozilla/4.0 (compatible; MSIE 6.0;)" --silent --fail --insecure $PROXYOPTIONS $URL 2>&1 | fgrep -q "$CONTENT" then echo "OK - $PURL found '$CONTENT' in answer" exit 0 @@ -149,7 +156,7 @@ then fi else # OUTPUT=$($CURL >/dev/null 2>&1 | head -n 1 ; exit ${PIPESTATUS[0]}) - OUTPUT=$(curl -A "Mozilla/4.0 (compatible; MSIE 6.0;)" --silent --fail --insecure $PROXYOPTIONS $URL >/dev/null 2>&1 | head -n 1 ; exit ${PIPESTATUS[0]}) + OUTPUT=$(curl $NTLM -A "Mozilla/4.0 (compatible; MSIE 6.0;)" --silent --fail --insecure $PROXYOPTIONS $URL >/dev/null 2>&1 | head -n 1 ; exit ${PIPESTATUS[0]}) exitcode=$? if [ "$exitcode" = 0 ] then

8 years, 10 months

Check_MK Git: check_mk: #2455 FIX raritan_pdu_inlet: Fixed scaling

by Konstantin Büttner

Module: check_mk Branch: master Commit: 354f7db6610b0e1736db428e0cab9babdb70fb1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=354f7db6610b0e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 10 15:01:06 2015 +0200 #2455 FIX raritan_pdu_inlet: Fixed scaling Previously, the check did not take certain OIDs defining the scaling into account. This has been fixed. --- .werks/2455 | 11 +++++++++++ ChangeLog | 1 + checks/raritan_pdu_inlet | 16 ++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.werks/2455 b/.werks/2455 new file mode 100644 index 0000000..75c0674 --- /dev/null +++ b/.werks/2455 @@ -0,0 +1,11 @@ +Title: raritan_pdu_inlet: Fixed scaling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1439211601 + +Previously, the check did not take certain OIDs defining the scaling into account. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 747bcd9..19ea05a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * 2503 FIX: diskstat: Only excluding multipath members when infos for multipath devices are available... * 2504 FIX: cups_queues: Fixed wrong queue discovery on hosts running apcupsd * 2506 FIX: Diskstat summary: Ignoring stats from LVM devices + * 2455 FIX: raritan_pdu_inlet: Fixed scaling... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index a68f684..baefdb5 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -25,15 +25,16 @@ # Boston, MA 02110-1301 USA. def parse_raritan_pdu_inlet(info): + precisions = dict([(oid_end, int(decimals)) for oid_end, decimals in info[0]]) parsed = {} - for oid_end, availability, sensor_state, value in info: + for oid_end, availability, sensor_state, value in info[1]: if availability == '1': phase_id, sensor_type = oid_end.split('.')[2:4] phase = "Phase " + phase_id if int(sensor_type) in raritan_pdu_sensor_types: parsed.setdefault(phase, {}) key = raritan_pdu_sensor_types[int(sensor_type)] # get key for elphase.include - value = float(value) + value = float(value) / 10 ** precisions[oid_end] if sensor_state in [ '2', '6' ]: state = 2 elif sensor_state != '4': @@ -56,13 +57,16 @@ check_info['raritan_pdu_inlet'] = { "service_description" : "Input %s", "has_perfdata" : True, "group" : "el_inphase", - "snmp_info" : ( #".1.3.6.1.4.1.13742.6.5.2.4.1.4.1.1", - ".1.3.6.1.4.1.13742.6.5.2.4.1", - [ OID_END, + "snmp_info" : [ (".1.3.6.1.4.1.13742.6.3.3.6.1", + [ OID_END, + "7", # inletPoleSensorDecimalDigits + ]), + (".1.3.6.1.4.1.13742.6.5.2.4.1", + [ OID_END, 2, # availability 3, # state 4, # value - ]), + ])], "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13742.6", "includes" : [ 'raritan_pdu_inlet.include', 'elphase.include' ] }

8 years, 10 months

Check_MK Git: check_mk: #1278 mssql_blocked_sessions: New Check to show blocked MSSQL Sessions

by Bastian Kuhn

Module: check_mk Branch: master Commit: fbad9166363bde1a10dea0167f148786333e502c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbad9166363bde… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 14:43:48 2015 +0200 #1278 mssql_blocked_sessions: New Check to show blocked MSSQL Sessions --- .werks/1278 | 9 +++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 16 ++++++++++++ checkman/mssql_blocked_sessions | 15 ++++++++++++ checks/mssql_blocked_sessions | 50 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+) diff --git a/.werks/1278 b/.werks/1278 new file mode 100644 index 0000000..b3b75f2 --- /dev/null +++ b/.werks/1278 @@ -0,0 +1,9 @@ +Title: mssql_blocked_sessions: New Check to show blocked MSSQL Sessions +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439210600 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3d650d9..747bcd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 2417 winperf_phydisk: can now work in a cluster environment * 2523 ipmi: new wato rule to set ignored sensors and activate/deactivate summarizing * 1277 check_ldap: It is now possible to specify a alternative Hostname... + * 1278 mssql_blocked_sessions: New Check to show blocked MSSQL Sessions * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 69ff3d3..95d68bb 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -202,6 +202,21 @@ For Each instId In instIds.Keys Loop RS.Close + RS.Open "SELECT session_id, wait_duration_ms, wait_type, blocking_session_id " & _ + "FROM sys.dm_os_waiting_tasks " & _ + "WHERE blocking_session_id <> 0 ", CONN + addOutput( "<<<mssql_blocked_sessions>>>" ) + Dim session_id, wait_duration_ms, wait_type, blocking_session_id + Do While NOT RS.Eof + session_id = Trim(RS("session_id")) + wait_duration_ms = Trim(RS("wait_duration_ms")) + wait_type = Trim(RS("wait_type")) + blocking_session_id = Trim(RS("blocking_session_id")) + addOutput( session_id & " " & wait_duration_ms & " " & wait_type & " " & blocking_session_id ) + RS.MoveNext + Loop + RS.Close + ' First only read all databases in this instance and save it to the db names dict RS.Open "EXEC sp_databases", CONN Dim x, dbName, dbNames @@ -257,6 +272,7 @@ For Each instId In instIds.Keys ' which have at least one backup Dim lastBackupDate addOutput( "<<<mssql_backup>>>" ) + addOutput( "Blocked _Sessions" ) For Each dbName in dbNames.Keys RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date " & _ "FROM msdb.dbo.backupset " & _ diff --git a/checkman/mssql_blocked_sessions b/checkman/mssql_blocked_sessions new file mode 100644 index 0000000..5617a78 --- /dev/null +++ b/checkman/mssql_blocked_sessions @@ -0,0 +1,15 @@ +title: MSSQL Blocked Sessions +agents: windows +catalog: app/mssql +license: GPL +distribution: check_mk +description: + This Checks lists all bolcked sessions on a MSSQL Server. As long at least one session is blocked, + it will be {CRITICAL}. + + This check needs the Check_MK mssql.vbs -plugin installed in + the agent. Please refer to the online documentation + for how to install that plugin. + +inventory: + One Check per Host will be created diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions new file mode 100644 index 0000000..033e3e9 --- /dev/null +++ b/checks/mssql_blocked_sessions @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +# +# session_id, wait_duration_ms, wait_type, blocking_session_id +# <<<mssql_blocked_sessions>>> +# Blocked _Sessions +# 119 232292187 LCK_M_U 75 +# 76 221526672 LCK_M_U 115 + + +def inventory_mssql_blocked_sessions(info): + return [(None, None)] + +def check_mssql_blocked_sessions(item, params, info): + if len(info) > 1: + for session_id, wait_duration_ms, wait_type, blocking_session_id in info[1:]: + yield 2, "Session %s blocked by %s (Wait %s ms, Type: %s)" % \ + ( session_id, blocking_session_id, wait_duration_ms, wait_type ) + else: + yield 0, "No blocked sessions" + + +check_info['mssql_blocked_sessions'] = { + 'check_function' : check_mssql_blocked_sessions, + 'inventory_function' : inventory_mssql_blocked_sessions, + 'service_description' : "MSSQL Blocked Sessions", +}

8 years, 10 months

Check_MK Git: check_mk: #2506 FIX Diskstat summary: Ignoring stats from LVM devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d93ba60c512e8ce293661b370ffbfde35d9ea9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d93ba60c512e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 10 13:17:16 2015 +0200 #2506 FIX Diskstat summary: Ignoring stats from LVM devices --- .werks/2506 | 9 +++++++++ ChangeLog | 1 + checks/diskstat.include | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/2506 b/.werks/2506 new file mode 100644 index 0000000..062482d --- /dev/null +++ b/.werks/2506 @@ -0,0 +1,9 @@ +Title: Diskstat summary: Ignoring stats from LVM devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439205423 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5d8811f..3d650d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 2418 FIX: agent_vsphere.pysphere: legacy agent no longer aborts when evaluating unknown ssl option... * 2503 FIX: diskstat: Only excluding multipath members when infos for multipath devices are available... * 2504 FIX: cups_queues: Fixed wrong queue discovery on hosts running apcupsd + * 2506 FIX: Diskstat summary: Ignoring stats from LVM devices Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/diskstat.include b/checks/diskstat.include index 599a640..4837d6c 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -315,6 +315,10 @@ def diskstat_select_disk(disks, item): for key in disk.keys(): if key != "node": summarized.setdefault(key, 0.0) + + if device.startswith("LVM "): + continue # skip LVM devices for summary + if True or disk["read_throughput"] + disk["write_throughput"] > 0: # skip idle disks num_averaged += 1 for key, value in disk.items():

8 years, 10 months

Check_MK Git: check_mk: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4b0c014178ed7d249023681afe77b1b5c02bab16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b0c014178ed7d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 10 11:55:46 2015 +0200 Minor code cleanup --- agents/windows/plugins/windows_updates.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 596fce4..61fc354 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -16,7 +16,7 @@ ' ' 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. ' -----------------------------------------------------------------------------------------

8 years, 10 months

Check_MK Git: check_mk: Fixed encoding of incoming SNMP data

by Lars Michelsen

Module: check_mk Branch: master Commit: 152bf4d0112c4f49d02cc5e4f1d193a5b5513e5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=152bf4d0112c4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 10 10:49:47 2015 +0200 Fixed encoding of incoming SNMP data --- checks/if_brocade | 2 +- checks/if_lancom | 2 +- modules/snmp.py | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/checks/if_brocade b/checks/if_brocade index 7304160..56bb1c9 100644 --- a/checks/if_brocade +++ b/checks/if_brocade @@ -26,7 +26,7 @@ def fix_if_64_highspeed(info): for line in info: - if type(line[3]) == str: # not yet converted + if type(line[3]) in [ str, unicode ]: # not yet converted line[3] = saveint(line[3]) * 1000000 def if_brocade_convert(info): diff --git a/checks/if_lancom b/checks/if_lancom index c3bd4c6..67bfc88 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -26,7 +26,7 @@ def fix_if_64_highspeed(info): for line in info: - if type(line[3]) == str: # not yet converted + if type(line[3]) in [ str, unicode ]: # not yet converted line[3] = saveint(line[3]) * 1000000 def if_lancom_convert(info): diff --git a/modules/snmp.py b/modules/snmp.py index 185c65f..b0045cb 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -226,11 +226,22 @@ def get_snmp_table(hostname, ip, check_type, oid_info): # the OIDs and watch out for gaps we need to fill with dummy values. new_columns = sanitize_snmp_table_columns(columns) + # From all SNMP data sources (stored walk, classic SNMP, inline SNMP) we + # get normal python strings. But for Check_MK we need unicode strings now. + # Convert them by using the standard Check_MK approach for incoming data + new_columns = sanitize_snmp_encoding(new_columns) + info += construct_snmp_table_of_rows(new_columns) return info +def sanitize_snmp_encoding(columns): + for index, column in enumerate(columns): + columns[index] = map(decode_incoming_string, column) + return columns + + def sanitize_snmp_table_columns(columns): # First compute the complete list of end-oids appearing in the output # by looping all results and putting the endoids to a flat list

8 years, 10 months

Check_MK Git: check_mk: #1277 check_ldap: It is now possible to specify a alternative Hostname

by Bastian Kuhn

Module: check_mk Branch: master Commit: e2322350b0245792aa0d6b117c0b6a9f2ec28ebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2322350b02457… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 10:42:55 2015 +0200 #1277 check_ldap: It is now possible to specify a alternative Hostname This is usefull if u want to check LDAPS servers to prevent certificate problems. --- .werks/1277 | 10 ++++++++++ ChangeLog | 1 + checks/check_ldap | 10 ++++++++-- web/plugins/wato/active_checks.py | 9 +++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/1277 b/.werks/1277 new file mode 100644 index 0000000..4312aed --- /dev/null +++ b/.werks/1277 @@ -0,0 +1,10 @@ +Title: check_ldap: It is now possible to specify a alternative Hostname +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439196083 +Class: feature + +This is usefull if u want to check LDAPS servers to prevent certificate problems. + diff --git a/ChangeLog b/ChangeLog index 28d9282..5d8811f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 2515 juniper_trpz_aps: check is now cluster-aware... * 2417 winperf_phydisk: can now work in a cluster environment * 2523 ipmi: new wato rule to set ignored sensors and activate/deactivate summarizing + * 1277 check_ldap: It is now possible to specify a alternative Hostname... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/check_ldap b/checks/check_ldap index 1ea4e06..346a489 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -26,7 +26,13 @@ def check_ldap_arguments(params): name, basedn, settings = params - args = ' -b %s' % quote_shell_string(basedn) + + if "hostname" in settings: + args = ' -H %s' % quote_shell_string(settings["hostname"]) + else: + args = ' -H $HOSTADDRESS' + + args += ' -b %s' % quote_shell_string(basedn) if "response_time" in settings: args += ' -w %f -c %f' % ( @@ -66,7 +72,7 @@ def check_ldap_desc(params): return "LDAP %s" % params[0] active_check_info['ldap'] = { - "command_line" : '$USER1$/check_ldap -H $HOSTADDRESS$ $ARG1$', + "command_line" : '$USER1$/check_ldap $ARG1$', "argument_function" : check_ldap_arguments, "service_description" : check_ldap_desc, "has_perfdata" : True, diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 309245b..7769008 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1074,6 +1074,15 @@ register_rule(group, help = _("Use LDAPS (LDAP SSLv2 method). This sets the default port number to 636")) ), + ( "hostname", + TextAscii( + title = _("Alternative Hostname"), + help = _("Use a alternative field as Hostname in case of SSL Certificate Problems (eg. the Hostalias )"), + size = 40, + allow_empty = False, + default_value = "$HOSTALIAS$", + ) + ), ( "version", DropdownChoice( title = _("LDAP Version"),

8 years, 10 months

Check_MK Git: check_mk: synology_disks: Fixed exception after werk 2490

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c06a9340364d1ba3757c031b907a417e3e5351c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c06a9340364d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 10 09:58:27 2015 +0200 synology_disks: Fixed exception after werk 2490 --- checks/synology_disks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/synology_disks b/checks/synology_disks index 7ac46cb..f55e8c9 100644 --- a/checks/synology_disks +++ b/checks/synology_disks @@ -46,6 +46,9 @@ def check_synology_disks(item, params, info): } + if params == None: + params = {} + for disk, model, status, temperature in info: if disk == item: temp = int(temperature)

8 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015