Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4f729127daa30a58df05138224aea61a626c6659 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f729127daa30a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 10:55:17 2015 +0200 Edited werk --- .werks/1249 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1249 b/.werks/1249 index d1bd237..d0ec872 100644 --- a/.werks/1249 +++ b/.werks/1249 @@ -1,4 +1,4 @@ -Title: alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB +Title: alcatel_cpu, alcatel_temp, alcatel_fans: New checks for Alcatel switches based on IND1 MIB Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 03b742c..bb685eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,7 +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 + * 1249 alcatel_cpu, alcatel_temp, alcatel_fans: New checks for Alcatel switches based on IND1 MIB * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... * 1457 FIX: logins: new check renamed from "users" check...

9 years, 1 month

Check_MK Git: check_mk: Removed trailing spaces

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6e9b724eed545a5709fb1bee4db3e381acaf93ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9b724eed545a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 09:55:01 2015 +0200 Removed trailing spaces --- agents/windows/plugins/mssql.vbs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index bf58824..834eb7c 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -34,7 +34,7 @@ Sub addOutput(text) output = output & text & vbLf End Sub -' Dummy empty output. +' Dummy empty output. ' Contains timeout error if this scripts runtime exceeds the timeout WScript.echo "<<<mssql_versions>>>" @@ -49,12 +49,12 @@ If Err.Number <> 0 Then Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") If Err.Number <> 0 Then Err.Clear() - + ' try SQL Server 2008 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") If Err.Number <> 0 Then Err.Clear() - + ' try MSSQL < 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") If Err.Number <> 0 Then @@ -71,7 +71,7 @@ Set WMIservice = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\c For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ "SQLServiceType = 1 AND PropertyName = 'VERSION'") - + Set colRunningServices = WMIservice.ExecQuery("SELECT State FROM Win32_Service WHERE Name = '" & prop.ServiceName & "'") instId = Replace(prop.ServiceName, "$", "__") @@ -79,7 +79,7 @@ For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " instIdx = Replace(instId, "__", "_") addOutput( "<<<mssql_versions>>>" ) addOutput( instIdx & " " & instVersion ) - + ' Now query the server instance for the databases ' Use name as key and always empty value for the moment For Each objService In colRunningServices @@ -125,7 +125,7 @@ For Each instId In instIds.Keys 'WScript.echo (CONN) CONN.Open - + ' Get counter data for the whole instance RS.Open "SELECT counter_name, object_name, instance_name, cntr_value " & _ "FROM sys.dm_os_performance_counters " & _ @@ -140,11 +140,11 @@ For Each instId In instIds.Keys instanceName = "None" End If value = Trim(RS("cntr_value")) - addOutput( objectName & " " & counterName & " " & instanceName & " " & value ) + addOutput( objectName & " " & counterName & " " & instanceName & " " & value ) RS.MoveNext Loop RS.Close - + ' First only read all databases in this instance and save it to the db names dict RS.Open "EXEC sp_databases", CONN Dim x, dbName, dbNames @@ -152,10 +152,10 @@ For Each instId In instIds.Keys Do While NOT RS.Eof dbName = RS("DATABASE_NAME") dbNames.add dbName, "" - RS.MoveNext + RS.MoveNext Loop RS.Close - + ' Now gather the db size and unallocated space addOutput( "<<<mssql_tablespaces>>>" ) Dim i, dbSize, unallocated, reserved, data, indexSize, unused @@ -195,7 +195,7 @@ For Each instId In instIds.Keys data & " " & indexSize & " " & unused ) Set RS = CreateObject("ADODB.Recordset") Next - + ' Loop all databases to get the date of the last backup. Only show databases ' which have at least one backup Dim lastBackupDate @@ -213,7 +213,7 @@ For Each instId In instIds.Keys Loop RS.Close Next - + CONN.Close Next

9 years, 1 month

