Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 160902e8357811d49de824dfdf1aa62baf79e2d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=160902e8357811… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Nov 10 23:46:44 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Check man page for sni_octopuse_trunks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e344570753426ebceeaa21740395beafe163248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e344570753426… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 9 17:42:38 2012 +0100 Check man page for sni_octopuse_trunks --- checkman/sni_octopuse_trunks | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/checkman/sni_octopuse_trunks b/checkman/sni_octopuse_trunks new file mode 100644 index 0000000..94a1efe --- /dev/null +++ b/checkman/sni_octopuse_trunks @@ -0,0 +1,21 @@ +title: Siemens Octopus E trunk ports +agents: snmp +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check queries the status of trunk ports on local PBX + supporting the SNI-OCTOPUS-E Mib. + Most common example is the Siemens HiPath 3000 and 5000 series. + Using this check you should be able to be notified if your telco line has + failed. + Such a port can be either "active" or "inactive". + If a port switches to "inactive" the check will mark this port as {CRIT} + +inventory: + The check will inventorize a trunk port if two conditions are fulfilled. + The port must be named "S0 trunk: extern" and be in an active state at the + time of inventory. The check can easily be extended to handle other port + types. + A service named "Trunk port" including a slot/port ID is generated for + each port and used as the check item.

11 years, 7 months

Check_MK Git: check_mk: temp check backup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7cb160ff66adb9df76dbd176733b6886a1afc7a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb160ff66adb9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Nov 9 17:43:17 2012 +0100 temp check backup --- checks/sym_brightmail_queues | 104 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/checks/sym_brightmail_queues b/checks/sym_brightmail_queues new file mode 100644 index 0000000..ce0af81 --- /dev/null +++ b/checks/sym_brightmail_queues @@ -0,0 +1,104 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +#.1.3.6.1.4.1.393.200.130.2.1.2.1 = INTEGER: 1 +#.1.3.6.1.4.1.393.200.130.2.1.2.2 = INTEGER: 1 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.1 = INTEGER: 1 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.2 = INTEGER: 2 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.1.3 = INTEGER: 3 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.1 = STRING: "delivery" +#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.2 = STRING: "inbound" +#.1.3.6.1.4.1.393.200.130.2.2.1.1.2.3 = STRING: "outbound" +#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.1 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.2 = Gauge32: 1 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.3.3 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.1 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.2 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.4.3 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.1 = Gauge32: 4 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.2 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.5.3 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.1 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.2 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.6.3 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.1 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.2 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.7.3 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.1 = Gauge32: 5 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.2 = Gauge32: 0 +#.1.3.6.1.4.1.393.200.130.2.2.1.1.8.3 = Gauge32: 0 + + +brightmail_message_levels = { "deferredMessages" : (40, 100)} + +def inventory_sym_brightmail_queues(info): + inventory = [] + for line in info: + inventory.append((line[0], "brightmail_message_levels")) + return inventory + + +def check_sym_brightmail_queues(item, params, info): + + state = 0 + + for line in info: + if line[0] == item: + Connections, dataRate, deferredMessages, \ + messageRate, queueSize, queuedMessages = line[1:] + #for what in Connections, dataRate, deferredMessages, \ + #messageRate, queueSize, queuedMessages (): + warn, crit = params.get("deferredMessages") + val = int(deferredMessages) + if val > crit: + state = (max(state, 2)) + elif val > warn: + state = (max(state, 2)) + msg = "deferredMessages: %d" % val + return (state, nagios_state_names[state] +" - " + msg) + + + + return (3, "UNKW - Check not implemented") + + +check_info["sym_brightmail_queues"] = { + "check_function" : check_sym_brightmail_queues, + "inventory_function" : inventory_sym_brightmail_queues, + "service_description" : "Queue %s", + "has_perfdata" : False, + "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower() and oid(".1.3.6.1.4.1.393.200.130.2.1.2.1"), + "snmp_info" : (".1.3.6.1.4.1.393.200.130.2", [ + "2.1.1.2", # InstanceDescr + "2.1.1.3", # Connections + "2.1.1.4", # dataRate + "2.1.1.5", # deferedMessages + "2.1.1.6", # messageRate + "2.1.1.7", # queueSize + "2.1.1.8", # queuedMessages + ]) +}

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aad19be9cbdae79e3423bf06777a54a318ba2d57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aad19be9cbdae7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 9 15:21:55 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Added option for check_http wato config

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e09902d5667acfb171309ca1064275470a61236d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e09902d5667acf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 9 15:21:41 2012 +0100 Added option for check_http wato config --- checks/check_http | 4 ++++ web/plugins/wato/active_checks.py | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/checks/check_http b/checks/check_http index b392263..935591b 100644 --- a/checks/check_http +++ b/checks/check_http @@ -49,6 +49,10 @@ def check_http_arguments(params): if "cert_days" in settings: args += ' -C %d' % settings["cert_days"] + if "cert_host" in settings: + omit_ip = True + args += ' -I %s' % quote_shell_string(settings['cert_host']) + if settings.get("sni"): args += ' --sni' diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index b770b13..5bba69a 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -466,6 +466,14 @@ register_rule(group, unit = _("days"), ) ), + ( "cert_host", + TextAscii( + title = _("Check Cerficate on diffrent IP/ DNS Name"), + help = _("For each SSL cerficate on a host, a diffrent IP address is needed. " + "Here you can specify there address if it differs from the " + "address from the host primary address."), + ) + ), ], required_keys = [ "cert_days" ], ),

