Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: #0657 diskstat: cluster support added for single disk modes

by Goetz Golla

Module: check_mk Branch: master Commit: 7ca603b30fbc2a7b00862df591c93e055297734a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca603b30fbc2a… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Sep 10 22:34:03 2014 +0200 #0657 diskstat: cluster support added for single disk modes --- .werks/657 | 8 +++++++ ChangeLog | 1 + checkman/diskstat | 15 +++++++++--- checks/diskstat | 56 +++++++++++++++++++++++++------------------ checks/diskstat.include | 61 +++++++++++++++++++++++++++++++---------------- 5 files changed, 94 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7ca603b30f…

10 years

Check_MK Git: check_mk: #1108 printer_io.include: included tray description in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 9fa9a33345f84d4fe480f7a38e302184fb4a70be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fa9a33345f84d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 10 16:59:36 2014 +0200 #1108 printer_io.include: included tray description in check output --- .werks/1108 | 9 +++++++++ ChangeLog | 1 + checks/printer_io.include | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/1108 b/.werks/1108 new file mode 100644 index 0000000..ccdbcc6 --- /dev/null +++ b/.werks/1108 @@ -0,0 +1,9 @@ +Title: printer_io.include: included tray description in check output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410361081 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bba41a1..aa93ea8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 1397 juniper_screenos_cpu, juniper_screenos_fan, juniper_screenos_mem, juniper_screenos_temp, juniper_screenos_vpn: new checks for Juniper ScreenOS Firewalls * 1106 mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available)... * 1107 windows agent: now sets additional environment variables... + * 1108 printer_io.include: included tray description in check output * 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/checks/printer_io.include b/checks/printer_io.include index fdfe3b9..56cee5c 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -97,6 +97,8 @@ def check_printer_io(item, params, info, what): if name == item or descr == item or index.split('.')[-1] == item: state_txt = [] state_state = 0 + + yield 0, descr if snmp_status == 0: state_txt.append(printer_io_states[0][1]) else:

10 years

Check_MK Git: check_mk: #1107 windows agent: now sets additional environment variables

by Andreas Boesl

Module: check_mk Branch: master Commit: 5b5d399fef1fcdad83b40e9465037fc0bc0efa5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b5d399fef1fcd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 10 11:34:14 2014 +0200 #1107 windows agent: now sets additional environment variables The agent now sets the following environment variables on startup. <ul> <li>PLUGINSDIR</li> <li>LOCALDIR</li> <li>SPOOLDIR</li> <li>MK_CONFDIR</li> </ul> These can be used in the local an plugin scripts. There is also a dynamic environment variable <tt>REMOTE_HOST</tt> available, representing the host ip of the current connection. --- .werks/1107 | 20 ++++++++++++++++++++ ChangeLog | 1 + 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.cc | 6 ++++++ agents/windows/check_mk_agent.exe | Bin 177664 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 177664 -> 178176 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 160015 -> 160065 bytes agents/windows/install_agent.exe | Bin 156898 -> 156986 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 12 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/1107 b/.werks/1107 new file mode 100644 index 0000000..46d393e --- /dev/null +++ b/.werks/1107 @@ -0,0 +1,20 @@ +Title: windows agent: now sets additional environment variables +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410341500 +Class: feature + +The agent now sets the following environment variables on startup. + +<ul> +<li>PLUGINSDIR</li> +<li>LOCALDIR</li> +<li>SPOOLDIR</li> +<li>MK_CONFDIR</li> +</ul> + +These can be used in the local an plugin scripts. There is also a dynamic +environment variable <tt>REMOTE_HOST</tt> available, representing the host ip +of the current connection. diff --git a/ChangeLog b/ChangeLog index 9243cf0..bba41a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 1183 bluecat_commandserver: New Check for bluecat adonis devices * 1397 juniper_screenos_cpu, juniper_screenos_fan, juniper_screenos_mem, juniper_screenos_temp, juniper_screenos_vpn: new checks for Juniper ScreenOS Firewalls * 1106 mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available)... + * 1107 windows agent: now sets additional environment variables... * 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/build_version b/agents/windows/build_version index 76a8b2b..8643cf6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -83 +89 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 29b7ad0..2262cd3 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 ef1e9a7..752375a 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 3f5439a..dd9569b 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4662,6 +4662,12 @@ void determine_directories() snprintf(g_local_dir, sizeof(g_local_dir), "%s\\local", g_agent_directory); snprintf(g_spool_dir, sizeof(g_spool_dir), "%s\\spool", g_agent_directory); snprintf(g_logwatch_statefile, sizeof(g_logwatch_statefile), "%s\\logstate.txt", g_agent_directory); + + // Set these directories as environment variables. Some scripts might use them... + SetEnvironmentVariable("PLUGINSDIR", g_plugins_dir); + SetEnvironmentVariable("LOCALDIR", g_local_dir); + SetEnvironmentVariable("SPOOLDIR", g_spool_dir); + SetEnvironmentVariable("MK_CONFDIR", g_agent_directory); } int get_counter_id_from_lang(const char *language, const char *counter_name) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 404846c..1ff882a 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 23ba18e..c27128f 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/crash.exe b/agents/windows/crash.exe index 812ff07..6b00559 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e7401e6..fc4de25 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 9dc0c7f..dff5540 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 86c3c0c..52f5a52 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years