Check_MK Git: check_mk: alcatel_fans: New check to monitor fans on alcatel switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0ce732116d025c020dae3bbb417ca8c7609fb931 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce732116d025c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 26 10:53:40 2015 +0200 alcatel_fans: New check to monitor fans on alcatel switches --- checkman/alcatel_fans | 12 ++++++++++++ checks/alcatel_fans | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/checkman/alcatel_fans b/checkman/alcatel_fans new file mode 100644 index 0000000..e9e97eb --- /dev/null +++ b/checkman/alcatel_fans @@ -0,0 +1,12 @@ +title: Alcatel switches: Fan Status +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + This Check Monitors all Fans on Alcatel switches supporting the ALCATEL-IND1-CHASSIS-MIB. + The status is automaticly reported by the device, so no configuration is needed + +inventory: + One check is created for each fan + diff --git a/checks/alcatel_fans b/checks/alcatel_fans new file mode 100644 index 0000000..37dc370 --- /dev/null +++ b/checks/alcatel_fans @@ -0,0 +1,51 @@ +#!/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. + +def inventory_alcatel_fan(info): + for nr, value in enumerate(info, start=1): + yield nr, None + +def check_alcatel_fan(item, _no_params, info): + fan_states = { + 0 : "has no Status", + 1 : "Not running", + 2 : "Running", + } + for nr, value in enumerate(info, start=1): + if nr == item: + fan_state = int(value[0]) + state = 0 + if fan_state != 2: + state = 2 + return state, "Fan " + fan_states[fan_state] + +check_info["alcatel_fan"] = { + "check_function" : check_alcatel_fan, + "inventory_function" : inventory_alcatel_fan, + "service_description" : "Fan %s", + "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.11.1", [ 2 ]), +}

9 years, 1 month

Check_MK Git: check_mk: cisco_srst_call_legs manpage edited,

by Simon Betz

