Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

5737 FIX cmk -M now handles missing man pages in a more user friendly way

by Lars Michelsen

Module: check_mk Branch: master Commit: 5069b115b2155231d1ffb32bf6bc48283ff859c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5069b115b21552… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 08:29:07 2018 +0100 5737 FIX cmk -M now handles missing man pages in a more user friendly way Change-Id: I66a5b4a4ad9a2cab1e5d8459c4135588cd3b0759 --- .werks/5737 | 10 ++++++++++ cmk/man_pages.py | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/5737 b/.werks/5737 new file mode 100644 index 0000000..0a23d44 --- /dev/null +++ b/.werks/5737 @@ -0,0 +1,10 @@ +Title: cmk -M now handles missing man pages in a more user friendly way +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1519025318 +Class: fix + + diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 99779dc..45c50e4 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -555,8 +555,7 @@ class ManPageRenderer(object): def _load(self): self.man_page = load_man_page(self.name) if not self.man_page: - sys.stdout.write("ERROR: No manpage for %s. Sorry.\n" % self.name) - return + raise MKGeneralException("No manpage for %s. Sorry.\n" % self.name) def paint(self):

6 years, 7 months

Use traditional command substitution syntax, fixing a syntax error on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 787c62fa3b48e223eba1eba7c1ecd20dccb0cd3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787c62fa3b48e2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 19 08:24:29 2018 +0100 Use traditional command substitution syntax, fixing a syntax error on the way. Change-Id: I8f5c7a77fbb15d4fe7208df1a4b2d3a2d09696d3 --- agents/mk-job.solaris | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/mk-job.solaris b/agents/mk-job.solaris index e887253..b389477 100755 --- a/agents/mk-job.solaris +++ b/agents/mk-job.solaris @@ -42,7 +42,7 @@ if [ $# -lt 2 ]; then exit 1 fi -MYSELF=$(id | awk -F')' '{print $1}' | awk -F'(' '{print $2}') +MYSELF=`id | awk -F')' '{print $1}' | awk -F'(' '{print $2}'` OUTPUT_PATH=$MK_VARDIR/job/$MYSELF IDENT=$1 shift @@ -63,10 +63,10 @@ if ! type $1 >/dev/null 2>&1; then fi -echo "start_time $(perl -e 'print time')" > "$OUTPUT_PATH/$IDENT.running" +echo "start_time `perl -e 'print time'`" > "$OUTPUT_PATH/$IDENT.running" -info=$((/usr/bin/time -p sh -c "$@ 2>/dev/null 1>&2" 2>&1; echo $?) | sed -e 's/,/\./g'); -RC=$(echo $info | awk '{print $7}') +info=`(/usr/bin/time -p sh -c "$@ 2>/dev/null 1>&2" 2>&1; echo $?) | sed -e 's/,/\./g'` +RC=`echo $info | awk '{print $7}'` (echo $info | awk '{print "exit_code "$7"\nreal_time "$2"\nuser_time "$4"\nsystem_time "$6""}') >> "$OUTPUT_PATH/$IDENT.running" (echo -e "reads 0\nwrites 0\nmax_res_kbytes 0\navg_mem_kbytes 0\ninvol_context_switches 0\nvol_context_switches 0";) >> "$OUTPUT_PATH/$IDENT.running"

6 years, 7 months

Do not start sites on CMA restore

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a855b297e98f092d5e7e55f024c03083aab98f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a855b297e98f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:33:58 2018 +0100 Do not start sites on CMA restore Change-Id: I388e1f22aa10fcf70b15b9dd641d0ce7d422b13d --- bin/mkbackup | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index 1b5960d..e04658b 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1561,9 +1561,10 @@ def do_site_restore(opts, info, site=None): log(p.stderr.read()) raise MKGeneralException("Site restore failed") - site_arg = [ site ] if is_root() else [] - if subprocess.call(["omd", "start" ] + site_arg) != 0: - raise MKGeneralException("Failed to start the site after restore") + if not is_root(): + site_arg = [ site ] if is_root() else [] + if subprocess.call(["omd", "start" ] + site_arg) != 0: + raise MKGeneralException("Failed to start the site after restore") def do_system_restore(opts, info):

6 years, 7 months

5736 FIX Show even empty custom graphs in sidebar view snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: dedfc3da2401a6bef1f67ed148e697ad45f58be8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dedfc3da2401a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 07:58:26 2018 +0100 5736 FIX Show even empty custom graphs in sidebar view snapin Change-Id: Ia3b140fbadf80ad0cfca4aa130f1ffcfef30b1a7 --- .bugs/2845 | 6 ++++-- .werks/5736 | 10 ++++++++++ web/htdocs/pagetypes.py | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.bugs/2845 b/.bugs/2845 index f91ab28..81da7e1 100644 --- a/.bugs/2845 +++ b/.bugs/2845 @@ -1,10 +1,12 @@ Title: Empty custom graphs should be shown in sidebar nevertheless Component: metrics -State: open +Class: nastiness +State: done Date: 2017-02-21 10:46:23 Targetversion: 1.2.8 -Class: nastiness It seems to be a "feature" that empty custom graphs are never shown in the sidebar - regardless of the checkbox "do not show in sidebar". This is confusing to users. Better treat empty graphs like nonempty-graphs. + +2018-02-19 07:57:29: changed state open -> done diff --git a/.werks/5736 b/.werks/5736 new file mode 100644 index 0000000..8fe151f --- /dev/null +++ b/.werks/5736 @@ -0,0 +1,10 @@ +Title: Show even empty custom graphs in sidebar view snapin +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1519023460 +Class: fix + + diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index fd0b7a0..de0bc4f 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -189,6 +189,11 @@ class Base(object): def is_empty(self): return False + + def _show_in_sidebar(self): + return not self.is_empty() and not self.is_hidden() + + # Default values for the creation dialog can be overridden by the # sub class. @classmethod @@ -375,7 +380,7 @@ class PageRenderer(Base): @classmethod def sidebar_links(cls): for page in cls.pages(): - if not page.is_empty() and not page.is_hidden(): + if page._show_in_sidebar(): yield page.topic(), page.title(), page.page_url()

6 years, 7 months

4867 F5 BIG-IP: new checks for vCMP guest monitoring

by Marcel Schulte

Module: check_mk Branch: master Commit: d3fd04c2d9c7b86bba37ca0b19f73b76fc13e73a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3fd04c2d9c7b8… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:07:59 2018 +0100 4867 F5 BIG-IP: new checks for vCMP guest monitoring New checks for vCMP guest monitoring have been added: <ul> <li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> <li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> </ul> Change-Id: I4b22f9926894b0fdee612d6c80bb56f687474702 --- .werks/4867 | 16 ++++++++++ checkman/f5_bigip_vcmpfailover | 14 +++++++++ checkman/f5_bigip_vcmpguests | 13 ++++++++ checks/f5_bigip_vcmpfailover | 68 ++++++++++++++++++++++++++++++++++++++++++ checks/f5_bigip_vcmpguests | 68 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+) diff --git a/.werks/4867 b/.werks/4867 new file mode 100644 index 0000000..03d233a --- /dev/null +++ b/.werks/4867 @@ -0,0 +1,16 @@ +Title: F5 BIG-IP: new checks for vCMP guest monitoring +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518790004 +Class: feature + +New checks for vCMP guest monitoring have been added: + +<ul> +<li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> +<li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> +</ul> + diff --git a/checkman/f5_bigip_vcmpfailover b/checkman/f5_bigip_vcmpfailover new file mode 100644 index 0000000..fb6f158 --- /dev/null +++ b/checkman/f5_bigip_vcmpfailover @@ -0,0 +1,14 @@ +title: F5 Big-IP: active/active or passive/active vCMP guest failover status +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + if the vCMP guest correctly runs in an {active/active} or an {active/passive} setup. + You can configure the expected behaviour via a WATO rule. + It will issue a warning if the cluster setup differs from the expected setup. + +inventory: + Creates one service + diff --git a/checkman/f5_bigip_vcmpguests b/checkman/f5_bigip_vcmpguests new file mode 100644 index 0000000..33ff8ed --- /dev/null +++ b/checkman/f5_bigip_vcmpguests @@ -0,0 +1,13 @@ +title: F5 Big-IP: show failover states of all vCMP guests running on a vCMP host +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + the failover status of every vCMP guest running on a vCMP host. + The service is informational, no parameters are used or configurable. + +inventory: + Creates one service + diff --git a/checks/f5_bigip_vcmpfailover b/checks/f5_bigip_vcmpfailover new file mode 100644 index 0000000..29be96f --- /dev/null +++ b/checks/f5_bigip_vcmpfailover @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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- +# tails. 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. + +# Example SNMP output: +# +# .1.3.6.1.4.1.3375.2.1.13.1.1.0 0 # sysVcmpNumber +# .1.3.6.1.4.1.3375.2.1.14.1.1.0 3 # sysCmFailoverStatusId + + +def parse_f5_bigip_vcmpfailover(info): + parsed = {} + + for node, count, status in info: + if int(count) == 0: # do nothing if we're at a vCMP-/Host/ + parsed[node] = status + + return parsed + + +def inventory_f5_bigip_vcmpfailover(parsed): + if parsed: + return [ ( None, None ) ] + + +def check_f5_bigip_vcmpfailover(_no_item, params, parsed): + if parsed: + for result in list(check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = True)): + yield result + + +check_info["f5_bigip_vcmpfailover"] = { + "parse_function" : parse_f5_bigip_vcmpfailover, + "check_function" : check_f5_bigip_vcmpfailover, + "inventory_function" : inventory_f5_bigip_vcmpfailover, + "group" : "cluster_status", + "default_levels_variable" : "f5_bigip_cluster_default_levels", + "service_description" : "BIG-IP vCMP Guest Failover Status", + "node_info" : True, + "snmp_info" : (".1.3.6.1.4.1.3375.2.1", [ + "13.1.1.0", # sysVcmpNumber + "14.3.1.0", # sysCmFailoverStatusId + ]), + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), + "includes" : ["f5_bigip.include"], +} diff --git a/checks/f5_bigip_vcmpguests b/checks/f5_bigip_vcmpguests new file mode 100644 index 0000000..225935a --- /dev/null +++ b/checks/f5_bigip_vcmpguests @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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- +# tails. 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. + +# Example SNMP output: +# +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.101.97.115.108.50.48.48.49.0 easl2001 # sysVcmpStatVcmpName +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.112.97.115.108.50.48.48.49.0 pasl2001 +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.116.97.115.108.50.48.48.49.0 tasl2001 +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.101.97.115.108.50.48.48.49.0 Standby # sysVcmpStatPrompt +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.112.97.115.108.50.48.48.49.0 Standby +# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.116.97.115.108.50.48.48.49.0 Standby + + +def parse_f5_bigip_vcmpguests(info): + parsed = {} + + for node, guest, status in info: + parsed[guest] = status.lower() + + return parsed + + +def inventory_f5_bigip_vcmpguests(parsed): + if parsed: + return [ ( None, None ) ] + + +def check_f5_bigip_vcmpguests(_no_item, _no_params, parsed): + for guest in sorted(parsed): + yield 0, "Guest [%s] is %s" % (guest, parsed[guest]) + + +check_info["f5_bigip_vcmpguests"] = { + "parse_function" : parse_f5_bigip_vcmpguests, + "check_function" : check_f5_bigip_vcmpguests, + "inventory_function" : inventory_f5_bigip_vcmpguests, + "service_description" : "BIG-IP vCMP Guests", + "node_info" : True, + "snmp_info" : (".1.3.6.1.4.1.3375.2.1.13.4.2.1", [ + "1", # sysVcmpStatVcmpName + "17", # sysVcmpStatPrompt + ]), + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), + "includes" : ["f5_bigip.include"], +}

