Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: RBN: option for matching the plugin output

by Mathias Kettner

Module: check_mk Branch: master Commit: e073632d283e3323c92b95d16f126521594f632c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e073632d283e33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 28 10:29:10 2014 +0100 RBN: option for matching the plugin output --- modules/notify.py | 14 ++++++++++++++ web/htdocs/wato.py | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 49bfd4d..b8c2c75 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1016,6 +1016,7 @@ def rbn_match_rule(rule, context): rbn_match_exclude_hosts(rule, context) or \ rbn_match_services(rule, context) or \ rbn_match_exclude_services(rule, context) or \ + rbn_match_plugin_output(rule, context) or \ rbn_match_checktype(rule, context) or \ rbn_match_timeperiod(rule) or \ rbn_match_escalation(rule, context) or \ @@ -1063,6 +1064,19 @@ def rbn_match_exclude_services(rule, context): return "The service's description '%s' matches the list of excluded services" \ % context["SERVICEDESC"] +def rbn_match_plugin_output(rule, context): + if "match_plugin_output" in rule: + r = regex(rule["match_plugin_output"]) + + if context["WHAT"] == "SERVICE": + output = context["SERVICEOUTPUT"] + else: + output = context["HOSTOUTPUT"] + if not r.search(output): + return "The expression '%s' cannot be found in the plugin output '%s'" % \ + (rule["match_plugin_output"], output) + + def rbn_match_checktype(rule, context): if "match_checktype" in rule: if context["WHAT"] != "SERVICE": diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 393fb03..ef2860c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7486,6 +7486,13 @@ def vs_notification_rule(userid = None): orientation = "horizontal", ) ), + ( "match_plugin_output", + RegExp( + title = _("Match the output of the check plugin"), + help = _("This text is a regular expression that is being searched in the output " + "of the check plugins that produced the alert. It is not a prefix but an infix match."), + ), + ), ( "match_checktype", CheckTypeSelection( title = _("Match the following check types"), @@ -7619,6 +7626,7 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_hosttags", "match_hosts", "match_exclude_hosts", "match_services", "match_exclude_services", + "match_plugin_output", "match_timeperiod", "match_escalation", "match_sl", "match_host_event", "match_service_event", "match_checktype", "contact_contacts", "contact_groups", "contact_emails" ], headers = [ @@ -7627,7 +7635,7 @@ def vs_notification_rule(userid = None): + contact_headers + [ ( _("Conditions"), [ "match_hosttags", "match_hosts", "match_exclude_hosts", - "match_services", "match_exclude_services", + "match_services", "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", "match_escalation", "match_sl", "match_host_event", "match_service_event" ] ), ], @@ -7891,7 +7899,10 @@ def mode_notifications(phase): table.cell(css="buttons") analyse_url = html.makeuri([("analyse", str(nr))]) - html.icon_button(analyse_url, _("Anaylse ruleset with this notification"), "analyze") + context = entry.items() + context.sort() + tooltip = "".join("%s: %s\n" % e for e in context) + html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n" + tooltip), "analyze") replay_url = html.makeactionuri([("_replay", str(nr))]) html.icon_button(replay_url, _("Replay this notification, send it again!"), "replay") if html.var("analyse") and nr == int(html.var("analyse")):

10 years, 6 months

Check_MK Git: check_mk: RBN: Show user rules in global rule configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 8574008d2ff77ae11cd750b8c823acdd59c8242f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8574008d2ff77a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 28 10:16:32 2014 +0100 RBN: Show user rules in global rule configuration --- modules/notify.py | 9 ++- web/htdocs/wato.py | 185 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 124 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8574008d2f…

10 years, 6 months

Check_MK Git: check_mk: windows_os_bonding, bonding.include:

by Bernd Stroessenreuther

