Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

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

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

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

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

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

Check_MK Git: check_mk: #1182 bluecat_ha: New Check for HA Status on Bluecat Adonis devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 023b9488dac3181cdd90c9bd6e2ab3810f916510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=023b9488dac318… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 14:11:41 2014 +0200 #1182 bluecat_ha: New Check for HA Status on Bluecat Adonis devices --- .werks/1182 | 9 +++++ ChangeLog | 1 + checkman/bluecat_ha | 14 +++++++ checks/bluecat_ha | 69 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 53 +++++++++++++++++++++++++- 5 files changed, 144 insertions(+), 2 deletions(-) diff --git a/.werks/1182 b/.werks/1182 new file mode 100644 index 0000000..c6f9c5a --- /dev/null +++ b/.werks/1182 @@ -0,0 +1,9 @@ +Title: bluecat_ha: New Check for HA Status on Bluecat Adonis devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410264668 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5acbb4a..f1d77e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 1180 bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis. * 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 * 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_ha b/checkman/bluecat_ha new file mode 100644 index 0000000..28667c1 --- /dev/null +++ b/checkman/bluecat_ha @@ -0,0 +1,14 @@ +title: Bluecat Adonis HA State +agents: snmp +catalog: hw/network/bluecat +license: GPL +distribution: check_mk +description: + This Check monitors the OperState of the HA Service on bluecat adonis devices. + Per default the check returns {CRITICAL} if the device is in the state fault or stopped. {WARNING} will be returned if + the device is in the state stopping, becoming active, becoming passive. + The behavior can be changed using WATO. + +inventory: + One service will be created + diff --git a/checks/bluecat_ha b/checks/bluecat_ha new file mode 100644 index 0000000..a5e4300 --- /dev/null +++ b/checks/bluecat_ha @@ -0,0 +1,69 @@ +#!/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_ha"] = { + "oper_states" : { + "warning" : [ 5, 6, 7 ], + "critical" : [ 8, 4 ], + }, +} + +def inventory_bluecat_ha(info): + # Only add if device is not in standalone mode + if info[0][0] != '1': + return [(None, None)] + +def check_bluecat_ha(item, params, info): + oper_state = int(info[0][0]) + oper_states = { + 1 : "standalone", + 2 : "active", + 3 : "passiv", + 4 : "stopped", + 5 : "stopping", + 6 : "becoming active", + 7 : "becomming passive", + 8 : "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, "State is %s" % oper_states[oper_state] + + +check_info["bluecat_ha"] = { + "check_function" : check_bluecat_ha, + "inventory_function" : inventory_bluecat_ha, + "service_description" : "HA State", + "default_levels_variable" : "bluecat_ha", + "group" : "bluecat_ha", + "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.5.2.1", [ 1 ] ), +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index cea209b..97b6d99 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6012,12 +6012,16 @@ register_check_parameters( ( "warning", ListChoice( title = _("States treated as warning"), - choices = bluecat_operstates ) + choices = bluecat_operstates, + default_value = [ 2, 3, 4 ], + ) ), ( "critical", ListChoice( title = _("States treated as critical"), - choices = bluecat_operstates ) + choices = bluecat_operstates, + default_value = [ 5 ], + ) ), ], required_keys = [ 'warning', 'critical' ], @@ -6037,6 +6041,51 @@ register_check_parameters( "first" ), +bluecat_ha_operstates = [ + ( 1 , "standalone"), + ( 2 , "active"), + ( 3 , "passiv"), + ( 4 , "stopped"), + ( 5 , "stopping"), + ( 6 , "becoming active"), + ( 7 , "becomming passive"), + ( 8 , "fault"), +] + +register_check_parameters( + subgroup_networking, + "bluecat_ha", + _("Bluecat HA Settings"), + Dictionary( + elements = [ + ( "oper_states", + Dictionary( + title = _("Oper States"), + elements = [ + ( "warning", + ListChoice( + title = _("States treated as warning"), + choices = bluecat_ha_operstates, + default_value = [ 5, 6, 7 ], + ), + ), + ( "critical", + ListChoice( + title = _("States treated as critical"), + choices = bluecat_ha_operstates , + default_value = [ 8, 4 ], + ), + ), + ], + required_keys = [ 'warning', 'critical' ], + ) + ), + ], + required_keys = [ 'oper_states' ], # There is only one value, so its required + ), + None, + "first" +), register_check_parameters( subgroup_storage, "fc_port",

10 years