Check_MK Git: check_mk: #1106 mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available)

by Andreas Boesl

Module: check_mk Branch: master Commit: 6029f50b23d32685b3b2c0686605e3848fce45f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6029f50b23d326… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 10 11:29:55 2014 +0200 #1106 mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available) The mk_inventory.ps1 needs to create statefile for each host. The path of this files were hardcoded to <tt>c:\Program Files (x86)\check_mk\timestamp.$remote_host</tt><br> This has been changed. The latest check_mk agent now provides additional environment variables <ul> <li>PLUGINSDIR</li> <li>LOCALDIR</li> <li>SPOOLDIR</li> <li>MK_CONFDIR</li> </ul> and the script uses them accordingly. --- .werks/1106 | 20 ++++++++++++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 10 +++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.werks/1106 b/.werks/1106 new file mode 100644 index 0000000..e85b4f3 --- /dev/null +++ b/.werks/1106 @@ -0,0 +1,20 @@ +Title: mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410341164 +Class: feature + +The mk_inventory.ps1 needs to create statefile for each host. +The path of this files were hardcoded to <tt>c:\Program Files (x86)\check_mk\timestamp.$remote_host</tt><br> +This has been changed. The latest check_mk agent now provides additional environment variables + +<ul> +<li>PLUGINSDIR</li> +<li>LOCALDIR</li> +<li>SPOOLDIR</li> +<li>MK_CONFDIR</li> +</ul> + +and the script uses them accordingly. diff --git a/ChangeLog b/ChangeLog index 96f13f2..9243cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * 1182 bluecat_ha: New Check for HA Status on Bluecat Adonis devices * 1183 bluecat_commandserver: New Check for bluecat adonis devices * 1397 juniper_screenos_cpu, juniper_screenos_fan, juniper_screenos_mem, juniper_screenos_temp, juniper_screenos_vpn: new checks for Juniper ScreenOS Firewalls + * 1106 mk_inventory.ps1: now uses the MK_CONFDIR environment variable from the agent (if available)... * 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/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 97b8b3d..53f76f2 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -4,7 +4,15 @@ $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp $remote_host = $env:REMOTE_HOST -$timestamp = "c:\Program Files (x86)\check_mk\timestamp.$remote_host" +$agent_dir = $env:MK_CONFDIR + +# Fallback if the (old) agent does not provide the MK_CONFDIR +if (!$agent_dir) { + $agent_dir = "c:\Program Files (x86)\check_mk" +} + +$timestamp = $agent_dir + "\timestamp."+ $remote_host + # execute agent only every $delay seconds $delay = 14400

10 years

Check_MK Git: check_mk: bluecat_dns_queries: Added counters

by Bastian Kuhn

Module: check_mk Branch: master Commit: 514bd4e26b45b8dce6a4c510ad2224b89054e27c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=514bd4e26b45b8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 9 16:54:47 2014 +0200 bluecat_dns_queries: Added counters --- checks/bluecat_dns_queries | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/checks/bluecat_dns_queries b/checks/bluecat_dns_queries index 242b319..7bb1d9b 100644 --- a/checks/bluecat_dns_queries +++ b/checks/bluecat_dns_queries @@ -34,8 +34,18 @@ def inventory_bluecat_dns_queries(info): def check_bluecat_dns_queries(item, _no_params, info): value_names = [ 'Success', 'Referral', 'NXRSet', 'NXDomain', 'Recursion', 'Failure' ] - for value, name in zip(info[0], value_names): - yield 0, "%s: %s" % (name, value), [ ( name, value )] + wrapped = False + now = time.time() + 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 )] + except MKCounterWrapped: + wrapped = True + if wrapped: + raise MKCounterWrapped(None, "") + + check_info["bluecat_dns_queries"] = { "check_function" : check_bluecat_dns_queries,

10 years

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

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

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

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

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

← Newer
1
...
9
10
11
12
13
14
15
...
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