11 years, 7 months

Check_MK Git: check_mk: Try to fix problem in Event Console icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 838fc87d371678280d98ea764b7a4c6ccea6f23e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=838fc87d371678… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 15:17:58 2012 +0100 Try to fix problem in Event Console icon --- mkeventd/web/plugins/icons/mkeventd.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py index b87a5cc..fff175f 100644 --- a/mkeventd/web/plugins/icons/mkeventd.py +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -50,6 +50,13 @@ def paint_mkeventd(what, row, tags, custom_vars): return if len(args) >= 1: + # Handle -a and -H options. Sorry for the hack. We currently + # have no better idea + if args[0] == '-H': + args = args[2:] # skip two arguments + if args[0] == '-a': + args = args[1:] + if args[0] == '$HOSTNAME$': host = row['host_name'] elif args[0] == '$HOSTADDRESS$': @@ -79,6 +86,6 @@ def paint_mkeventd(what, row, tags, custom_vars): if mkeventd_enabled: multisite_icons.append({ - 'host_columns': [ 'address' ], + 'host_columns': [ 'address', 'name' ], 'paint': paint_mkeventd, })

11 years, 7 months

Check_MK Git: check_mk: New API for declaring WATO rules for own checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27017d2b506b52a656fe7abbd8c3f5d2d1bce454 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27017d2b506b52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 14:48:32 2012 +0100 New API for declaring WATO rules for own checks --- web/htdocs/wato.py | 59 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 58 +++------------------------------ 2 files changed, 65 insertions(+), 52 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cd017b5..946ab41 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10965,6 +10965,65 @@ def register_rule(group, varname, valuespec = None, title = None, g_rulespecs[varname] = ruleset +# Special version of register_rule, dedicated to checks. This is not really +# modular here, but we cannot put this function into the plugins file because +# the order is not defined there. +def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, matchtype, has_inventory=True): + # Register rule for inventorized checks + if valuespec and has_inventory: # would be useless rule if check has no parameters + itemenum = None + if itemspec: + itemtype = "item" + itemname = itemspec.title() + itemhelp = itemspec.help() + if isinstance(itemspec, DropdownChoice): + itemenum = itemspec._choices + else: + itemtype = None + itemname = None + itemhelp = None + + register_rule( + "checkparams/" + subgroup, + varname = "checkgroup_parameters:%s" % checkgroup, + title = title, + valuespec = valuespec, + itemtype = itemtype, itemname = itemname, + itemhelp = itemhelp, + itemenum = itemenum, + match = matchtype) + + # Register rule for static checks + elements = [ + CheckTypeGroupSelection( + checkgroup, + title = _("Checktype"), + help = _("Please choose the check plugin")) ] + if itemspec: + elements.append(itemspec) + if not valuespec: + valuespec =\ + FixedValue(None, + help = _("This check has no parameters."), + totext = "") + if not valuespec.title(): + valuespec._title = _("Parameters") + elements.append(valuespec) + + register_rule( + "static/" + subgroup, + "static_checks:%s" % checkgroup, + title = title, + valuespec = Tuple( + title = valuespec.title(), + elements = elements, + ), + match = "all") + + + + + # # User profile edit page # The user can edit the own profile diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5bbb432..08cbe12 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -144,7 +144,7 @@ register_rule(group + '/' + subgroup_applications, register_rule(group + '/' + subgroup_inventory, varname = "inventory_services_rules", - title = _('Windows Services'), + title = _("Windows Service Inventory"), valuespec = Dictionary( elements = [ ('services', ListOfStrings( @@ -178,7 +178,7 @@ register_rule(group + '/' + subgroup_inventory, register_rule(group + '/' + subgroup_inventory, varname = "inventory_processes_rules", - title = _('Processes'), + title = _('Process Inventory'), valuespec = Dictionary( elements = [ ('descr', TextAscii( @@ -2065,30 +2065,9 @@ checkgroups.append(( # Create rules for check parameters of inventorized checks for subgroup, checkgroup, title, valuespec, itemspec, matchtype in checkgroups: - if not valuespec: - continue # would be useles rule if check has no parameters - itemenum = None - if itemspec: - itemtype = "item" - itemname = itemspec.title() - itemhelp = itemspec.help() - if isinstance(itemspec, DropdownChoice): - itemenum = itemspec._choices - else: - itemtype = None - itemname = None - itemhelp = None - - register_rule( - group + "/" + subgroup, - varname = "checkgroup_parameters:%s" % checkgroup, - title = title, - valuespec = valuespec, - itemtype = itemtype, itemname = itemname, - itemhelp = itemhelp, - itemenum = itemenum, - match = matchtype) + register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, matchtype) +checkgroups = [] register_rule( group + "/" + subgroup_networking, @@ -2103,7 +2082,7 @@ register_rule( # Create Rules for static checks register_rulegroup("static", _("Manual Checks"), _("Statically configured Check_MK checks that do not rely on the inventory")) -group = "static" + # wmic_process does not support inventory at the moment checkgroups.append(( @@ -2192,31 +2171,6 @@ checkgroups.append(( "first")) - for subgroup, checkgroup, title, valuespec, itemspec, matchtype in checkgroups: - elements = [ - CheckTypeGroupSelection( - checkgroup, - title = _("Checktype"), - help = _("Please choose the check plugin")) ] - if itemspec: - elements.append(itemspec) - if not valuespec: - valuespec =\ - FixedValue(None, - help = _("This check has no parameters."), - totext = "") - if not valuespec.title(): - valuespec._title = _("Parameters") - elements.append(valuespec) - - register_rule( - group + "/" + subgroup, - "static_checks:%s" % checkgroup, - title = title, - valuespec = Tuple( - title = valuespec.title(), - elements = elements, - ), - match = "all") + register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, matchtype, False)

11 years, 7 months

Check_MK Git: check_mk: Ignore check_mk.ini for testing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b50ed15f7bc43735f1aae001971b90b849b63378 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b50ed15f7bc437… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 14:17:44 2012 +0100 Ignore check_mk.ini for testing --- agents/windows/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore new file mode 100644 index 0000000..697d0d9 --- /dev/null +++ b/agents/windows/.gitignore @@ -0,0 +1 @@ +check_mk.ini

11 years, 7 months

Check_MK Git: check_mk: winperf_phydisk: monitor average queue length for read/write

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c030746cd2ad4a3fc3d7bf6ccc00ea4e12db442 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c030746cd2ad4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 14:07:23 2012 +0100 winperf_phydisk: monitor average queue length for read/write --- ChangeLog | 1 + agents/windows/check_mk.example.ini | 2 +- checks/diskstat.include | 30 +++++++++++++++- checks/winperf_phydisk | 65 +++++++++++++++++++++------------ pnp-templates/check_mk-diskstat.php | 21 +++++++++-- web/plugins/wato/check_parameters.py | 24 ++++++++++++- 6 files changed, 112 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6c030746cd…

11 years, 7 months

Check_MK Git: check_mk: Fixed syntax error in check_mk.ini example

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a625b26327b8e8653e527c40ab69f83683b3933 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a625b26327b8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 9 11:38:28 2012 +0100 Fixed syntax error in check_mk.ini example --- agents/windows/check_mk.example.ini | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index dab8f1b..1b06229 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -28,13 +28,13 @@ # Set patterns for defined textfiles ok = Successfully logged in* crit = Error in* - warning = Unable to contact* + warn = Unable to contact* ignore = Backup * saved # Define additional textfiles with different patterns textfile = C:\tmp\memo.udf # Set patterns for defined textfile - warning = *overdue* + warn = *overdue* ok = *mail sent* [logwatch]

11 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012