Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages

by Lars Michelsen

Module: check_mk Branch: master Commit: c586a74b5797647b4e138f2fb738d4c09b595ac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c586a74b579764… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 3 14:28:28 2015 +0200 #2395 FIX Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages When you install the default Check_MK Agent RPM package it will trigger the removal of the previously installed check-mk-agent, check_mk-agent and check_mk-agent-logwatch RPM packages. Please note that this agent does not ship the mk_logwatch plugin, so you will need to install the mk_logwatch plugin in your own. If you want to have the Check_MK Agent RPM package contain the plugins you need and are a happy user with access to the Check_MK Enterprise Edition, you can use the Agent Bakery to create your custom packed RPM packages. --- .werks/2395 | 16 ++++++++++++++++ ChangeLog | 1 + agents/check-mk-agent.spec | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2395 b/.werks/2395 new file mode 100644 index 0000000..b1a188e --- /dev/null +++ b/.werks/2395 @@ -0,0 +1,16 @@ +Title: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1435925490 +Class: fix + +When you install the default Check_MK Agent RPM package it will trigger the removal of +the previously installed check-mk-agent, check_mk-agent and check_mk-agent-logwatch +RPM packages. Please note that this agent does not ship the mk_logwatch plugin, so +you will need to install the mk_logwatch plugin in your own. + +If you want to have the Check_MK Agent RPM package contain the plugins you need and +are a happy user with access to the Check_MK Enterprise Edition, you can use the +Agent Bakery to create your custom packed RPM packages. diff --git a/ChangeLog b/ChangeLog index a6f1929..d800a3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives + * 2395 FIX: Fix conflict with legacy check_mk-agent-logwatch package in default RPM packages... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 7b950b3..5403524 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -34,7 +34,7 @@ BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off BuildArch: noarch -Obsoletes: check_mk-agent +Obsoletes: check_mk-agent check_mk-agent-logwatch %description The Check_MK Agent uses xinetd to provide information about the system

9 years, 2 months

Check_MK Git: check_mk: updated #2398: improved fallback when ssl is not working

by Andreas Boesl

Module: check_mk Branch: master Commit: a499ce9cfd89b75cdff67e3163a8a951bbf5c41c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a499ce9cfd89b7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 3 13:22:19 2015 +0200 updated #2398: improved fallback when ssl is not working --- agents/special/agent_vsphere | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index c06721d..803a5a8 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -660,9 +660,12 @@ def encode_url(text): try: netloc = host_address + ":" + str(opt_port) - if opt_no_cert and hasattr(ssl, '_create_unverified_context'): - import ssl - server_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) + if opt_no_cert: + try: + import ssl + server_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) + except: + server_handle = httplib.HTTPSConnection(netloc) else: server_handle = httplib.HTTPSConnection(netloc)

9 years, 2 months

Check_MK Git: check_mk: updated #2398: sanity check:

by Andreas Boesl