Check_MK Git: check_mk: #1105 wmic_if.ps1: Powershell version of the wmic_if.bat script

by Andreas Boesl

Module: check_mk Branch: master Commit: df4e0a680d98640336166c43416a58c8e5a99a50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df4e0a680d9864… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 14:09:49 2014 +0200 #1105 wmic_if.ps1: Powershell version of the wmic_if.bat script The new script wmic_if.ps1 should deliver the same information like the wmic_if.bat script, but more reliable. In Win2012 the wmic_if.bat script is unable to determine the correct interface speed for teaming interfaces. This script is able to do so.<br> Note: Do not use both plugins at the same time --- .werks/1105 | 13 +++++++++++++ ChangeLog | 1 + agents/windows/plugins/wmic_if.ps1 | Bin 0 -> 3634 bytes 3 files changed, 14 insertions(+) diff --git a/.werks/1105 b/.werks/1105 new file mode 100644 index 0000000..d9079d4 --- /dev/null +++ b/.werks/1105 @@ -0,0 +1,13 @@ +Title: wmic_if.ps1: Powershell version of the wmic_if.bat script +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410264432 +Class: feature + +The new script wmic_if.ps1 should deliver the same information like the +wmic_if.bat script, but more reliable. In Win2012 the wmic_if.bat script +is unable to determine the correct interface speed for teaming interfaces. +This script is able to do so.<br> +Note: Do not use both plugins at the same time diff --git a/ChangeLog b/ChangeLog index 4269915..5acbb4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 1179 bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices. * 1180 bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis. * 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... * 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/agents/windows/plugins/wmic_if.ps1 b/agents/windows/plugins/wmic_if.ps1 new file mode 100644 index 0000000..9748b5a Binary files /dev/null and b/agents/windows/plugins/wmic_if.ps1 differ

10 years

Check_MK Git: check_mk: winperf_if: Improved matching of data from wmic_if. bat / wmic_if.ps1 scripts

by Andreas Boesl

Module: check_mk Branch: master Commit: b330459a38cc27db21a926cb939bd2a9c060b2a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b330459a38cc27… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 13:59:53 2014 +0200 winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts --- .werks/1104 | 15 ++++++++++++++ ChangeLog | 1 + checks/winperf_if | 60 ++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/.werks/1104 b/.werks/1104 new file mode 100644 index 0000000..cb7dcea --- /dev/null +++ b/.werks/1104 @@ -0,0 +1,15 @@ +Title: winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410263307 +Class: fix + +Interfaces reported by the wmic_if.bat, wmic_if.ps1 script were not +entirely identical with the interface names reported by the windows +performance counters. +The matching algorhytm has been improved. Due to the better matching +the interface checks will provide more output, like the mac address. + +Note: The new matching algorhythm should have no negative side effects for existing winperf_if checks diff --git a/ChangeLog b/ChangeLog index ca3a162..4269915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 0651 FIX: f5_bigip_interfaces: Fix invalid throughput values, detect newer F5 devices... * 1393 FIX: casa_cpu_temp, casa_cpu_util: Change service description to standard... NOTE: Please refer to the migration notes! + * 1104 FIX: winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/winperf_if b/checks/winperf_if index b16ca5a..03438c8 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -77,7 +77,6 @@ def convert_winperf_if(info): if counter: for nr, value in enumerate(line[1:len(nic_names)+1]): nics[nic_names[nr]][counter] = int(value) - # Not and integer: then this must be the line with the additional # information from wmic (which is optional!) else: @@ -91,20 +90,58 @@ def convert_winperf_if(info): nic_name += " " + str(conn_id) except: pass + + + def transform_name(name): + # Intel[R] PRO 1000 MT-Desktopadapter__3 (perf counter) + # Intel(R) PRO/1000 MT-Desktopadapter 3 (wmic name) + # Intel(R) PRO/1000 MT-Desktopadapter #3 (wmic InterfaceDescription) + mod_nic_name = name + for from_token, to_token in [ ("/", " "), ("(", "["), (")", "]"), ("#", " ") ]: + for n in nic_names: + if from_token in n: + # we do not modify it if this character is in any of the counter names + break + else: + mod_nic_name = mod_nic_name.replace(from_token, to_token).replace(" ", " ") + return mod_nic_name + + found_match = False + + # Exact match + if nic_name in nic_names: + found_match = True + # In the perf counters the nics have strange suffixes, e.g. # Ethernetadapter der AMD-PCNET-Familie 2 - Paketplaner-Miniport, while # in wmic it's only named "Ethernetadapter der AMD-PCNET-Familie 2". - longest_match = 0 - if nic_name not in nic_names: - for n in nic_names: - if n.startswith(nic_name + " "): - l = len(nic_name) - if not (n[l:].strip()[0]).isdigit(): - nic_name = n - break + if not found_match: + mod_nic_name = transform_name(nic_name) + + if mod_nic_name not in nic_names: + for n in nic_names: + if n.startswith(mod_nic_name + " "): + l = len(mod_nic_name) + if not (n[l:].strip()[0]).isdigit(): + nic_name = n + found_match = True + break else: - # Ignore interfaces that do not have counters - continue + nic_name = mod_nic_name + + # The last straw. Try to find this the name as exact match in other fields + if not found_match: + for entry in [ "NetConnectionID", "InterfaceDescription" ]: + if as_dict.get(entry): + mod_nic_name = transform_name(as_dict.get(entry)) + if mod_nic_name in nic_names: + nic_name = mod_nic_name + found_match = True + break + + if not found_match: + # Ignore interfaces that do not have counters + continue nics[nic_name].update(as_dict) except StopIteration: @@ -113,7 +150,6 @@ def convert_winperf_if(info): # Now convert the dicts into the format that is needed by if.include converted = [] - # Sort NIC names are create artifical index nic_names = nics.keys() nic_names.sort()

