Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: bluecat_dns_queries: Added counters

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1a8a63894eeb768971bd3c636a1da36583b5c846 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8a63894eeb76… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 16:55:06 2014 +0200 bluecat_dns_queries: Added counters --- checks/bluecat_dns_queries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/bluecat_dns_queries b/checks/bluecat_dns_queries index 7bb1d9b..5af0a7e 100644 --- a/checks/bluecat_dns_queries +++ b/checks/bluecat_dns_queries @@ -39,7 +39,7 @@ def check_bluecat_dns_queries(item, _no_params, info): for value, name in zip(map(int, info[0]), value_names): try: timedif, rate = get_counter("bluecat_dns_queries."+name, now, value) - yield 0, "%s: %s (last %.0f sec)" % (name, rate, timedif), [ ( name, value )] + yield 0, "%s: %s (last %.0f sec)" % (name, rate, timedif), [ ( name, rate )] except MKCounterWrapped: wrapped = True if wrapped:

10 years, 1 month

Check_MK Git: check_mk: Removed some trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: ad8ad299415f3e1d499078d9bcee16f355d7ca5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad8ad299415f3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 9 15:33:08 2014 +0200 Removed some trailing spaces --- checks/arris_cmts_mem | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/arris_cmts_mem b/checks/arris_cmts_mem index f203c8e..d286955 100644 --- a/checks/arris_cmts_mem +++ b/checks/arris_cmts_mem @@ -45,7 +45,7 @@ def check_arris_cmts_mem(item, params, info): if type(crit) == float: warn_abs = heap * warn / 100 crit_abs = heap * crit / 100 - perfdata = [ ( 'usage', usage, warn_abs, crit_abs, 0, heap )] + perfdata = [ ( 'usage', usage, warn_abs, crit_abs, 0, heap )] levels = " (Warn/Crit at %f/%f %%)" % ( warn, crit ) if usage_perc >= crit: yield 2, infotext+levels, perfdata @@ -54,7 +54,7 @@ def check_arris_cmts_mem(item, params, info): else: yield 0, infotext, perfdata else: - perfdata = [ ( 'usage', usage, warn, crit, 0, heap )] + perfdata = [ ( 'usage', usage, warn, crit, 0, heap )] levels = " (Warn/Crit at %s/%s)" % \ ( get_bytes_human_readable(warn), get_bytes_human_readable(crit) ) if usage >= crit:

10 years, 1 month

Check_MK Git: check_mk: #1397 juniper_screenos_cpu, juniper_screenos_fan, juniper_screenos_mem, juniper_screenos_temp, juniper_screenos_vpn: new checks for Juniper ScreenOS Firewalls

by Mathias Kettner

Module: check_mk Branch: master Commit: 88cd5002a544432bf3f85ab22fdede60a2e827e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88cd5002a54443… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 9 16:41:32 2014 +0200 #1397 juniper_screenos_cpu, juniper_screenos_fan, juniper_screenos_mem, juniper_screenos_temp, juniper_screenos_vpn: new checks for Juniper ScreenOS Firewalls --- .werks/1397 | 9 ++++ ChangeLog | 1 + checks/arris_cmts_mem | 4 +- checks/juniper_mem.include | 50 +++++++++++++++++++++++ checks/juniper_screenos_cpu | 36 ++++++++-------- checks/juniper_screenos_fan | 11 ++--- checks/juniper_screenos_mem | 32 +++------------ checks/juniper_screenos_temp | 26 ++++++++---- checks/juniper_trpz_mem | 31 +++----------- pnp-templates/check_mk-juniper_screenos_cpu.php | 18 ++++---- pnp-templates/check_mk-juniper_trpz_mem.php | 1 + web/plugins/perfometer/check_mk.py | 2 +- web/plugins/wato/check_parameters.py | 6 +-- 13 files changed, 127 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=88cd5002a5…

10 years, 1 month