6 years, 7 months

4866 F5 BIG-IP: new checks for vCMP guest monitoring

by Marcel Schulte

Module: check_mk Branch: master Commit: e8798eaf19e08b8a8e6e4802c1ee79a81e1699f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8798eaf19e08b… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:03:13 2018 +0100 4866 F5 BIG-IP: new checks for vCMP guest monitoring New checks for vCMP guest monitoring have been added: <ul> <li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> <li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> </ul> Change-Id: I89c05b33a7728d9742ee29d8ba6dc71ece97375c --- .werks/4866 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/4866 b/.werks/4866 new file mode 100644 index 0000000..8b68c08 --- /dev/null +++ b/.werks/4866 @@ -0,0 +1,15 @@ +Title: F5 BIG-IP: new checks for vCMP guest monitoring +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518789354 +Class: feature + +New checks for vCMP guest monitoring have been added: + +<ul> +<li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> +<li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> +</ul>

6 years, 7 months

Revert "4866 F5 BIG-IP: new checks for vCMP guest monitoring"

by Marcel Schulte

Module: check_mk Branch: master Commit: 44867f9a09706cc7667505a0164dbf8ee94b0922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44867f9a09706c… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:04:51 2018 +0100 Revert "4866 F5 BIG-IP: new checks for vCMP guest monitoring" This reverts commit d28c5037f72ca727f34a1014aac45cf2182e8bb8. --- .werks/4866 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.werks/4866 b/.werks/4866 deleted file mode 100644 index 8b68c08..0000000 --- a/.werks/4866 +++ /dev/null @@ -1,15 +0,0 @@ -Title: F5 BIG-IP: new checks for vCMP guest monitoring -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.5.0i3 -Date: 1518789354 -Class: feature - -New checks for vCMP guest monitoring have been added: - -<ul> -<li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> -<li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> -</ul>