checks cisco_srst_state/call_legs improved Message-ID: <55642817.yzisSgMRwy6S1KaB%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b532bd4fe2111367cac28783d67f8967cde71fef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b532bd4fe21113… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 26 09:59:07 2015 +0200 cisco_srst_call_legs manpage edited, checks cisco_srst_state/call_legs improved --- checkman/cisco_srst_call_legs | 2 +- checks/cisco_srst_call_legs | 2 +- checks/cisco_srst_state | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checkman/cisco_srst_call_legs b/checkman/cisco_srst_call_legs index dfa662f..8fc985b 100644 --- a/checkman/cisco_srst_call_legs +++ b/checkman/cisco_srst_call_legs @@ -1,4 +1,4 @@ -title: Cisco Unified Survivable Remote Site Telephony (SRST): Active Call Legs +title: Cisco Unified Survivable Remote Site Telephony (SRST): Call Legs agents: snmp catalog: hw/network/cisco license: GPL diff --git a/checks/cisco_srst_call_legs b/checks/cisco_srst_call_legs index f2aabdc..f055ff9 100644 --- a/checks/cisco_srst_call_legs +++ b/checks/cisco_srst_call_legs @@ -31,7 +31,7 @@ def inventory_cisco_srst_call_legs(info): def check_cisco_srst_call_legs(_no_item, _no_params, info): call_legs = int(info[0][0]) - yield 0, "%d active call legs" % call_legs, [ ("call_legs", call_legs) ] + yield 0, "%d call legs routed through the Cisco device since going active" % call_legs, [ ("call_legs", call_legs) ] check_info['cisco_srst_call_legs'] = { diff --git a/checks/cisco_srst_state b/checks/cisco_srst_state index 50dd709..2023421 100644 --- a/checks/cisco_srst_state +++ b/checks/cisco_srst_state @@ -25,6 +25,11 @@ # Boston, MA 02110-1301 USA. +# 1.3.6.1.4.1.9.9.441.1.2.32.1.1 -> csrstAccessCodeType: 1, 2, 3, 4(pri) +# 1.3.6.1.4.1.9.9.441.1.2.32.1.2 -> csrstAccessCode: SnmpAdminString +# 1.3.6.1.4.1.9.9.441.1.2.32.1.3 -> csrstAccessCodeDIDEnabled TruthValue + + def inventory_cisco_srst_state(info): return [ (None, None) ]

9 years, 1 month

Check_MK Git: check_mk: Prepare for now magic movement button

by Mathias Kettner

Module: check_mk Branch: master Commit: a0c77b8a9ca1a06f074bfde19c8b922dbe07e9ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0c77b8a9ca1a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 25 08:25:40 2015 +0200 Prepare for now magic movement button --- web/htdocs/htmllib.py | 9 +++++++++ web/htdocs/images/button_magic_move_hi.png | Bin 0 -> 3399 bytes web/htdocs/images/button_magic_move_lo.png | Bin 0 -> 3465 bytes 3 files changed, 9 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e66d913..8d34682 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1570,6 +1570,15 @@ class html: def uploaded_file(self, varname, default = None): return self.uploads.get(varname, default) + def magic_move(self, helptext, ajax_url): + self.write('<img align=absmiddle class=iconbutton ' + 'src="images/button_magic_move_lo.png" ' + 'title="%s" ' + 'onmouseover="hilite_icon(this, 1)" ' + 'onmouseout="hilite_icon(this, 0)" ' + 'onclick="start_magic_move(\'%s\')" >' % ( + (helptext, ajax_url))) + # # Per request caching # diff --git a/web/htdocs/images/button_magic_move_hi.png b/web/htdocs/images/button_magic_move_hi.png new file mode 100644 index 0000000..440b2de Binary files /dev/null and b/web/htdocs/images/button_magic_move_hi.png differ diff --git a/web/htdocs/images/button_magic_move_lo.png b/web/htdocs/images/button_magic_move_lo.png new file mode 100644 index 0000000..88d5967 Binary files /dev/null and b/web/htdocs/images/button_magic_move_lo.png differ

9 years, 1 month

Check_MK Git: check_mk: Fixed recently introduced two exceptions in the GUI

by Mathias Kettner

Module: check_mk Branch: master Commit: 119d987fc126ccd241f54d4da30570d60ae7d399 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=119d987fc126cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 24 19:05:12 2015 +0200 Fixed recently introduced two exceptions in the GUI --- web/htdocs/views.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6feea46..5a56e0c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -984,11 +984,10 @@ def show_view(view, show_heading = False, show_buttons = True, 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 + 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 @@ -2136,9 +2135,7 @@ def url_to_view(row, view_name): url_vars.append(("display_options", do)) filename = html.mobile and "mobile_view.py" or "view.py" - uri = filename + "?" + html.urlencode_vars([("view_name", view_name)] + url_vars) - content = "<a href=\"%s\">%s</a>" % (uri, content) - return content + return filename + "?" + html.urlencode_vars([("view_name", view_name)] + url_vars) def link_to_view(content, row, view_name): if 'I' not in html.display_options:

9 years, 1 month

Check_MK Git: check_mk: #2300 New catalog of check plugins and manpages now available as a new WATO module

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a9177946ba437985384b6b7f5d5f65d4e735a3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a9177946ba437… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 24 13:54:37 2015 +0200 #2300 New catalog of check plugins and manpages now available as a new WATO module What now has a new module <i>Check Plugins</i> that is essentially a complete catalog of all check plugins that your installation has installed. It contains shipped plugins as well as locally installed ones (if they have a man page that is). >From the man pages you can directly jump to the according rule set for the parameters of the check. Also links to the manual page have been added in the new service command menu and in the WATO service list. --- .werks/2300 | 15 ++ ChangeLog | 1 + checkman/ad_replication | 2 +- checkman/emc_datadomain_fs | 2 +- checkman/innovaphone_channels | 2 +- checkman/innovaphone_cpu | 2 +- checkman/innovaphone_licenses | 2 +- checkman/innovaphone_mem | 2 +- checkman/innovaphone_priports_l1 | 11 +- checkman/innovaphone_priports_l2 | 9 +- checkman/innovaphone_temp | 3 +- checkman/nfsexports | 13 +- checkman/winperf_ts_sessions | 2 +- modules/automation.py | 54 +++++- modules/catalog.py | 59 +++--- modules/check_mk.py | 59 +++--- web/htdocs/images/button_check_plugins_hi.png | Bin 0 -> 2506 bytes web/htdocs/images/button_check_plugins_lo.png | Bin 0 -> 2981 bytes web/htdocs/images/icon_plugins_agentless.png | Bin 0 -> 4733 bytes web/htdocs/images/icon_plugins_app.png | Bin 0 -> 2696 bytes web/htdocs/images/icon_plugins_generic.png | Bin 0 -> 2981 bytes web/htdocs/images/icon_plugins_hw.png | Bin 0 -> 3021 bytes web/htdocs/images/icon_plugins_os.png | Bin 0 -> 13055 bytes web/htdocs/wato.css | 21 +++ web/htdocs/wato.py | 244 +++++++++++++++++++++++-- web/plugins/icons/builtin.py | 33 +++- web/plugins/wato/builtin_modules.py | 2 +- 27 files changed, 444 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a9177946b…

9 years, 1 month

Check_MK Git: check_mk: #2299 FIX Fixed search filter for check command when command was active

by Mathias Kettner

Module: check_mk Branch: master Commit: 150ecfb6460b4ef29f21b9c0de76ccbe252db6cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=150ecfb6460b4e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 24 13:50:42 2015 +0200 #2299 FIX Fixed search filter for check command when command was active This filter is e.g. contained in the view for searching services. When you searched for active checks (e.g. <tt>check_http</tt>) then the result was always empty because of the parameter of the check. This has been fixed. --- .werks/2299 | 12 ++++++++++++ ChangeLog | 3 ++- web/plugins/visuals/filters.py | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/2299 b/.werks/2299 new file mode 100644 index 0000000..fcedb7f --- /dev/null +++ b/.werks/2299 @@ -0,0 +1,12 @@ +Title: Fixed search filter for check command when command was active +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432468174 + +This filter is e.g. contained in the view for searching services. When you searched +for active checks (e.g. <tt>check_http</tt>) then the result was always empty because +of the parameter of the check. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 5e62791..aaa8d33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,9 +192,9 @@ * 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... - * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... * 1249 alcatel_cpu, alcatel_temp: New checks for Alcatel switches based on IND1 MIB * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB + * 2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls... * 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... @@ -459,6 +459,7 @@ * 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... + * 2299 FIX: Fixed search filter for check command when command was active... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 54fe5f3..004969b 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -341,9 +341,9 @@ class FilterQueryDropdown(Filter): return "" declare_filter(110, FilterQueryDropdown("host_check_command", _("Host check command"), "host", \ - "GET commands\nCache: reload\nColumns: name\n", "Filter: host_check_command = %s\n")) + "GET commands\nCache: reload\nColumns: name\n", "Filter: host_check_command ~ ^%s(!.*)?\n")) declare_filter(210, FilterQueryDropdown("check_command", _("Service check command"), "service", \ - "GET commands\nCache: reload\nColumns: name\n", "Filter: service_check_command = %s\n")) + "GET commands\nCache: reload\nColumns: name\n", "Filter: service_check_command ~ ^%s(!.*)?$\n")) class FilterServiceState(Filter): def __init__(self, name, title, prefix):

9 years, 1 month

Check_MK Git: check_mk: #2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5cbd0b5328a28fa6191e322e12063e4c7466555d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cbd0b5328a28f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri May 22 17:16:43 2015 +0200 #2215 pfsense_status, pfsense_if: Two new checks to monitor the interfaces and status of pfSense firewalls pfsense_status checks for the running status of pfSense firewalls, pfsense_if monitors the blocked packets on the interfaces. --- .werks/2215 | 10 ++++ ChangeLog | 1 + checkman/pfsense_if | 14 ++++++ checkman/pfsense_status | 11 +++++ checks/firewall_if.include | 57 ++++++++++++++++++++++ checks/pfsense_if | 52 ++++++++++++++++++++ checks/pfsense_status | 53 +++++++++++++++++++++ web/plugins/wato/check_parameters.py | 87 ++++++++++++++++++++++++++++++++++ 8 files changed, 285 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5cbd0b5328…

9 years, 1 month

Check_MK Git: check_mk: #1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 856952b6ff804275f6d7a978e6fbeebef50a053e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856952b6ff8042… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 22 14:24:24 2015 +0200 #1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB --- .werks/1250 | 9 +++++++ ChangeLog | 1 + checkman/alcatel_timetra_cpu | 13 ++++++++++ checks/alcatel_timetra_cpu | 57 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/.werks/1250 b/.werks/1250 new file mode 100644 index 0000000..837ba28 --- /dev/null +++ b/.werks/1250 @@ -0,0 +1,9 @@ +Title: alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432297428 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4dad318..f9d7856 100644 --- a/ChangeLog +++ b/ChangeLog @@ -193,6 +193,7 @@ * 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 + * 1250 alcatel_timetra_cpu: New CPU Check for Alcatel Switches supporting the TIMETRA 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_timetra_cpu b/checkman/alcatel_timetra_cpu new file mode 100644 index 0000000..0096920 --- /dev/null +++ b/checkman/alcatel_timetra_cpu @@ -0,0 +1,13 @@ +title: Alcatel switches: CPU utilization +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + This Checks Monitors the cpu utilization on Alcatel switchtes supporting the + TIMETRA-CHASSIS-MIB. The shown value is an anverage calculated by the device. + + +inventory: + One check is created + diff --git a/checks/alcatel_timetra_cpu b/checks/alcatel_timetra_cpu new file mode 100644 index 0000000..81dc259 --- /dev/null +++ b/checks/alcatel_timetra_cpu @@ -0,0 +1,57 @@ +#!/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. + +alcatel_timetra_cpu_default_levels = (90.0, 95.0) + +def inventory_alcatel_timetra_cpu(info): + return [(None, "alcatel_timetra_cpu_default_levels")] + +def check_alcatel_timetra_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_timetra_cpu"] = { + "check_function" : check_alcatel_timetra_cpu, + "inventory_function" : inventory_alcatel_timetra_cpu, + "service_description" : "CPU utilization", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: "TiMOS" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_info" : (".1.3.6.1.4.1.6527.3.1.2.1.1", [ 1 ]), + "group" : "cpu_utilization", + +} +

9 years, 1 month

← Newer
1
2
3
4
5
6
7
...
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