10 years

Check_MK Git: check_mk: windows msi installer: updated source files for building msi container

by Andreas Boesl

Module: check_mk Branch: master Commit: 661d67d2295333eda38af9631a48b276725c4e83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=661d67d2295333… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 9 13:58:19 2014 +0200 windows msi installer: updated source files for building msi container --- doc/treasures/windows_msi/check_mk_agent.wxs | 2 +- doc/treasures/windows_msi/check_mk_agent_baked.wxs | 141 ++++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) diff --git a/doc/treasures/windows_msi/check_mk_agent.wxs b/doc/treasures/windows_msi/check_mk_agent.wxs index b7aa5e4..2f3b7f2 100644 --- a/doc/treasures/windows_msi/check_mk_agent.wxs +++ b/doc/treasures/windows_msi/check_mk_agent.wxs @@ -108,7 +108,7 @@ <CreateFolder Directory="LocalName"/> </Component> </Directory> - <Directory Id="PluginName" Name="plugin"> + <Directory Id="PluginName" Name="plugins"> <Component Id="pluginFolder" Guid="2384da34-a212-4eda-ac1b-365d2f2686ab"> <CreateFolder Directory="PluginName"/> </Component> diff --git a/doc/treasures/windows_msi/check_mk_agent_baked.wxs b/doc/treasures/windows_msi/check_mk_agent_baked.wxs new file mode 100644 index 0000000..b473ede --- /dev/null +++ b/doc/treasures/windows_msi/check_mk_agent_baked.wxs @@ -0,0 +1,141 @@ +<?xml version="1.0"?> +<?define CompanyName = "Mathias Kettner GmbH"?> +<?define ProductVersion = "1.2.5"?> +<?define ProductUpgradeCode = "854bb2c1-f4aa-4c5c-89e4-8fb0bdfb9ee4"?> + + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" + xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'> + <Product Id="*" UpgradeCode="$(var.ProductUpgradeCode)" + Name="Check_MK Agent MSI" Version="$(var.ProductVersion)" Manufacturer="Mathias Kettner GmbH" Language="1033"> + <Package InstallerVersion="200" Platform="x86" Compressed="yes" Description="Check_MK 32/64 bit MSI installer"/> + <Media Id="1" Cabinet="product.cab" CompressionLevel="none" EmbedCab="yes"/> + <Upgrade Id="$(var.ProductUpgradeCode)"> + <UpgradeVersion Minimum="$(var.ProductVersion)" + Property="NEWERVERSIONDETECTED"/> + <UpgradeVersion Minimum="0.0.0" + Maximum="$(var.ProductVersion)" + IncludeMinimum="yes" + IncludeMaximum="no" + Property="OLDERVERSIONBEINGUPGRADED"/> + </Upgrade> + + + <Directory Id="TARGETDIR" Name="SourceDir"> + <Directory Id="ProgramFilesFolder"> + <Directory Id="APPLICATIONROOTDIRECTORY" Name="check_mk"> + <Directory Id="INSTALLDIR"/> + </Directory> + </Directory> + </Directory> + + +  + <Property Id="EXISTINGINSTALLDIR" Secure="yes"> + <RegistrySearch Id="Locate_EXISTINGINSTALLDIR" Root="HKLM" + Key="Software\check_mk_agent" Name="Install_Dir" Type="directory" /> + </Property> + +  + <CustomAction Id="Set_INSTALLDIR" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" /> + + + <InstallExecuteSequence> + <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> + </InstallExecuteSequence> + + <InstallUISequence> + <Custom Action="Set_INSTALLDIR" Before="CostFinalize"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom> + </InstallUISequence> + + <Property Id="INSTALLSERVICE" Value="1" /> + + <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> + <WixVariable Id="WixUILicenseRtf" Value="sources\GPL-V2.rtf" /> + <UIRef Id="CmkWixUI_InstallDir"/> + + <CustomAction Id="install_service" + Directory ="INSTALLDIR" + ExeCommand='[INSTALLDIR]check_mk_agent.exe install' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="uninstall_service" + Directory ="INSTALLDIR" + ExeCommand='[INSTALLDIR]check_mk_agent.exe remove' + Execute ="immediate" + Return ="ignore"/> + + + <CustomAction Id="start_service" + Directory ="INSTALLDIR" + ExeCommand='net start check_mk_agent' + Execute ="immediate" + Return ="ignore"/> + + <CustomAction Id="stop_service" + Directory ="INSTALLDIR" + ExeCommand='net stop check_mk_agent' + Execute ="immediate" + Return ="ignore"/> + + <InstallExecuteSequence> + <Custom Action="install_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" After="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + </InstallExecuteSequence> + + <InstallExecuteSequence> + <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> + </InstallExecuteSequence> + + <DirectoryRef Id="INSTALLDIR"> + <Component Id="agent32" Guid="60d6ba87-1f56-4d24-817f-a5966eb8b116"> + <File Id="check_mk_agent.exe" Source="sources\check_mk_agent.exe" + Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> + <Condition>NOT VersionNT64</Condition> + </Component> + <Component Id="agent64" Guid="7c2e82ec-c80e-436e-9a29-fe7d0e8f3589"> + <File Id="check_mk_agent64.exe" Source="sources\check_mk_agent-64.exe" + Name="check_mk_agent.exe" KeyPath="yes" Checksum="yes"/> + <Condition>VersionNT64</Condition> + </Component> + <Component Id="plugins.cmkp" Guid="0e9229ec-373b-11e4-824b-002713b4a9ec"> + <File Id="plugins.cmkp" Source="sources\plugins.cmkp"/> + </Component> + <Component Id="check_mk.ini" Guid="fa07238c-373b-11e4-961a-002713b4a9ec"> + <File Id="check_mk.ini" Source="sources\check_mk.ini"/> + </Component> + <Directory Id="LocalName" Name="local"> + <Component Id="localFolder" Guid="f0cdd975-2dad-45c5-b089-d566d7418ae7"> + <CreateFolder Directory="LocalName"/> + </Component> + </Directory> + <Directory Id="PluginName" Name="plugins"> + <Component Id="pluginFolder" Guid="2384da34-a212-4eda-ac1b-365d2f2686ab"> + <CreateFolder Directory="PluginName"/> + </Component> + </Directory> + <Component Id="RegistryEntries" Guid="c1feaa52-851d-4c68-bd3e-6725bbdf6370"> + <RegistryKey Root="HKLM" Key="Software\check_mk_agent"> + <RegistryValue Type="string" Name="Install_Dir" Value="[INSTALLDIR]"/> + </RegistryKey> + </Component> + </DirectoryRef> + + + <InstallExecuteSequence> + <RemoveExistingProducts Before="InstallInitialize"/> + </InstallExecuteSequence> + + <Feature Id="Agent" Level="1"> + <ComponentRef Id="agent32"/> + <ComponentRef Id="agent64"/> + <ComponentRef Id="check_mk.ini"/> + <ComponentRef Id="plugins.cmkp"/> + <ComponentRef Id="localFolder"/> + <ComponentRef Id="pluginFolder"/> + <ComponentRef Id="RegistryEntries"/> + </Feature> + </Product> +</Wix> diff --git a/doc/treasures/windows_msi/sources/check_mk.ini b/doc/treasures/windows_msi/sources/check_mk.ini new file mode 100644 index 0000000..e69de29 diff --git a/doc/treasures/windows_msi/sources/plugins.cmkp b/doc/treasures/windows_msi/sources/plugins.cmkp new file mode 100644 index 0000000..e69de29