Check_MK Git: check_mk: Added Perf-O-Meters for new Juniper checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c4213b1ed01e42ec5f94ee2626e6adee49709a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c4213b1ed01e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 9 15:32:58 2014 +0200 Added Perf-O-Meters for new Juniper checks --- web/plugins/perfometer/check_mk.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 327457d..1f6ee37 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -345,6 +345,7 @@ perfometers["check_mk-knuerr_rms_temp"] = perfometer_temperature perfometers["check_mk-arris_cmts_temp"] = perfometer_temperature perfometers["check_mk-casa_cpu_temp"] = perfometer_temperature perfometers["check_mk-rms200_temp"] = perfometer_temperature +perfometers["check_mk-juniper_screenos_temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1 @@ -585,6 +586,7 @@ perfometers["check_mk-ibm_svc_nodestats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_systemstats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-sni_octopuse_cpu"] = perfometer_cpu_utilization perfometers["check_mk-casa_cpu_util"] = perfometer_cpu_utilization +perfometers["check_mk-juniper_screenos_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data]) @@ -936,6 +938,7 @@ perfometers['check_mk-db2_mem'] = perfometer_simple_mem_usage perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem_usage perfometers['check_mk-brocade_mlx.module_mem'] = perfometer_simple_mem_usage perfometers['check_mk-innovaphone_mem'] = perfometer_simple_mem_usage +perfometers['check_mk-juniper_screenos_mem'] = perfometer_simple_mem_usage perfometers['check_mk-arris_cmts_mem'] = perfometer_simple_mem_usage def perfometer_vmguest_mem_usage(row, command, perf):

10 years, 1 month

Check_MK Git: check_mk: #1183 bluecat_commandserver: New Check for bluecat adonis devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 74d59734972308edc6b599af0f7b4c6c8c971390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d59734972308… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 15:55:16 2014 +0200 #1183 bluecat_commandserver: New Check for bluecat adonis devices --- .werks/1183 | 9 +++++ ChangeLog | 1 + checkman/bluecat_commandserver | 13 +++++++ checks/bluecat_commandserver | 65 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 35 ++++++++++++++++++ 5 files changed, 123 insertions(+) diff --git a/.werks/1183 b/.werks/1183 new file mode 100644 index 0000000..acb8849 --- /dev/null +++ b/.werks/1183 @@ -0,0 +1,9 @@ +Title: bluecat_commandserver: New Check for bluecat adonis devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410270891 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f1d77e1..697eded 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 1181 bluecat_ntp: New Check for NTP on bluecat adonis or proteus devices * 1105 wmic_if.ps1: Powershell version of the wmic_if.bat script... * 1182 bluecat_ha: New Check for HA Status on Bluecat Adonis devices + * 1183 bluecat_commandserver: New Check for bluecat adonis devices * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/bluecat_commandserver b/checkman/bluecat_commandserver new file mode 100644 index 0000000..6aa7f75 --- /dev/null +++ b/checkman/bluecat_commandserver @@ -0,0 +1,13 @@ +title: Bluecat Adonis Command Server State +agents: snmp +catalog: hw/network/bluecat +license: GPL +distribution: check_mk +description: + This Check monitors the OperState of the Command Server Service on bluecat adonis devices. + The Check will return {OK} if the Service is running, {CRITICAL} if the state is fault, {WARNING} in each other case. + It is possible to change the behavior in WATO. + +inventory: + One service will be created + diff --git a/checks/bluecat_commandserver b/checks/bluecat_commandserver new file mode 100644 index 0000000..5853a63 --- /dev/null +++ b/checks/bluecat_commandserver @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +factory_settings["bluecat_command_server"] = { + "oper_states" : { + "warning" : [ 2, 3, 4 ], + "critical" : [ 5 ], + }, +} + +def inventory_bluecat_command_server(info): + return [(None, None)] + +def check_bluecat_command_server(item, params, info): + oper_state = int(info[0][0]) + oper_states = { + 1 : "running normally", + 2 : "not running", + 3 : "currently starting", + 4 : "currently stopping", + 5 : "fault" + + } + state = 0 + if oper_state in params['oper_states']['warning']: + state = 1 + elif oper_state in params['oper_states']['critical']: + state = 2 + yield state, "Command Server is %s" % oper_states[oper_state] + +check_info["bluecat_command_server"] = { + "check_function" : check_bluecat_command_server, + "inventory_function" : inventory_bluecat_command_server, + "service_description" : "Command Server", + "default_levels_variable" : "bluecat_command_server", + "group" : "bluecat_command_server", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", + "snmp_info" : (".1.3.6.1.4.1.13315.3.1.7.2.1", [ + 1, # bcnCommandServerSerOperState + ]) +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 40c8175..47b977a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6078,6 +6078,41 @@ register_check_parameters( register_check_parameters( subgroup_networking, + "bluecat_command_server", + _("Bluecat Command Server Settings"), + Dictionary( + elements = [ + ( "oper_states", + Dictionary( + title = _("Oper States"), + elements = [ + ( "warning", + ListChoice( + title = _("States treated as warning"), + choices = bluecat_operstates, + default_value = [ 2, 3, 4 ], + ) + ), + ( "critical", + ListChoice( + title = _("States treated as critical"), + choices = bluecat_operstates, + default_value = [ 5 ], + ) + ), + ], + required_keys = [ 'warning', 'critical' ], + ) + ), + ], + required_keys = [ 'oper_states' ], # There is only one value, so its required + ), + None, + "first" +), + +register_check_parameters( + subgroup_networking, "bluecat_dns", _("Bluecat DNS Settings"), Dictionary(