6 years, 7 months

Reserved 10 Werk IDS

by Marcel Schulte

Module: check_mk Branch: master Commit: f1bc64fd6b8c42dcae325b50f0d1e29ec917438f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1bc64fd6b8c42… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:19:29 2018 +0100 Reserved 10 Werk IDS Change-Id: I0ca74ea7c3a02bdd2f902aa87f8fbf2693d43c63 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 46829db..58f5100 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5838 +5848

6 years, 7 months

Revert "4867 F5 BIG-IP: new checks for vCMP guest monitoring" again, sorry for the noise...

by Marcel Schulte

Module: check_mk Branch: master Commit: d9b330167ff2c1f04f44cfae6c1df9e9a617b9e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9b330167ff2c1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Feb 16 15:16:57 2018 +0100 Revert "4867 F5 BIG-IP: new checks for vCMP guest monitoring" again, sorry for the noise... This reverts commit d3fd04c2d9c7b86bba37ca0b19f73b76fc13e73a. --- .werks/4867 | 16 ---------- checkman/f5_bigip_vcmpfailover | 14 --------- checkman/f5_bigip_vcmpguests | 13 -------- checks/f5_bigip_vcmpfailover | 68 ------------------------------------------ checks/f5_bigip_vcmpguests | 68 ------------------------------------------ 5 files changed, 179 deletions(-) diff --git a/.werks/4867 b/.werks/4867 deleted file mode 100644 index 03d233a..0000000 --- a/.werks/4867 +++ /dev/null @@ -1,16 +0,0 @@ -Title: F5 BIG-IP: new checks for vCMP guest monitoring -Level: 1 -Component: checks -Compatible: compat -Edition: cre -Version: 1.5.0i3 -Date: 1518790004 -Class: feature - -New checks for vCMP guest monitoring have been added: - -<ul> -<li>f5_bigip_vcmpguests: check only available on vCMP hosts, showing failover state of all guests</li> -<li>f5_bigip_vcmpfailover: check for vCMP guests, showing their failover status, configurable via WATO rule "Cluster status" - just like other failover/cluster checks, too</li> -</ul> - diff --git a/checkman/f5_bigip_vcmpfailover b/checkman/f5_bigip_vcmpfailover deleted file mode 100644 index fb6f158..0000000 --- a/checkman/f5_bigip_vcmpfailover +++ /dev/null @@ -1,14 +0,0 @@ -title: F5 Big-IP: active/active or passive/active vCMP guest failover status -agents: snmp -catalog: hw/network/f5 -license: GPL -distribution: check_mk -description: - The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify - if the vCMP guest correctly runs in an {active/active} or an {active/passive} setup. - You can configure the expected behaviour via a WATO rule. - It will issue a warning if the cluster setup differs from the expected setup. - -inventory: - Creates one service - diff --git a/checkman/f5_bigip_vcmpguests b/checkman/f5_bigip_vcmpguests deleted file mode 100644 index 33ff8ed..0000000 --- a/checkman/f5_bigip_vcmpguests +++ /dev/null @@ -1,13 +0,0 @@ -title: F5 Big-IP: show failover states of all vCMP guests running on a vCMP host -agents: snmp -catalog: hw/network/f5 -license: GPL -distribution: check_mk -description: - The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify - the failover status of every vCMP guest running on a vCMP host. - The service is informational, no parameters are used or configurable. - -inventory: - Creates one service - diff --git a/checks/f5_bigip_vcmpfailover b/checks/f5_bigip_vcmpfailover deleted file mode 100644 index 29be96f..0000000 --- a/checks/f5_bigip_vcmpfailover +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2018 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- -# tails. 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. - -# Example SNMP output: -# -# .1.3.6.1.4.1.3375.2.1.13.1.1.0 0 # sysVcmpNumber -# .1.3.6.1.4.1.3375.2.1.14.1.1.0 3 # sysCmFailoverStatusId - - -def parse_f5_bigip_vcmpfailover(info): - parsed = {} - - for node, count, status in info: - if int(count) == 0: # do nothing if we're at a vCMP-/Host/ - parsed[node] = status - - return parsed - - -def inventory_f5_bigip_vcmpfailover(parsed): - if parsed: - return [ ( None, None ) ] - - -def check_f5_bigip_vcmpfailover(_no_item, params, parsed): - if parsed: - for result in list(check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = True)): - yield result - - -check_info["f5_bigip_vcmpfailover"] = { - "parse_function" : parse_f5_bigip_vcmpfailover, - "check_function" : check_f5_bigip_vcmpfailover, - "inventory_function" : inventory_f5_bigip_vcmpfailover, - "group" : "cluster_status", - "default_levels_variable" : "f5_bigip_cluster_default_levels", - "service_description" : "BIG-IP vCMP Guest Failover Status", - "node_info" : True, - "snmp_info" : (".1.3.6.1.4.1.3375.2.1", [ - "13.1.1.0", # sysVcmpNumber - "14.3.1.0", # sysCmFailoverStatusId - ]), - "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), - "includes" : ["f5_bigip.include"], -} diff --git a/checks/f5_bigip_vcmpguests b/checks/f5_bigip_vcmpguests deleted file mode 100644 index 225935a..0000000 --- a/checks/f5_bigip_vcmpguests +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2018 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- -# tails. 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. - -# Example SNMP output: -# -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.101.97.115.108.50.48.48.49.0 easl2001 # sysVcmpStatVcmpName -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.112.97.115.108.50.48.48.49.0 pasl2001 -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.1.8.116.97.115.108.50.48.48.49.0 tasl2001 -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.101.97.115.108.50.48.48.49.0 Standby # sysVcmpStatPrompt -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.112.97.115.108.50.48.48.49.0 Standby -# .1.3.6.1.4.1.3375.2.1.13.4.2.1.17.8.116.97.115.108.50.48.48.49.0 Standby - - -def parse_f5_bigip_vcmpguests(info): - parsed = {} - - for node, guest, status in info: - parsed[guest] = status.lower() - - return parsed - - -def inventory_f5_bigip_vcmpguests(parsed): - if parsed: - return [ ( None, None ) ] - - -def check_f5_bigip_vcmpguests(_no_item, _no_params, parsed): - for guest in sorted(parsed): - yield 0, "Guest [%s] is %s" % (guest, parsed[guest]) - - -check_info["f5_bigip_vcmpguests"] = { - "parse_function" : parse_f5_bigip_vcmpguests, - "check_function" : check_f5_bigip_vcmpguests, - "inventory_function" : inventory_f5_bigip_vcmpguests, - "service_description" : "BIG-IP vCMP Guests", - "node_info" : True, - "snmp_info" : (".1.3.6.1.4.1.3375.2.1.13.4.2.1", [ - "1", # sysVcmpStatVcmpName - "17", # sysVcmpStatPrompt - ]), - "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2=True), - "includes" : ["f5_bigip.include"], -}

6 years, 7 months

Handle regex fallback, too.

by Sven Panne

Module: check_mk Branch: master Commit: e6f4aaa818d065d3ea142884936c39a0708468ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f4aaa818d065… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 16 14:41:07 2018 +0100 Handle regex fallback, too. Change-Id: I78309906f4fdbdf0d435c1d144a0a59527ff7e34 --- livestatus/src/RegExp.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index d01d005..3d6be85 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -71,11 +71,15 @@ private: #include <regex> class RegExp::Impl { public: - // TODO(sp): Handle Syntax == literal. Impl(const std::string &str, Case c, Syntax s) - : _regex(str, c == Case::respect - ? std::regex::extended - : std::regex::extended | std::regex::icase) {} + : _regex(s == Syntax::literal + ? std::regex_replace( + str, std::regex(R"([.^$|()\[\]{}*+?\\])"), + R"(\&)", std::regex_constants::format_sed) + : str, + c == Case::respect + ? std::regex::extended + : std::regex::extended | std::regex::icase) {} std::string replace(const std::string &str, const std::string &replacement) {

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018