_create_unverified_context is not always available Message-ID: <55966f11.g4SzQ+CRgSdd5znz%ab(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: b7e0692fca5b61d3c01ab9fdaff0859668914c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7e0692fca5b61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 3 13:15:46 2015 +0200 updated #2398: sanity check: _create_unverified_context is not always available --- agents/special/agent_vsphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 608d383..c06721d 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -660,7 +660,7 @@ def encode_url(text): try: netloc = host_address + ":" + str(opt_port) - if opt_no_cert: + if opt_no_cert and hasattr(ssl, '_create_unverified_context'): import ssl server_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) else:

9 years, 2 months

Check_MK Git: check_mk: #2398 agent_vsphere: now able to opt-out of servers ssl certifcate check

by Andreas Boesl

Module: check_mk Branch: master Commit: 829bae733f6fe3dd65fa3398c4a623c8c9845d15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=829bae733f6fe3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 3 12:55:34 2015 +0200 #2398 agent_vsphere: now able to opt-out of servers ssl certifcate check Starting with python 2.7.9 the ssl certificate of the target server is always validiated. This caused problems when the certfile was not correctly registered on the monitoring server. You can now choose in the datasource program, to disable the certificate check. If this check should be done, you can configure if the hostname or a better suited hostname should be used for this validiation. --- .werks/2398 | 15 +++++++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 15 ++++++++++++--- checks/agent_vsphere | 11 ++++++++++- web/plugins/wato/datasource_programs.py | 15 ++++++++++++++- 5 files changed, 52 insertions(+), 5 deletions(-) diff --git a/.werks/2398 b/.werks/2398 new file mode 100644 index 0000000..afb14f4 --- /dev/null +++ b/.werks/2398 @@ -0,0 +1,15 @@ +Title: agent_vsphere: now able to opt-out of servers ssl certifcate check +Level: 2 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435920578 + +Starting with python 2.7.9 the ssl certificate of the target server is always validiated. +This caused problems when the certfile was not correctly registered on the monitoring server. + +You can now choose in the datasource program, to disable the certificate check. +If this check should be done, you can configure if the hostname or a better suited hostname +should be used for this validiation. diff --git a/ChangeLog b/ChangeLog index a6f1929..714396b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM * 2317 agent_ruckus_spot: new special agent for querying access point statistics via web interface... * 2371 appdynamics_memory, appdynamics_sessions, appdynamics_web_container: New checks for AppDynamic... + * 2398 agent_vsphere: now able to opt-out of servers ssl certifcate check... * 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/special/agent_vsphere b/agents/special/agent_vsphere index 582012e..608d383 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -388,6 +388,7 @@ OPTIONS: by the Site Recovery Manager (SRM) and are identified by not having any assigned virtual disks. -p, --port port Alternative port number (default is 443 for the https connection) + --no-cert-check Disables the checking of the servers ssl certificate --pysphere Fallback to old pysphere based special agent. It supports ESX 4.1 but is very slow. -H, --hostname Specify a hostname. This is neccessary if this is @@ -429,7 +430,7 @@ OPTIONS: short_options = 'hi:u:s:Dat:H:Pp:S:' long_options = [ - 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', + 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'no-cert-check', 'hostname=', 'tracefile=', "pysphere", "port=", "spaces=", "host_pwr_display=", "vm_pwr_display=" ] @@ -446,6 +447,7 @@ opt_host_pwr_display = None opt_vm_pwr_display = None opt_tracefile = None opt_spaces = "underscore" +opt_no_cert = False error = None error_exit = 1 @@ -475,6 +477,8 @@ for o,a in opts: opt_skip_placeholder_vm = True elif o in [ '-p', '--port' ]: opt_port = a + elif o in [ '--no-cert-check' ]: + opt_no_cert = True elif o == '--pysphere': opt_pysphere = True elif o in [ '-u', '--user' ]: @@ -655,7 +659,12 @@ def encode_url(text): # Initialize server connection try: netloc = host_address + ":" + str(opt_port) - server_handle = httplib.HTTPSConnection(netloc) + + if opt_no_cert: + import ssl + server_handle = httplib.HTTPSConnection(netloc, context = ssl._create_unverified_context()) + else: + server_handle = httplib.HTTPSConnection(netloc) if opt_debug: sys.stderr.write("Connecting to %s..." % netloc) @@ -932,7 +941,7 @@ if not error: print "<<<esx_vsphere_sensors:sep(59)>>>" for key in sorted(hostsystems_sensors[hostname].keys()): data = hostsystems_sensors[hostname][key] - if data["key"] in ["green", "unknown"]: + if data["key"] in ["green", "unknown", "Green"]: continue print '%s;%s;%s;%s;%s;%s;%s;%s;%s' % ( data["name"].replace(";", "_"), diff --git a/checks/agent_vsphere b/checks/agent_vsphere index e0ce618..757cc20 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -65,7 +65,16 @@ def agent_vsphere_arguments(params, hostname, ipaddress): if params.get("host_pwr_display"): args += ' --host_pwr_display %s' % params.get("host_pwr_display") - args += " " + quote_shell_string(ipaddress) + if "ssl" in params: + if params["ssl"] == False: + args += ' --no-cert-check ' + quote_shell_string(ipaddress) + elif params["ssl"] == True: + args += " " + quote_shell_string(hostname) + else: + args += " " + quote_shell_string(params["ssl"]) + else: # legacy mode + args += " " + quote_shell_string(ipaddress) + return args special_agent_info['vsphere'] = agent_vsphere_arguments diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 691c30c..3df0584 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -70,6 +70,19 @@ register_rule(group, maxvalue = 65535, ) ), + ( "ssl", + Alternative( + title = _("SSL certificate checking"), + elements = [ + FixedValue( False, title = _("Deactivated"), totext=""), + FixedValue( True, title = _("Use hostname"), totext=""), + TextAscii( title = _("Use other hostname"), + help = _("The IP of the other hostname needs to be the same IP as the host address") + ) + ], + default_value = False + ) + ), ( "timeout", Integer( title = _("Connect Timeout"), @@ -171,7 +184,7 @@ register_rule(group, help = _("This rule selects the vSphere agent instead of the normal Check_MK Agent " "and allows monitoring of VMWare ESX via the vSphere API. You can configure " "your connection settings here."), - forth = lambda a: dict([("skip_placeholder_vms", True), ("use_pysphere" , False), ("spaces", "underscore")] + a.items()) + forth = lambda a: dict([("skip_placeholder_vms", True), ("ssl", False), ("use_pysphere" , False), ("spaces", "underscore")] + a.items()) ), factory_default = FACTORY_DEFAULT_UNUSED, # No default, do not use setting if no rule matches match = 'first')

9 years, 2 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 943426eda9405bff298e47681f6f47bf70ad72f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=943426eda9405b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 3 12:49:17 2015 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 38ac9c5..167459e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2398 +2448

9 years, 2 months

Check_MK Git: check_mk: Fix bug in man page of nestat

by Mathias Kettner

Module: check_mk Branch: master Commit: 141071d3af66dbf73327ba058e574262ad3bdd00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=141071d3af66db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 3 09:55:27 2015 +0200 Fix bug in man page of nestat --- checkman/netstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/netstat b/checkman/netstat index 4f0714a..b53bb00 100644 --- a/checkman/netstat +++ b/checkman/netstat @@ -73,5 +73,5 @@ parameters (dict): A dictionary with the following keys, all of which are {"min_states"} Tuple(warn, crit) The minimum allowed entries of the required state - {"min_states"} Tuple(warn, crit) The maximum allowed entries of the required state + {"max_states"} Tuple(warn, crit) The maximum allowed entries of the required state

9 years, 2 months

Check_MK Git: check_mk: Updated #2317: ruckus_spot_ap now works with items

by Andreas Boesl

Module: check_mk Branch: master Commit: 78013be3cefcbde8d36107de61e9ea1967673891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78013be3cefcbd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 3 09:23:26 2015 +0200 Updated #2317: ruckus_spot_ap now works with items --- checks/ruckus_spot_ap | 67 ++++++++++++++++++++-------------- web/plugins/metrics/check_mk.py | 65 ++++++++++++++------------------- web/plugins/wato/check_parameters.py | 37 ++++--------------- 3 files changed, 76 insertions(+), 93 deletions(-) diff --git a/checks/ruckus_spot_ap b/checks/ruckus_spot_ap index 5fda396..468bb0e 100644 --- a/checks/ruckus_spot_ap +++ b/checks/ruckus_spot_ap @@ -34,11 +34,14 @@ # 1-16 1 # 1-9 1 -def inventory_ruckus_spot_ap(info): - # 4 tuples of warn, crit - yield None, ((None,None),) * 4 -def check_ruckus_spot_ap(_no_item, params, info): +ruckus_spot_ap_bands = { + "1": "2.4 GHz", + "2": "5 GHz", +} +ruckus_spot_ap_default_levels = ((None, None), (None, None)) + +def parse_ruckus_spot_ap(info): bands = {} current_band = None for line in info: @@ -47,38 +50,48 @@ def check_ruckus_spot_ap(_no_item, params, info): bands.setdefault(current_band, []) else: bands[current_band].append(line) + return bands + +def inventory_ruckus_spot_ap(parsed): + for band in parsed.keys(): + if band in ruckus_spot_ap_bands: + yield ruckus_spot_ap_bands[band], "ruckus_spot_ap_default_levels" + +def check_ruckus_spot_ap(item, params, parsed): + inverse_map = dict((v, k) for k, v in ruckus_spot_ap_bands.items()) + band = parsed.get(inverse_map.get(item)) + if not band: + return - for band, band_id, name, params_offset in [ ("2_4ghz", "1", "2.4 GHz", 0), ("5ghz", "2", "5 GHz", 2) ]: - (drift_warn, drift_crit), (down_warn, down_crit) = params[params_offset+0:params_offset+2] - if band_id in bands: - state = 0 - info = 0 - num_devices = len(bands[band_id]) - perfdata = [("ap_devices_total_%s" % band, num_devices)] + (drift_warn, drift_crit), (down_warn, down_crit) = params + state = 0 + info = 0 + perfdata = [("ap_devices_total", len(band))] - extra_info = [] - for what, ap_state, warn, crit in [ ("drifted", "2", drift_warn, drift_crit), - ("not responding", "0", down_warn, down_crit) ]: - problems = len([x for x in bands[band_id] if x[1] == ap_state]) + extra_info = [] + for what, ap_state, warn, crit in [ ("drifted", "2", drift_warn, drift_crit), + ("not responding", "0", down_warn, down_crit) ]: + problems = len([x for x in band if x[1] == ap_state]) + if crit and problems >= crit: + state = 2 + elif warn and problems >= warn: + state = 1 - if crit and problems >= crit: - state = 2 - elif warn and problems >= warn: - state = 1 + if problems: + extra_info.append("%d %s%s" % (problems, what, state_markers[state])) + perfdata.append(("ap_devices_%s" % what.replace(" ", "_"), problems, warn, crit)) - if problems: - extra_info.append("%d %s" % (problems, what)) - perfdata.append(("ap_devices_%s_%s" % (what.replace(" ", "_"), band), problems)) - info = "%s: %d devices" % (name, num_devices) - if extra_info: - info += " (%s)" % " / ".join(extra_info) + info = "%d devices" % len(band) + if extra_info: + info += " (%s)" % " / ".join(extra_info) - yield state, info, perfdata + yield state, info, perfdata check_info["ruckus_spot_ap"] = { + "parse_function" : parse_ruckus_spot_ap, "inventory_function" : inventory_ruckus_spot_ap, "check_function" : check_ruckus_spot_ap, - "service_description" : "Ruckus Spot Access Points", + "service_description" : "Ruckus Spot Access Points %s", "group" : "ruckus_ap", "has_perfdata" : True } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d33ee01..4967766 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2334,24 +2334,23 @@ metric_info["harddrive_udma_crc_errors"] = { "color" : "46/a", } -for what, perfname, shading in [ ("2.4", "2_4", "a"), ("5", "5", "b") ]: - metric_info["ap_devices_total_%sghz" % perfname] = { - "title" : _("Total %s GHz devices") % what, - "unit" : "count", - "color" : "51/%s" % shading, - } +metric_info["ap_devices_total"] = { + "title" : _("Total devices"), + "unit" : "count", + "color" : "51/a" +} - metric_info["ap_devices_drifted_%sghz" % perfname] = { - "title" : _("Time drifted %s GHz devices") % what, - "unit" : "count", - "color" : "23/%s" % shading, - } +metric_info["ap_devices_drifted"] = { + "title" : _("Time drifted devices"), + "unit" : "count", + "color" : "23/a" +} - metric_info["ap_devices_not_responding_%sghz" % perfname] = { - "title" : _("Not responding %s GHz devices") % what, - "unit" : "count", - "color" : "14/%s" % shading, - } +metric_info["ap_devices_not_responding"] = { + "title" : _("Not responding devices"), + "unit" : "count", + "color" : "14/a" +} metric_info["request_rate"] = { "title" : _("Request rate"), @@ -3164,18 +3163,11 @@ check_metrics["check_mk-ps.perf"] = ps_translation # The label of dual and stacked is taken from the definition of the contained Perf-O-Meters -perfometer_info.append(("stacked", [ - { - "type" : "linear", - "segments" : [ "ap_devices_drifted_2_4ghz", "ap_devices_not_responding_2_4ghz" ], - "total" : "ap_devices_total_2_4ghz", - }, - { - "type" : "linear", - "segments" : [ "ap_devices_drifted_5ghz", "ap_devices_not_responding_5ghz" ], - "total" : "ap_devices_total_5ghz", - }]) -) +perfometer_info.append({ + "type" : "linear", + "segments" : [ "ap_devices_drifted", "ap_devices_not_responding" ], + "total" : "ap_devices_total", +}) perfometer_info.append({ "type" : "linear", @@ -5147,13 +5139,12 @@ graph_info.append({ ], }) -for what, perfname in [ ("2.4", "2_4"), ("5", "5") ]: - graph_info.append({ - "title" : _("%s GHz band" % what), - "metrics" : [ - ( "ap_devices_total_%sghz" % perfname, "area" ), - ( "ap_devices_drifted_%sghz" % perfname, "area" ), - ( "ap_devices_not_responding_%sghz" % perfname, "stack" ), - ] - }) +graph_info.append({ + "title" : _("Access point statistics"), + "metrics" : [ + ( "ap_devices_total", "area"), + ( "ap_devices_drifted", "area"), + ( "ap_devices_not_responding", "stack"), + ] +}) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9f345e7..0f801c2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -471,8 +471,8 @@ register_check_parameters( ], ), sameline = True, - label = _("Levels 2.4 GHz band time drifted"), - none_label = _("Time drifted levels for 2.4 GHz band not set"), + label = _("Levels device time drifted"), + none_label = _("Time drifted levels not set"), none_value = (None, None) ), Optional( @@ -483,37 +483,16 @@ register_check_parameters( ], ), sameline = True, - label = _("Levels 2.4 GHz band not responding"), - none_label = _("Not responding levels for 2.4 GHz band not set"), - none_value = (None, None) - ), - Optional( - Tuple( - elements = [ - Integer(title = _("Warning at"), default_value = 1, unit = _("devices")), - Integer(title = _("Critical at"), default_value = 1, unit = _("devices")), - ], - ), - sameline = True, - label = _("Levels 5 GHz band time drifted"), - none_label = _("Time drifted levels for 5 GHz not set"), - none_value = (None, None) - ), - Optional( - Tuple( - elements = [ - Integer(title = _("Warning at"), default_value = 1, unit = _("devices")), - Integer(title = _("Critical at"), default_value = 1, unit = _("devices")), - ], - ), - sameline = True, - label = _("Levels 5 GHz band not responding"), - none_label = _("Not responding levels for 5 GHz band not set"), + label = _("Levels device not responding"), + none_label = _("Not responding levels not set"), none_value = (None, None) ), ], ), - None, + TextAscii( + title = _("Band"), + help = _("Name of the band, e.g. 5 GHz"), + ), "first" )

9 years, 2 months

Check_MK Git: check_mk: Fixed building of MSI files on newer distros ( e.g. Ubuntu 15.04)

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f263b4f046030cf970574c0bfaffd0240df0064 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f263b4f046030… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 14:15:59 2015 +0200 Fixed building of MSI files on newer distros (e.g. Ubuntu 15.04) --- agents/windows/msibuild/.gitignore | 2 +- agents/windows/msibuild/Makefile | 4 ++-- agents/windows/msibuild/msibuild | 2 +- agents/windows/msibuild/msiinfo | 2 +- agents/windows/msibuild/msitools-0.93.tar.xz | Bin 613856 -> 0 bytes agents/windows/msibuild/msitools-0.94.tar.xz | Bin 0 -> 687288 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/windows/msibuild/.gitignore b/agents/windows/msibuild/.gitignore index b7bf4d1..f6418e0 100644 --- a/agents/windows/msibuild/.gitignore +++ b/agents/windows/msibuild/.gitignore @@ -1,2 +1,2 @@ -msitools-0.93 +msitools-0.94 check_mk_agent.msi diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index b451f5c..306be45 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -22,7 +22,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -MSITOOLS = msitools-0.93 +MSITOOLS = msitools-0.94 MSITOOLS_FILE = $(MSITOOLS).tar.xz BUILD_VERSION = 1 @@ -40,7 +40,7 @@ msibuild: tar -Jxf $(MSITOOLS_FILE) set -e ; for p in patches/*.dif ; do \ echo "applying $$p..." ; \ - patch -p0 -b < $$p ; \ + (cd $(MSITOOLS) ; patch -p1 -b < ../$$p) ; \ done cd $(MSITOOLS) && ./configure make -C $(MSITOOLS)/libmsi diff --git a/agents/windows/msibuild/msibuild b/agents/windows/msibuild/msibuild index ed1084e..b2bf096 120000 --- a/agents/windows/msibuild/msibuild +++ b/agents/windows/msibuild/msibuild @@ -1 +1 @@ -msitools-0.93/msibuild \ No newline at end of file +msitools-0.94/msibuild \ No newline at end of file diff --git a/agents/windows/msibuild/msiinfo b/agents/windows/msibuild/msiinfo index 79d1e8c..f9c3830 120000 --- a/agents/windows/msibuild/msiinfo +++ b/agents/windows/msibuild/msiinfo @@ -1 +1 @@ -msitools-0.93/msiinfo \ No newline at end of file +msitools-0.94/msiinfo \ No newline at end of file diff --git a/agents/windows/msibuild/msitools-0.93.tar.xz b/agents/windows/msibuild/msitools-0.93.tar.xz deleted file mode 100644 index 3107eaf..0000000 Binary files a/agents/windows/msibuild/msitools-0.93.tar.xz and /dev/null differ diff --git a/agents/windows/msibuild/msitools-0.94.tar.xz b/agents/windows/msibuild/msitools-0.94.tar.xz new file mode 100644 index 0000000..87f2f1c Binary files /dev/null and b/agents/windows/msibuild/msitools-0.94.tar.xz differ

9 years, 2 months

Check_MK Git: check_mk: LDAP users: Fixed exceptions during login

by Lars Michelsen

Module: check_mk Branch: master Commit: fe2f02b9d1d80bd9b0f5b64ef8374e74ed415bf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe2f02b9d1d80b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 13:19:30 2015 +0200 LDAP users: Fixed exceptions during login --- web/plugins/userdb/ldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index f708028..97e3249 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -772,12 +772,12 @@ class LDAPUserConnector(UserConnector): # Try to bind with the user provided credentials. This unbinds the default # authentication which should be rebound again after trying this. try: - ldap_bind(user_dn, password) + self.bind(user_dn, password) result = username.encode('utf-8') except: result = False - ldap_default_bind(self._ldap_obj) + self.default_bind(self._ldap_obj) return result

9 years, 2 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 1878fd03212ce4956d59f9f3f3d19e1db558dc45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1878fd03212ce4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 2 12:27:19 2015 +0200 Testcommit --- agents/windows/check_mk_agent.exe | Bin 0 -> 183808 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe new file mode 100755 index 0000000..eedb2d9 Binary files /dev/null and b/agents/windows/check_mk_agent.exe differ

9 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015