10 years, 1 month

Check_MK Git: check_mk: Fixed wrong var name

by Bastian Kuhn

Module: check_mk Branch: master Commit: 189f4fd5f0dd3c989cd327fa39f78689a6878f9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=189f4fd5f0dd3c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 15:52:11 2014 +0200 Fixed wrong var name --- checks/bluecat_dhcp | 2 +- checks/bluecat_dns | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index a78f5ea..e92a589 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -34,7 +34,7 @@ factory_settings["bluecat_dhcp"] = { def inventory_bluecat_dhcp(info): return [(None, None)] -def check_bluecat_dhcp(item, _no_params, info): +def check_bluecat_dhcp(item, params, info): oper_state, leases_sec = map(int, info[0]) oper_states = { 1 : "running normally", diff --git a/checks/bluecat_dns b/checks/bluecat_dns index c6d4574..4ec1948 100644 --- a/checks/bluecat_dns +++ b/checks/bluecat_dns @@ -34,7 +34,7 @@ factory_settings["bluecat_dns"] = { def inventory_bluecat_dns(info): return [(None, None)] -def check_bluecat_dns(item, _no_params, info): +def check_bluecat_dns(item, params, info): oper_state = int(info[0][0]) oper_states = { 1 : "running normally",

10 years, 1 month

Check_MK Git: check_mk: bluecat_dhcp, bluecat_dns: Added missing Wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: e1b1b0633816aa9ac27e52e3d14d56ff5c5ff601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1b1b0633816aa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 15:25:25 2014 +0200 bluecat_dhcp, bluecat_dns: Added missing Wato configuration --- checks/bluecat_dhcp | 29 ++++++++------ checks/bluecat_dns | 25 +++++++----- web/plugins/wato/check_parameters.py | 70 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 22 deletions(-) diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index d303219..a78f5ea 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -24,9 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output from agent: -# Put here the example output from your TCP-Based agent. If the -# check is SNMP-Based, then remove this section +factory_settings["bluecat_dhcp"] = { + "oper_states" : { + "warning" : [ 2, 3, 4 ], + "critical" : [ 5 ], + }, +} def inventory_bluecat_dhcp(info): return [(None, None)] @@ -42,20 +45,22 @@ def check_bluecat_dhcp(item, _no_params, info): } state = 0 - if oper_state in [ 2, 3, 4 ]: + if oper_state in params['oper_states']['warning']: state = 1 - elif oper_state == 5: + elif oper_state in params['oper_states']['critical']: state = 2 yield state, "DHCP is %s" % oper_states[oper_state] yield 0, '%s Leases per second' % leases_sec, [ ('leases', leases_sec ) ] -check_info["bluecat_dhcp"] = { - "check_function" : check_bluecat_dhcp, - "inventory_function" : inventory_bluecat_dhcp, - "service_description" : "DHCP", - "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", - "snmp_info" : (".1.3.6.1.4.1.13315.3.1.1.2.1", [ +check_info["bluecat_dhcp"] = { + "check_function" : check_bluecat_dhcp, + "inventory_function" : inventory_bluecat_dhcp, + "service_description" : "DHCP", + "has_perfdata" : True, + "default_levels_variable" : "bluecat_dhcp", + "group" : "bluecat_dhcp", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", + "snmp_info" : (".1.3.6.1.4.1.13315.3.1.1.2.1", [ 1, # dhcpOperState 3, # dhcpLeaseStatsSuccess ]) diff --git a/checks/bluecat_dns b/checks/bluecat_dns index 47c5479..c6d4574 100644 --- a/checks/bluecat_dns +++ b/checks/bluecat_dns @@ -24,9 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output from agent: -# Put here the example output from your TCP-Based agent. If the -# check is SNMP-Based, then remove this section +factory_settings["bluecat_dns"] = { + "oper_states" : { + "warning" : [ 2, 3, 4 ], + "critical" : [ 5 ], + }, +} def inventory_bluecat_dns(info): return [(None, None)] @@ -42,18 +45,20 @@ def check_bluecat_dns(item, _no_params, info): } state = 0 - if oper_state in [ 2, 3, 4 ]: + if oper_state in params['oper_states']['warning']: state = 1 - elif oper_state == 5: + elif oper_state in params['oper_states']['critical']: state = 2 yield state, "DNS is %s" % oper_states[oper_state] check_info["bluecat_dns"] = { - "check_function" : check_bluecat_dns, - "inventory_function" : inventory_bluecat_dns, - "service_description" : "DNS", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", - "snmp_info" : (".1.3.6.1.4.1.13315.3.1.2.2.1", [ + "check_function" : check_bluecat_dns, + "inventory_function" : inventory_bluecat_dns, + "service_description" : "DNS", + "default_levels_variable" : "bluecat_dns", + "group" : "bluecat_dns", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1", + "snmp_info" : (".1.3.6.1.4.1.13315.3.1.2.2.1", [ 1, # DnsSerOperState ]) } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 97b6d99..40c8175 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6041,6 +6041,76 @@ register_check_parameters( "first" ), +register_check_parameters( + subgroup_networking, + "bluecat_dhcp", + _("Bluecat DHCP Settings"), + Dictionary( + elements = [ + ( "oper_states", + Dictionary( + title = _("Oper States"), + elements = [ + ( "warning", + ListChoice( + title = _("States treated as warning"), + choices = bluecat_operstates, + default_value = [ 2, 3, 4 ], + ) + ), + ( "critical", + ListChoice( + title = _("States treated as critical"), + choices = bluecat_operstates, + default_value = [ 5 ], + ) + ), + ], + required_keys = [ 'warning', 'critical' ], + ) + ), + ], + required_keys = [ 'oper_states' ], # There is only one value, so its required + ), + None, + "first" +), + +register_check_parameters( + subgroup_networking, + "bluecat_dns", + _("Bluecat DNS Settings"), + Dictionary( + elements = [ + ( "oper_states", + Dictionary( + title = _("Oper States"), + elements = [ + ( "warning", + ListChoice( + title = _("States treated as warning"), + choices = bluecat_operstates, + default_value = [ 2, 3, 4 ], + ) + ), + ( "critical", + ListChoice( + title = _("States treated as critical"), + choices = bluecat_operstates, + default_value = [ 5 ], + ) + ), + ], + required_keys = [ 'warning', 'critical' ], + ) + ), + ], + required_keys = [ 'oper_states' ], # There is only one value, so its required + ), + None, + "first" +), + bluecat_ha_operstates = [ ( 1 , "standalone"), ( 2 , "active"),

10 years, 1 month

Check_MK Git: check_mk: perfmeter check_http: prevent exception if perfdata is missing (startup problem)

by Andreas Boesl

Module: check_mk Branch: master Commit: b2aa592080c5294ac31c6046b1d78ea656cd06fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2aa592080c529… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 14:44:50 2014 +0200 perfmeter check_http: prevent exception if perfdata is missing (startup problem) --- web/plugins/perfometer/active_checks.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/plugins/perfometer/active_checks.py b/web/plugins/perfometer/active_checks.py index 277388a..62c29fc 100644 --- a/web/plugins/perfometer/active_checks.py +++ b/web/plugins/perfometer/active_checks.py @@ -35,7 +35,10 @@ perfometers["check_tcp"] = perfometer_check_tcp perfometers["check_mk_active-tcp"] = perfometer_check_tcp def perfometer_check_http(row, check_command, perfdata): - time_ms = float(perfdata[0][1]) * 1000.0 + try: + time_ms = float(perfdata[0][1]) * 1000.0 + except: + time_ms = 0 return "%.1f ms" % time_ms, \ perfometer_logarithmic(time_ms, 1000, 10, "#66ccff")

10 years, 1 month

Check_MK Git: check_mk: create config: now catches exceptions in agent bakery

by Andreas Boesl

Module: check_mk Branch: master Commit: 248da6ccc6dca14d0a6f702adfa73d0e1958999e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=248da6ccc6dca1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 14:42:12 2014 +0200 create config: now catches exceptions in agent bakery --- modules/check_mk.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 70815fc..6c1b1c3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4879,8 +4879,13 @@ def do_create_config(): if bake_agents_on_restart and 'do_bake_agents' in globals(): sys.stdout.write("Baking agents...") sys.stdout.flush() - do_bake_agents() - sys.stdout.write(tty_ok + "\n") + try: + do_bake_agents() + sys.stdout.write(tty_ok + "\n") + except Exception, e: + if opt_debug: + raise + sys.stdout.write("Error: %s\n" % e) def do_output_nagios_conf(args):

10 years, 1 month

Check_MK Git: check_mk: windows msi installer: fixed sort order of files in cabinet file

by Andreas Boesl

Module: check_mk Branch: master Commit: 1bcd13d9e38636fbe780b17d7866397161a7f32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bcd13d9e38636… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 14:14:58 2014 +0200 windows msi installer: fixed sort order of files in cabinet file --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.exe | Bin 177664 -> 177664 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 177664 -> 177664 bytes agents/windows/install_agent-64.exe | Bin 160048 -> 160015 bytes agents/windows/install_agent.exe | Bin 156931 -> 156898 bytes agents/windows/msibuild/msi-update | 5 ++--- 8 files changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index d88e313..76a8b2b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -81 +83 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 21d038a..29b7ad0 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4dd0178..ef1e9a7 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 60e02f3..404846c 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index bb8b51a..23ba18e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e564cd0..e7401e6 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e97de73..9dc0c7f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 3790b49..a999e84 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -94,7 +94,7 @@ cabinet_files = [] for line in lines_file_idt[3:]: tokens = line.split("\t") filename = tokens[0] - cabinet_files.append(filename) + cabinet_files.append((tokens[-1], filename)) file_stats = os.stat(source_dir + "/" + filename) new_size = file_stats.st_size tokens[3] = str(new_size) @@ -172,9 +172,8 @@ os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams wh verbose("Generating new product.cab") lcab_files = "" -for lcab_file in cabinet_files: +for index, lcab_file in sorted(cabinet_files): lcab_files += "%(source_dir)s/%(lcab_file)s " % globals() - os.system("lcab -n %(lcab_files)s %(work_dir)s/product.cab" % globals()) # Add modified product.cab

10 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits