Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: #1249 alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: aa9b73d33cef0d47a089225ff293d434981fbdab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa9b73d33cef0d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 22 14:20:25 2015 +0200 #1249 alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB --- .werks/1249 | 9 +++++++++ ChangeLog | 1 + checkman/alcatel_cpu | 12 +++++++++++ checkman/alcatel_temp | 12 +++++++++++ checks/alcatel_cpu | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ checks/alcatel_temp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 142 insertions(+) diff --git a/.werks/1249 b/.werks/1249 new file mode 100644 index 0000000..d1bd237 --- /dev/null +++ b/.werks/1249 @@ -0,0 +1,9 @@ +Title: alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432297189 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b46855b..4dad318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 1247 alcatel_timetra_chassis: New Check for Slots, Power Supplies, MDAs, cf cards and Fans of Alcatel Switches Supporting the TIMETRA-CHASSIS-MIB * 1248 acme_sbc, acme_sbc.settings: New Checks to monitor an ACME Session Border Controller... * 2256 mk_mysql: MySQL monitoring is now available for windows... + * 1249 alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/alcatel_cpu b/checkman/alcatel_cpu new file mode 100644 index 0000000..0f4ed01 --- /dev/null +++ b/checkman/alcatel_cpu @@ -0,0 +1,12 @@ +title: Alcatel switches: CPU utilization +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + This Check Monitors the CPU utilization on Alcatel switches supporting the ALCATEL-IND1-HEALTH-MIB. + The value is a average in percent over the last hour. This average is calculated by the device. + +inventory: + One check is created + diff --git a/checkman/alcatel_temp b/checkman/alcatel_temp new file mode 100644 index 0000000..c7c4edf --- /dev/null +++ b/checkman/alcatel_temp @@ -0,0 +1,12 @@ +title: Alcatel switches: Board and CPU Temperature +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + This Check Monitors CPU and Board Temperatures on Alcatel switches supporting the ALCATEL-IND1-CHASSIS-MIB. + If the CPU Temperature is supported depends on the switch mode (not supported on Hawk models) + +inventory: + One check is created + diff --git a/checks/alcatel_cpu b/checks/alcatel_cpu new file mode 100644 index 0000000..09bc1ae --- /dev/null +++ b/checks/alcatel_cpu @@ -0,0 +1,54 @@ +#!/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. + +alcatel_cpu_default_levels = (90.0, 95.0) + +def inventory_alcatel_cpu(info): + return [(None, "alcatel_cpu_default_levels")] + +def check_alcatel_cpu(_no_item, params, info): + cpu_perc = int(info[0][0]) + warn, crit = params + state = 0 + levelstext = "" + if cpu_perc >= crit: + state = 2 + elif cpu_perc >= warn: + state = 1 + if state: + levelstext = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) + perfdata = [ ("util", cpu_perc, warn, crit, 0, 100) ] + return state, "total: %.1f%%" % cpu_perc + levelstext, perfdata + +check_info["alcatel_cpu"] = { + "check_function" : check_alcatel_cpu, + "inventory_function" : inventory_alcatel_cpu, + "service_description" : "CPU utilization", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), + "snmp_info" : (".1.3.6.1.4.1.6486.800.1.2.1.16.1.1.1", [13]), +} + diff --git a/checks/alcatel_temp b/checks/alcatel_temp new file mode 100644 index 0000000..fa57f38 --- /dev/null +++ b/checks/alcatel_temp @@ -0,0 +1,54 @@ +#!/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. + +factory_settings['alcatel_temp'] = { + "levels" : ( 45, 50 ), +} + +def inventory_alcatel_temp(info): + for oid, name in enumerate(["Board", "CPU"]): + if info[0][oid] != '0': + yield name, {} + +def check_alcatel_temp(item, params, info): + items = { "Board" : 0, "CPU": 1 } + temp_celsius = int(info[0][items[item]]) + return check_temperature(temp_celsius, params) + +check_info["alcatel_temp"] = { + "check_function" : check_alcatel_temp, + "inventory_function" : inventory_alcatel_temp, + "service_description" : "Temperature %s", + "group" : "temperature", + "default_levels_variable" : "alcatel_temp", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), + "snmp_info" : (".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.3.1", [ + 4, # chasHardwareBoardTemp + 5, # chasHardwareCpuTemp + ]), + "includes" : [ "temperature.include" ], +}

9 years, 1 month

Check_MK Git: check_mk: Normaly it is not allowed to have different hosts with equal name in Check_MK.

by Lars Michelsen

Module: check_mk Branch: master Commit: 25acf6382d0ce04a695ba2990db9e866612ae74c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25acf6382d0ce0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 22 12:56:53 2015 +0200 Normaly it is not allowed to have different hosts with equal name in Check_MK. But it is possible to configure this, e.g. by creating hosts with an equal name on different sites (we do not recommend to do this). This change tries to fix handling of this situation in the GUIs views, where a user clicks on a host/service which is present on multiple sites but the user intends to get the host/service from a specific view. In the past this situation was not handled clearly which lead to a view showing data of the two equal named hosts where the user expected only data of one. Conflicts: ChangeLog web/htdocs/views.py web/htdocs/visuals.py web/plugins/visuals/infos.py --- .werks/2257 | 18 ++++++++++++++++++ ChangeLog | 1 + web/htdocs/views.py | 38 ++++++++++++++++++++++++++------------ web/htdocs/visuals.py | 8 ++++++++ web/plugins/views/datasources.py | 14 ++++++++++++++ web/plugins/visuals/filters.py | 12 ------------ web/plugins/visuals/infos.py | 2 ++ 7 files changed, 69 insertions(+), 24 deletions(-) diff --git a/.werks/2257 b/.werks/2257 new file mode 100644 index 0000000..9b13859 --- /dev/null +++ b/.werks/2257 @@ -0,0 +1,18 @@ +Title: Improved handling of duplicate hostnames across different sites +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432288983 + +Normaly it is not allowed to have different hosts with equal name in Check_MK. +But it is possible to configure this, e.g. by creating hosts with an equal +name on different sites (we do not recommend to do this). + +This change tries to fix handling of this situation in the GUIs views, where +a user clicks on a host/service which is present on multiple sites but the user intends +to get the host/service from a specific view. In the past this situation +was not handled clearly which lead to a view showing data of the two equal +named hosts where the user expected only data of one. diff --git a/ChangeLog b/ChangeLog index a62c7e2..b46855b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -455,6 +455,7 @@ * 2074 FIX: pnptemplate netapp_api_volume: fixed title * 2251 FIX: Adding views to dashboards / reports is now respecing all set filters... * 2253 FIX: Availability context button is now visible again for host- and servicegroups + * 2257 FIX: Improved handling of duplicate hostnames across different sites... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f26fef7..6feea46 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -976,17 +976,20 @@ def show_view(view, show_heading = False, show_buttons = True, # we convert this to the visuals principle the we need to optimize # this. filterheaders = "" - only_sites = None all_active_filters = [ f for f in use_filters if f.available() ] for filt in all_active_filters: header = filt.filter(tablename) - if header.startswith("Sites:"): - only_sites = header.strip().split(" ")[1:] - else: - filterheaders += header + filterheaders += header if filt.need_inventory(): need_inventory_data = True + # Apply the site hint / filter + if config.is_multisite(): + if html.var("site"): + only_sites = [html.var("site")] + else: + only_sites = None + # Prepare limit: # We had a problem with stats queries on the logtable where # the limit was not applied on the resulting rows but on the @@ -2099,7 +2102,7 @@ def url_to_view(row, view_name): if view: # Get the context type of the view to link to, then get the parameters of this # context type and try to construct the context from the data of the row - vars = [] + url_vars = [] datasource = multisite_datasources[view['datasource']] for info_key in datasource['infos']: if info_key in view['single_infos']: @@ -2110,21 +2113,32 @@ def url_to_view(row, view_name): filter_object = visuals.get_filter(filter_name) # Get the list of URI vars to be set for that filter new_vars = filter_object.variable_settings(row) - vars += new_vars + url_vars += new_vars # See get_link_filter_names() comment for details for src_key, dst_key in visuals.get_link_filter_names(view, datasource['infos'], datasource.get('link_filters', {})): - vars += visuals.get_filter(src_key).variable_settings(row) - vars += visuals.get_filter(dst_key).variable_settings(row) + url_vars += visuals.get_filter(src_key).variable_settings(row) + url_vars += visuals.get_filter(dst_key).variable_settings(row) + + # Some special handling for the site filter which is meant as optional hint + # Always add the site filter var when some useful information is available + add_site_hint = True + for filter_key in datasource.get('multiple_site_filters', []): + if filter_key in dict(url_vars): + add_site_hint = False + + if add_site_hint: + url_vars.append(('site', row['site'])) do = html.var("display_options") if do: - vars.append(("display_options", do)) + url_vars.append(("display_options", do)) filename = html.mobile and "mobile_view.py" or "view.py" - return filename + "?" + html.urlencode_vars([("view_name", view_name)] + vars) - return None + uri = filename + "?" + html.urlencode_vars([("view_name", view_name)] + url_vars) + content = "<a href=\"%s\">%s</a>" % (uri, content) + return content def link_to_view(content, row, view_name): if 'I' not in html.display_options: diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 3b4cda3..39026a8 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1175,6 +1175,9 @@ def unpack_context_after_editing(packed_context): def declare_info(infoname, info): infos[infoname] = info +def is_single_site_info(info_key): + return infos[info_key].get('single_site', True) + def single_infos_spec(single_infos): return ('single_infos', FixedValue(single_infos, title = _('Show information of single'), @@ -1318,6 +1321,11 @@ def collect_context_links_of(visual_type_name, this_visual, active_filter_vars, break vars_values.append((var, val)) + # When all infos of the target visual are showing single site data, add + # the site hint when available + if html.var('site') and all([ is_single_site_info(info_key)for info_key in visual['single_infos']]): + vars_values.append(('site', html.var('site'))) + if not skip: # add context link to this visual. For reports we put in # the *complete* context, even the non-single one. diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 7aa06c1..99b8a22 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -84,6 +84,13 @@ multisite_datasources["hosts"] = { # to handle the data provided by the single_spec value of the "hostgroup" # info, which is in fact the name of the wanted hostgroup "link_filters" : { "hostgroup": "opthostgroup" }, + # When these filters are set, the site hint will not be added to urls + # which link to views using this datasource, because the resuling view + # should show the objects spread accross the sites + "multiple_site_filters" : [ + "hostgroup", + "servicegroup", + ], } multisite_datasources["hostsbygroup"] = { @@ -110,6 +117,13 @@ multisite_datasources["services"] = { "hostgroup" : "opthostgroup", "servicegroup" : "optservicegroup", }, + # When these filters are set, the site hint will not be added to urls + # which link to views using this datasource, because the resuling view + # should show the objects spread accross the sites + "multiple_site_filters" : [ + "hostgroup", + "servicegroup", + ], } multisite_datasources["servicesbygroup"] = { diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index a6bc303..54fe5f3 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -532,18 +532,6 @@ class FilterSite(Filter): choices.append((sitename, config.site(sitename)["alias"])) html.sorted_select("site", choices) - def filter(self, infoname): - if config.is_multisite(): - site = html.var("site") - if site: - return "Sites: %s\n" % (html.var("site", "")) - elif not self.enforce: - return "" - else: - return "Sites:\n" # no site at all - else: - return "" - def heading_info(self): current_value = html.var("site") if current_value: diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index 645c3b8..3c5f681 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -47,6 +47,7 @@ infos['service'] = { infos['hostgroup'] = { 'title' : _('Host Group'), 'title_plural': _('Host Groups'), + 'single_site' : False, # spread over multiple sites 'single_spec' : [ ('hostgroup', TextUnicode( title = _('Host Group Name'), @@ -57,6 +58,7 @@ infos['hostgroup'] = { infos['servicegroup'] = { 'title' : _('Service Group'), 'title_plural': _('Service Groups'), + 'single_site' : False, # spread over multiple sites 'single_spec' : [ ('servicegroup', TextUnicode( title = _('Service Group Name'),

9 years, 1 month

Check_MK Git: check_mk: moxa_iologik_register: Fixed Scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: b5bcd60bb82b6eb17ee2d5446f1fb9a8f7735ead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5bcd60bb82b6e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 22 12:01:39 2015 +0200 moxa_iologik_register: Fixed Scan function --- checks/moxa_iologik_register | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register index 161fc1d..7c9da4e 100644 --- a/checks/moxa_iologik_register +++ b/checks/moxa_iologik_register @@ -52,7 +52,7 @@ check_info['moxa_iologik_register'] = { "has_perfdata" : False, "group" : "iologik_register", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8691.") and \ - oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), + oid(".1.3.6.1.4.1.8691.10.2242.2.0", "").startswith("E2242-T"), "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", [ "1", # index "2", # Name

9 years, 1 month

Check_MK Git: check_mk: checkpoint.include: hopefully really fixed scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: d5e2d05d6b2cd9d081cd9b777867c2566620f80f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5e2d05d6b2cd9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 22 11:09:50 2015 +0200 checkpoint.include: hopefully really fixed scan function --- checks/checkpoint.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/checkpoint.include b/checks/checkpoint.include index 0d0940b..7155e99 100644 --- a/checks/checkpoint.include +++ b/checks/checkpoint.include @@ -29,7 +29,7 @@ def scan_checkpoint(oid): sys_descr = oid(".1.3.6.1.2.1.1.1.0") return ( # Entry in sysDescr, varies a bit - (len(sys_descr) >= 3 and sys_descr.split(" ")[2].endswith("cp")) or + (len(sys_descr.split(" ")) >= 3 and sys_descr.split(" ")[2].endswith("cp")) or sys_descr.startswith("IPSO ") or (sys_descr.startswith("Linux") and "cpx" in sys_descr)) \

9 years, 1 month

Check_MK Git: check_mk: testcommit

by Andreas Boesl

Module: check_mk Branch: master Commit: ecc5e84da5bc514ce5960d716d76fffaa62142eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc5e84da5bc51… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 22 10:25:15 2015 +0200 testcommit --- agents/windows/check_mk_agent.msi | Bin 766464 -> 766464 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 368e9d6..ba95fdd 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ

9 years, 1 month

Check_MK Git: check_mk: testcommit

by Andreas Boesl

Module: check_mk Branch: master Commit: 85c285895820949e3d7f65e4776b13e168c75401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c28589582094… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 22 10:23:35 2015 +0200 testcommit --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301568 -> 301568 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301568 -> 301568 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 183808 -> 216064 bytes agents/windows/check_mk_agent.msi | Bin 734208 -> 766464 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 216064 bytes agents/windows/install_agent-64.exe | Bin 178942 -> 178943 bytes agents/windows/install_agent.exe | Bin 159862 -> 166100 bytes 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 9cc2bc3..9e42f3e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -163 +165 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 1b21214..5736c35 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 c1a6bc2..02db491 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.cc b/agents/windows/check_mk_agent.cc index 165f922..ba02dcb 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5162,7 +5162,7 @@ int main(int argc, char **argv) } do_file = true; do_test(false); - fclose(fileout); + fclose(fileout); } else if (!strcmp(argv[1], "adhoc")) do_adhoc(); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ce98a88..1b4637a 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.msi b/agents/windows/check_mk_agent.msi index 98014e4..368e9d6 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 9d61b54..b9a1485 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 ea91f26..9628edd 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 4914699..bcc6c1c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 1 month

Check_MK Git: check_mk: testcommit

by Andreas Boesl

Module: check_mk Branch: master Commit: 76886cd6fc48f099f4e53c636f066ae26f7b2898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76886cd6fc48f0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 22 10:22:13 2015 +0200 testcommit --- agents/windows/check_mk_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index ba02dcb..165f922 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5162,7 +5162,7 @@ int main(int argc, char **argv) } do_file = true; do_test(false); - fclose(fileout); + fclose(fileout); } else if (!strcmp(argv[1], "adhoc")) do_adhoc();

9 years, 1 month

Check_MK Git: check_mk: Fixed make clean

by Lars Michelsen

Module: check_mk Branch: master Commit: ebed3937b238ed737389321138ee3b5996826b5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebed3937b238ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 22 09:47:00 2015 +0200 Fixed make clean --- agents/windows/msibuild/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 022c2aa..b451f5c 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -34,7 +34,7 @@ clean: rm -rf $(MSITOOLS) rm -f check_mk_agent.msi rm -rf work sources - rm .gsf-save-* + rm -f .gsf-save-* msibuild: tar -Jxf $(MSITOOLS_FILE)

9 years, 1 month

Check_MK Git: check_mk: Trying to fix building agent on Ubuntu 15.04

by Lars Michelsen

Module: check_mk Branch: master Commit: 34f6bbe138682e8c03d7a24d9b49454510142b12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34f6bbe138682e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 22 09:46:38 2015 +0200 Trying to fix building agent on Ubuntu 15.04 --- agents/windows/Makefile | 6 ++++-- agents/windows/msibuild/Makefile | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 5a496b6..51419f8 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -25,11 +25,11 @@ SHELL = /bin/bash VERSION = 1.2.7i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ -WINDRES = i586-mingw32msvc-windres +WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Werror -static -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i686-w64-mingw32-g++ CXX_64 = x86_64-w64-mingw32-g++ WINDRES_64 = x86_64-w64-mingw32-windres else @@ -135,3 +135,5 @@ clean: mrproper: clean rm -f *.exe +setup: + sudo apt-get install nsis lcab binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 4ecc076..022c2aa 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -34,6 +34,7 @@ clean: rm -rf $(MSITOOLS) rm -f check_mk_agent.msi rm -rf work sources + rm .gsf-save-* msibuild: tar -Jxf $(MSITOOLS_FILE)

9 years, 1 month

Check_MK Git: check_mk: added error handling to msi build script

by Lars Michelsen

Module: check_mk Branch: master Commit: 924e63df26d7d81ba9ab7dda30f80e9545aad216 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=924e63df26d7d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 22 09:43:33 2015 +0200 added error handling to msi build script --- agents/windows/msibuild/msi-update | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 14699bd..646d93a 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -176,15 +176,17 @@ try: verbose("Creating copy of original file %s -> %s" % (msi_file, new_msi_file)) # Make a copy - os.system("cp %(msi_file)s %(new_msi_file)s" % { "msi_file": msi_file, "new_msi_file": new_msi_file}) + if os.system("cp %(msi_file)s %(new_msi_file)s" % { "msi_file": msi_file, "new_msi_file": new_msi_file}) != 0: + bail_out('Fehler!') # Rename modified tables for entry in [ "Property", "File", "Component" ]: os.rename(work_dir + "/%s.idt.new" % entry , work_dir + "/%s.idt" % entry) for entry in [ "Property", "File", "Component" ]: - os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ - { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) + if os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) != 0: + bail_out('Fehler!') # Update summary info with new uuid (HACK! - the msibuild tool is not able to do this on all systems) # In this step we replace the package code with a new uuid. This uuid is important, because it is @@ -198,11 +200,15 @@ try: "baked_container.msi" : { "dftl_start": "{47ED1918-CEDF-4", "dftl_end": "D37-943C-B4DBC3F58E6C}"} } summary_info.update(default_package_codes[os.path.basename(msi_file)]) - os.system("sed -i -e 's/%(dftl_start)s/%(start)s/' -e 's/%(dftl_end)s/%(end)s/' %(new_msi_file)s" % summary_info) + if os.system("sed -i -e 's/%(dftl_start)s/%(start)s/' " + "-e 's/%(dftl_end)s/%(end)s/' %(new_msi_file)s" % summary_info) != 0: + bail_out('Fehler!') # Remove original product.cab from stream verbose("Removing product.cab from %s" % new_msi_file) - os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'product.cab'\"") % { "new_msi_file": new_msi_file } ) + if os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams " + "where Name = 'product.cab'\"") % { "new_msi_file": new_msi_file } ) != 0: + bail_out('Fehler!') # Prepare product.cab file verbose("Generating new product.cab") @@ -210,12 +216,14 @@ try: lcab_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()) + if os.system("lcab -n %(lcab_files)s %(work_dir)s/product.cab" % globals()) != 0: + bail_out('Fehler!') # Add modified product.cab verbose("Add modified product.cab") - os.system((path_prefix + "msibuild %(new_msi_file)s -a product.cab %(work_dir)s/product.cab") % \ - { "work_dir" : work_dir, "new_msi_file": new_msi_file }) + if os.system((path_prefix + "msibuild %(new_msi_file)s -a product.cab %(work_dir)s/product.cab") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file }) != 0: + bail_out('Fehler!') shutil.rmtree(work_dir) verbose("Successfully created file " + new_msi_file)

9 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015