10 years

Check_MK Git: check_mk: #1181 bluecat_ntp: New Check for NTP on bluecat adonis or proteus devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8dfbed5f2a2c05eb8a47346bdc86eb0ce9773a97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dfbed5f2a2c05… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 12:51:17 2014 +0200 #1181 bluecat_ntp: New Check for NTP on bluecat adonis or proteus devices --- .werks/1181 | 9 ++++ ChangeLog | 1 + checkman/bluecat_ntp | 14 ++++++ checks/bluecat_ntp | 89 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 45 +++++++++++++++++ 5 files changed, 158 insertions(+) diff --git a/.werks/1181 b/.werks/1181 new file mode 100644 index 0000000..ed5b5c3 --- /dev/null +++ b/.werks/1181 @@ -0,0 +1,9 @@ +Title: bluecat_ntp: New Check for NTP on bluecat adonis or proteus devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410259845 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 02cac0e..ca3a162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules. * 1179 bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices. * 1180 bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis. + * 1181 bluecat_ntp: New Check for NTP on bluecat adonis or proteus 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_ntp b/checkman/bluecat_ntp new file mode 100644 index 0000000..c3bd49f --- /dev/null +++ b/checkman/bluecat_ntp @@ -0,0 +1,14 @@ +title: Bluecat Adonis/ Proteus NTP +agents: snmp +catalog: hw/network/bluecat +license: GPL +distribution: check_mk +description: + This Check monitors the OperState of the NTP Service on bluecat devices. + The Check will return {OK} if the Service is running, {CRITICAL} if the state is fault, {WARNING} in each other case. + The Levels can be set with WATO. + Also Checked are the Stratum and the Leap Seconds. Each aberrancy will lead to a {WARNING} state. + +inventory: + One service will be created + diff --git a/checks/bluecat_ntp b/checks/bluecat_ntp new file mode 100644 index 0000000..4b3b50c --- /dev/null +++ b/checks/bluecat_ntp @@ -0,0 +1,89 @@ +#!/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_ntp"] = { + "oper_states" : { + "warning" : [ 2, 3, 4 ], + "critical" : [ 5 ], + }, + "stratum" : ( 8, 10 ), +} + +def inventory_bluecat_ntp(info): + return [(None, None)] + +def check_bluecat_ntp(item, params, info): + oper_state, sys_leap, stratum = map(int, info[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, "Process is %s" % oper_states[oper_state] + + sys_leap_states = { + 0 : 'no Warning', + 1 : 'add second', + 2 : 'subtract second', + 3 : 'Alarm' + } + state = 0 + if sys_leap == 3: + state = 2 + elif sys_leap in [ 1, 2 ]: + state = 1 + yield state, "Sys Leap: %s" % sys_leap_states[sys_leap] + + warn, crit = params['stratum'] + state = 0 + if stratum >= crit: + state = 2 + elif stratum >= warn: + state = 1 + yield state, "Stratum: %s" % stratum + +check_info["bluecat_ntp"] = { + "check_function" : check_bluecat_ntp, + "inventory_function" : inventory_bluecat_ntp, + "service_description" : "NTP", + "default_levels_variable" : "bluecat_ntp", + "group" : "bluecat_ntp", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13315"), + "snmp_info" : (".1.3.6.1.4.1.13315.3.1.4.2", [ + '1.1', # bcnNtpSerOperState + '2.1', # bcnNtpSysLeap + '2.2', # bcnNtpSysStratum + ]) +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 12db48b..cea209b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5991,6 +5991,51 @@ register_check_parameters( "dict" ), +bluecat_operstates = [ + (1, "running normally"), + (2, "not running"), + (3, "currently starting"), + (4, "currently stopping"), + (5, "fault"), +] + +register_check_parameters( + subgroup_networking, + "bluecat_ntp", + _("Bluecat NTP Settings"), + Dictionary( + elements = [ + ( "oper_states", + Dictionary( + title = _("Oper States"), + elements = [ + ( "warning", + ListChoice( + title = _("States treated as warning"), + choices = bluecat_operstates ) + ), + ( "critical", + ListChoice( + title = _("States treated as critical"), + choices = bluecat_operstates ) + ), + ], + required_keys = [ 'warning', 'critical' ], + ) + ), + ( "stratum", + Tuple( + title = _("Levels for Stratum "), + elements = [ + Integer(title = _("Warning if above")), + Integer(title = _("Critical if above")), + ]) + ), + ] + ), + None, + "first" +), register_check_parameters( subgroup_storage,

10 years

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014