minor code cleanups Message-ID: <53103cf5.JFA7WOUhSGOor8SE%bs(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 TW9kdWxlOiBjaGVja19tawpCcmFuY2g6IG1hc3RlcgpDb21taXQ6IDFjNmZiYjQ1YTIyMWMz YTZlMTM4ZmUxNTFiMzhiOWE4NDhmOTM2ZjUKVVJMOiAgICBodHRwOi8vZ2l0Lm1hdGhpYXMt a2V0dG5lci5kZS9naXQvP3A9Y2hlY2tfbWsuZ2l0O2E9Y29tbWl0O2g9MWM2ZmJiNDVhMjIx YzNhNmUxMzhmZTE1MWIzOGI5YTg0OGY5MzZmNQoKQXV0aG9yOiBCZXJuZCBTdHJvZXNzZW5y ZXV0aGVyIDxic0BtYXRoaWFzLWtldHRuZXIuZGU+CkRhdGU6ICAgRnJpIEZlYiAyOCAwODoz Nzo1OSAyMDE0ICswMTAwCgp3aW5kb3dzX29zX2JvbmRpbmcsIGJvbmRpbmcuaW5jbHVkZTog bWlub3IgY29kZSBjbGVhbnVwcwoKLS0tCgogYWdlbnRzL3dpbmRvd3MvcGx1Z2lucy93aW5k b3dzX29zX2JvbmRpbmcucHMxIHwgICAgOSArKystLS0tLS0KIGNoZWNrcy9ib25kaW5nLmlu Y2x1ZGUgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDYgKystLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv YWdlbnRzL3dpbmRvd3MvcGx1Z2lucy93aW5kb3dzX29zX2JvbmRpbmcucHMxIGIvYWdlbnRz L3dpbmRvd3MvcGx1Z2lucy93aW5kb3dzX29zX2JvbmRpbmcucHMxCmluZGV4IDNiMjNjZmEu LjI2ZGQxOWYgMTAwNjQ0Ci0tLSBhL2FnZW50cy93aW5kb3dzL3BsdWdpbnMvd2luZG93c19v c19ib25kaW5nLnBzMQorKysgYi9hZ2VudHMvd2luZG93cy9wbHVnaW5zL3dpbmRvd3Nfb3Nf Ym9uZGluZy5wczEKQEAgLTEsMTIgKzEsMTAgQEAKLe+7vyMgQ2hhbmdlbG9nOiAJdjAuMDIJ UmVhcnJhbmdlZCBpbmZvDQotIwkJCQl2MC4wMwlJbmNsdWRlZCB0cnkgYmxvY2sgZm9yIG9s ZGVyIG9wZXJhdGluZyBzeXN0ZW1zDQotIwkJCQl2MC4wNAlBZGRlZCBzcGVlZCBpbmZvDQot Iw0KK++7vyMgeW91IG5lZWQgdGhpcyBhZ2VudCBwbHVnaW4gaWYgeW91IHdhbnQgdG8gbW9u aXRvciBib25kaW5nIGludGVyZmFjZXMNCisjIG9uIHdpbmRvd3MgY29uZmlndXJlZCBvbiBv cGVyYXRpbmcgc3lzdGVtIGxldmVsDQogDQogdHJ5IHsNCiAJJHRlYW1zID0gR2V0LU5ldExi Zm9UZWFtDQogfSBjYXRjaCB7fQ0KLWlmICgkdGVhbXMpew0KK2lmICgkdGVhbXMpIHsNCiAJ V3JpdGUtSG9zdCAiPDw8d2luZG93c19vc19ib25kaW5nOnNlcCg1OCk+Pj4iDQogCWZvcmVh Y2ggKCR0ZWFtIGluICR0ZWFtcyl7DQogCQlXcml0ZS1Ib3N0IFRlYW0gTmFtZTogJHRlYW0u TmFtZQ0KQEAgLTI1LDQgKzIzLDMgQEAgaWYgKCR0ZWFtcyl7CiAJCX0NCiAJfQ0KIH0NCi0N CmRpZmYgLS1naXQgYS9jaGVja3MvYm9uZGluZy5pbmNsdWRlIGIvY2hlY2tzL2JvbmRpbmcu aW5jbHVkZQppbmRleCA2YjljYWFhLi5mNzE2NzUwIDEwMDY0NAotLS0gYS9jaGVja3MvYm9u ZGluZy5pbmNsdWRlCisrKyBiL2NoZWNrcy9ib25kaW5nLmluY2x1ZGUKQEAgLTc0LDEzICs3 NCwxMSBAQCBkZWYgY2hlY2tfYm9uZGluZyhpdGVtLCBwYXJhbXMsIHBhcnNlZCk6CiAgICAg ICAgICAgICBpZiBleHBlY3RlZF9hY3RpdmUgIT0gTm9uZSBhbmQgZXhwZWN0ZWRfYWN0aXZl ICE9IGFjdGl2ZToKICAgICAgICAgICAgICAgICBpbmZvc1stMV0gKz0gIighKSIKICAgICAg ICAgICAgICAgICBpbmZvcy5hcHBlbmQoImV4cGVjdGVkIGlzICVzIiAlIGV4cGVjdGVkX2Fj dGl2ZSkKLSAgICAgICAgICAgICAgICBzdGF0ZSA9IDEgCisgICAgICAgICAgICAgICAgc3Rh dGUgPSAxCiAKICAgICBpbmZvcy5hcHBlbmQoImJvbmQgc3RhdHVzOiAiICsgc3RhdHVzWyJz dGF0dXMiXSkKICAgICBpZiBzdGF0dXNbInN0YXR1cyJdICE9ICJ1cCI6CiAgICAgICAgIGlu Zm9zWy0xXSArPSAiKCEpIgotICAgICAgICBzdGF0ZSA9IDEgCisgICAgICAgIHN0YXRlID0g MQogCiAgICAgcmV0dXJuIHN0YXRlLCAiLCAiLmpvaW4oaW5mb3MpCi0KLQoK

10 years, 6 months

Check_MK Git: check_mk: RBN: Implement notification analysis

by Mathias Kettner

Module: check_mk Branch: master Commit: 95724e01384fdb9559c8e7ab9657173745f53cba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95724e01384fdb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 27 17:58:06 2014 +0100 RBN: Implement notification analysis --- doc/drafts/README.rule_based_notifications | 58 +++++---- modules/automation.py | 11 ++ modules/notify.py | 194 ++++++++++++++++++++-------- web/htdocs/images/button_replay_hi.png | Bin 0 -> 2290 bytes web/htdocs/images/button_replay_lo.png | Bin 0 -> 2545 bytes web/htdocs/wato.py | 167 +++++++++++++++++------- web/plugins/wato/globals_notification.py | 17 ++- 7 files changed, 317 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=95724e0138…

10 years, 6 months

Check_MK Git: check_mk: refined new host regex functions

by Bastian Kuhn

Module: check_mk Branch: master Commit: aeb8ab49a281cd92b27b2ee8a921f4abf179238d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb8ab49a281cd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 27 17:37:25 2014 +0100 refined new host regex functions --- modules/check_mk.py | 2 +- web/htdocs/wato.py | 41 ++++++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ecc44f1..aa6de5b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1871,7 +1871,7 @@ def in_extraconf_hostlist(hostlist, hostname): if not use_regex and hostname == hostentry: return not negate # Handle Regex - elif re.match(regex(hostentry), hostname): + elif regex(hostentry).match(hostname): return not negate except MKGeneralException: if opt_debug: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index da25b56..5838983 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12730,21 +12730,44 @@ def parse_rule(ruleset, orig_rule): raise MKGeneralException(_("Invalid rule <tt>%s</tt>") % (orig_rule,)) - def rule_matches_host_and_item(rulespec, tag_specs, host_list, item_list, rule_folder, host_folder, hostname, item): reasons = [] host = host_folder[".hosts"][hostname] hostname_match = False + negate = False + regex_match = False + + for check_host in host_list: + if hostname == check_host: + hostname_match = True + break + else: + if check_host[0] == '!': + check_host = check_host[1:] + negate = True + if check_host[0] == '~': + check_host = check_host[1:] + regex_match = True + + if not regex_match and hostname == check_host: + if negate: + break + hostname_match = True + break + elif regex_match and regex(check_host).match(hostname): + if negate: + break + hostname_match = True + break + + # No Match until now, but negate, so thats a match + if negate: + hostname_match = True + break - if not ( - (hostname in host_list) - or - (("!"+hostname) not in host_list - and len(host_list) > 0 - and host_list[-1] == ALL_HOSTS[0]) - or len([ x for x in host_list if x.startswith('~') and re.match(x[1:], hostname) ]) > 0): - reasons.append(_("The host name does not match.")) + if not hostname_match: + reasons.append(_("The host name does not match.")) tags_match = True for tag in tag_specs:

10 years, 6 months

Check_MK Git: check_mk: Fixed creation of RPM package ( was due to new inventory)

by Mathias Kettner

Module: check_mk Branch: master Commit: bc8e96d5d234104dc096a74442cebadfe97e6ff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc8e96d5d23410… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 27 16:59:32 2014 +0100 Fixed creation of RPM package (was due to new inventory) --- check_mk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/check_mk.spec b/check_mk.spec index 72f6f4b..667321a 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -169,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/check_mk/agents /usr/share/check_mk/checks /usr/share/check_mk/notifications +/usr/share/check_mk/inventory /usr/share/check_mk/modules /usr/share/check_mk/pnp-templates/* /usr/share/check_mk/check_mk_templates.cfg

10 years, 6 months

Check_MK Git: check_mk: windows_os_bonding: new check for bonding interfaces on windows

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b8c8a06817cf7ad96d99c6710f5e5fd671323b70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8c8a06817cf7a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Feb 27 16:11:10 2014 +0100 windows_os_bonding: new check for bonding interfaces on windows new check for bonding interfaces on windows configured on operating system level --- .werks/704 | 9 +++ ChangeLog | 1 + agents/windows/plugins/windows_os_bonding.ps1 | 28 +++++++++ checkman/windows_os_bonding | 28 +++++++++ checks/bonding.include | 11 +++- checks/windows_os_bonding | 77 +++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 3 deletions(-) diff --git a/.werks/704 b/.werks/704 new file mode 100644 index 0000000..e103909 --- /dev/null +++ b/.werks/704 @@ -0,0 +1,9 @@ +Title: windows_os_bonding: new check for bonding interfaces on windows +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1393513807 +Class: feature + +new check for bonding interfaces on windows configured on operating system +level diff --git a/ChangeLog b/ChangeLog index 64d651f..e00ed5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 0560 check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing... * 0702 Rule for checking agents for wanted version... * 0586 rmon_stats: new snmp check to gather network traffic statistics on RMON enabled network interfaces + * 0704 windows_os_bonding: new check for bonding interfaces on windows... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/agents/windows/plugins/windows_os_bonding.ps1 b/agents/windows/plugins/windows_os_bonding.ps1 new file mode 100644 index 0000000..3b23cfa --- /dev/null +++ b/agents/windows/plugins/windows_os_bonding.ps1 @@ -0,0 +1,28 @@ +# Changelog: v0.02 Rearranged info +# v0.03 Included try block for older operating systems +# v0.04 Added speed info +# + +try { + $teams = Get-NetLbfoTeam +} catch {} +if ($teams){ + Write-Host "<<<windows_os_bonding:sep(58)>>>" + foreach ($team in $teams){ + Write-Host Team Name: $team.Name + Write-Host Bonding Mode: $team.LoadBalancingAlgorithm + Write-Host Status: $team.Status + $bondspeed = (Get-NetAdapter | where {$_.InterfaceDescription -match "Multiplex"}).LinkSpeed + Write-Host Speed: $bondspeed `n + foreach ($slave in $team.members){ + Write-Host Slave Name: $slave + $net = Get-Netadapter $slave + Write-Host Slave Interface: $net.ifName + Write-Host Slave Description: $net.interfaceDescription + Write-Host Slave Status: $net.Status + Write-Host Slave Speed: $net.LinkSpeed + Write-Host Slave MAC address: $net.MacAddress `n + } + } +} + diff --git a/checkman/windows_os_bonding b/checkman/windows_os_bonding new file mode 100644 index 0000000..0bd182e --- /dev/null +++ b/checkman/windows_os_bonding @@ -0,0 +1,28 @@ +title: Bonding Network Interface on Windows (Operating System Level) +agents: windows +catalog: os/networking +license: GPL +distribution: check_mk +description: + Checks the current state of a Windows bonding interface + (configured on operating system level). + If the total bonding state of the interface is down, then the + check returns {CRIT}, for status degraded it returns {WARN}. + If at least one slave interface is down or not the expected slave + is currently active, then the check gets {WARN}. + + For this check to work you need to install the agent plugin + windows_os_bonding.ps1 on the target machine. + + Since the check uses the same check logic as lnx_bonding, please + refer to lnx_bonding check manpage vor examples and parameters. + +item: + The team name of the bonding interface. + +inventory: + One check will be created for every bonding interface found in state + up or degraded. + +[parameters] +parameters (dict): see lnx_bonding check manpage. diff --git a/checks/bonding.include b/checks/bonding.include index 9a1048b..6b9caaa 100644 --- a/checks/bonding.include +++ b/checks/bonding.include @@ -27,7 +27,7 @@ def inventory_bonding(parsed): inventory = [] for bond, status in parsed.items(): - if status["status"] == "up": + if status["status"] in ("up", "degraded"): # If no information about primary interface is available # then assume currently active one as primary if "primary" not in status and "active" in status: @@ -42,7 +42,7 @@ def check_bonding(item, params, parsed): if item not in parsed: return (3, "no such bonding interface") status = parsed[item] - if status["status"] != "up": + if status["status"] not in ("up", "degraded"): return 2, "interface is " + status["status"] infos = [ "mode: " + status["mode"] ] @@ -74,7 +74,12 @@ def check_bonding(item, params, parsed): if expected_active != None and expected_active != active: infos[-1] += "(!)" infos.append("expected is %s" % expected_active) - state = 1 + state = 1 + + infos.append("bond status: " + status["status"]) + if status["status"] != "up": + infos[-1] += "(!)" + state = 1 return state, ", ".join(infos) diff --git a/checks/windows_os_bonding b/checks/windows_os_bonding new file mode 100644 index 0000000..d2265c6 --- /dev/null +++ b/checks/windows_os_bonding @@ -0,0 +1,77 @@ +#!/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. + +# <<<windows_os_bonding:sep(58)>>> +# Team Name: LAN +# Bonding Mode: Dynamic +# Status: Up +# Speed: 20 Gbps +# +# Slave Name: NIC1 +# Slave Interface: Ethernet_14 +# Slave Description: Intel(R) Ethernet 10G 2P X520-k bNDC #2 +# Slave Status: Up +# Slave Speed: 10 Gbps +# Slave MAC address: 18-A9-9B-9F-AD-28 +# +# Slave Name: NIC2 +# Slave Interface: Ethernet_10 +# Slave Description: Intel(R) Ethernet 10G 2P X520-k bNDC +# Slave Status: Up +# Slave Speed: 10 Gbps +# Slave MAC address: 18-A9-9B-9F-AD-2A + +def parse_windows_os_bonding(info): + bonds = {} + + for line in info: + if len(line)>1: + line[1] = re.sub("^ +", "", line[1]) + if line[0] == "Team Name": + bond = line[1] + bonds[bond] = {} + bonds[bond]["interfaces"] = {} + elif line[0] == "Bonding Mode": + bonds[bond]["mode"] = line[1] + elif line[0] == "Status": + bonds[bond]["status"] = line[1].lower() + elif line[0] == "Slave Interface": + slave = line[1] + bonds[bond]["interfaces"][slave] = {} + elif line[0] == "Slave Status": + bonds[bond]["interfaces"][slave]["status"] = line[1].lower() + elif line[0] == "Slave MAC address": + bonds[bond]["interfaces"][slave]["hwaddr"] = line[1].lower().replace("-", ":") + return bonds + + +check_info['windows_os_bonding'] = { + "check_function" : lambda item,params,info: check_bonding(item, params, parse_windows_os_bonding(info)), + "inventory_function" : lambda info: inventory_bonding(parse_windows_os_bonding(info)), + "service_description" : "Bonding Interface %s", + "group" : "bonding", + "includes" : [ "bonding.include" ], +}

10 years, 6 months

Check_MK Git: check_mk: check_mk.py: Added regex cache

by Bastian Kuhn

Module: check_mk Branch: master Commit: ae1d167da333523d04ecd5a74e815fcc1edc66c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae1d167da33352… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 27 15:36:58 2014 +0100 check_mk.py: Added regex cache --- modules/check_mk.py | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6df7f77..ecc44f1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -652,6 +652,18 @@ def agent_target_version(hostname): else: return agent_target_versions[0] +regex_cache = {} +def regex(r): + rx = regex_cache.get(r) + if rx: + return rx + try: + rx = re.compile(r) + except Exception, e: + raise MKGeneralException("Invalid regular expression '%s': %s" % (r, e)) + regex_cache[r] = rx + return rx + #. # .--SNMP----------------------------------------------------------------. # | ____ _ _ __ __ ____ | @@ -1834,7 +1846,7 @@ def in_extraconf_hostlist(hostlist, hostname): if len(hostentry) == 0: raise MKGeneralException('Empty hostname in host list %r' % hostlist) negate = False - regex = False + use_regex = False if hostentry[0] == '@': if hostentry == '@all': return True @@ -1852,14 +1864,18 @@ def in_extraconf_hostlist(hostlist, hostname): # Allow regex with prefix '~' if hostentry[0] == '~': hostentry = hostentry[1:] - regex = True + use_regex = True hostentry = strip_tags(hostentry) - if not regex and hostname == hostentry: - return not negate - # Handle Regex - elif re.match(hostentry, hostname): - return not negate + try: + if not use_regex and hostname == hostentry: + return not negate + # Handle Regex + elif re.match(regex(hostentry), hostname): + return not negate + except MKGeneralException: + if opt_debug: + raise return False

10 years, 6 months

Check_MK Git: check_mk: untabified paint_check_manpage function.

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f333a817732dece720f0f5038e31f4d76fa6905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f333a817732de… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 27 15:04:04 2014 +0100 untabified paint_check_manpage function. also replaced < and > in the manpage description with its html pendants. --- web/plugins/views/painters.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 60ebbcd..83d774b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -712,7 +712,7 @@ multisite_painters["svc_pnpgraph" ] = { def paint_check_manpage(row): command = row["service_check_command"] if not command.startswith("check_mk-"): - return "", "" + return "", "" checktype = command[9:] # Honor man-pages in OMD's local structure p = None @@ -723,23 +723,23 @@ def paint_check_manpage(row): if not p: p = defaults.check_manpages_dir + "/" + checktype if os.path.isfile(p): - description = None - for line in file(p): - line = line.rstrip() - if line == "description:": - description = "" - elif line.strip() == "" and description != None: - description += "" - elif not line.startswith(' ') and line[-1] == ':': - break - elif description != None: - description += " " + line - if not description: - return "", "" - else: - return "", description.replace("{", "").replace("}", "") + description = None + for line in file(p): + line = line.rstrip() + if line == "description:": + description = "" + elif line.strip() == "" and description != None: + description += "" + elif not line.startswith(' ') and line[-1] == ':': + break + elif description != None: + description += " " + line.replace("<", "<").replace(">", ">") + if not description: + return "", "" + else: + return "", description.replace("{", "").replace("}", "") else: - return "", _("Man-Page: %s not found.") % p + return "", _("Man-Page: %s not found.") % p multisite_painters["check_manpage"] = { "title" : _("Check manual (for Check_MK based checks)"),

10 years, 6 months

Check_MK Git: check_mk: Fix new regex feature in hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: f282f3d808148024fe85796553a036196ddab453 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f282f3d8081480… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 27 13:53:36 2014 +0100 Fix new regex feature in hosts --- modules/check_mk.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 22b2d31..6df7f77 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1845,20 +1845,21 @@ def in_extraconf_hostlist(hostlist, hostname): return True # Allow negation of hostentry with prefix '!' - elif hostentry[0] == '!': - hostentry = hostentry[1:] - negate = True - # Allow regex with prefix '~' - elif hostentry[0] == '~': - hostentry = hostentry[1:] - regex = True + else: + if hostentry[0] == '!': + hostentry = hostentry[1:] + negate = True + # Allow regex with prefix '~' + if hostentry[0] == '~': + hostentry = hostentry[1:] + regex = True hostentry = strip_tags(hostentry) if not regex and hostname == hostentry: return not negate # Handle Regex elif re.match(hostentry, hostname): - return True + return not negate return False

10 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014