Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5648 omd stop/start: Add new option to execute site actions simultaneously

by Lars Michelsen

Module: check_mk Branch: master Commit: 87ac47ce196d1490f8184a63f3482c8fa81090df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ac47ce196d14… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 16 12:11:47 2018 +0100 5648 omd stop/start: Add new option to execute site actions simultaneously When having a larger number of sites an "omd start" or "omd stop" operation may take a lot of time since all processes are handles sequentially. To improve the overall execution time we have now added the optional -p/--parallel arguments to handle the site actions simultaneously. Change-Id: Ib9e2f8c00efdcd896be0593f18767dc7d64acfb0 --- .werks/5648 | 17 ++++++ omd/packages/omd/omd | 163 ++++++++++++++++++++++++++++++++++++------------- omd/packages/omd/omd.8 | 11 +++- 3 files changed, 145 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=87ac47ce19…

6 years, 8 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cd6922f08756b504cdfd01eb605b93ea7b26125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd6922f08756b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 16 12:08:59 2018 +0100 Reserved 20 Werk IDS Change-Id: Id406065b9a2e239c51618636a9409ee269efecd0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ce09e20..ceddb5f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5648 +5668

6 years, 8 months

5634 FIX Fixed slowing of CMC stop operation when SNMP checks are running

by Lars Michelsen

Module: check_mk Branch: master Commit: 74637c815f2f9324b5113fe6b3f51645b35f395f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74637c815f2f93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 16 10:38:56 2018 +0100 5634 FIX Fixed slowing of CMC stop operation when SNMP checks are running The Check_MK Microcore may need a long time for completing stop/restart of the process waiting for currently running operations to finish. One possible situation was that the Check_MK check helpers currently execute checks in form of SNMP queries. A common case is that the helpers wait for the response of a SNMP device which may take up to minutes, depending on the "SNMP timing settings". We have now changed the logic that these SNMP queries are terminated which leads to an immediately ending Check_MK check helper and also a faster ending Microcore process. This change is especially important for cluster setups that have a tight timeout configured for the stop operation of the OMD sites. With this change the failover situations should be handled a lot faster and more stable. Change-Id: Ib7f239091ce06c777475ecba762a4fb17c0bcce7 --- .werks/5634 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.werks/5634 b/.werks/5634 new file mode 100644 index 0000000..480c093 --- /dev/null +++ b/.werks/5634 @@ -0,0 +1,24 @@ +Title: Fixed slowing of CMC stop operation when SNMP checks are running +Level: 2 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1516095164 +Class: fix + +The Check_MK Microcore may need a long time for completing stop/restart of the +process waiting for currently running operations to finish. + +One possible situation was that the Check_MK check helpers currently execute +checks in form of SNMP queries. A common case is that the helpers wait for +the response of a SNMP device which may take up to minutes, depending on the +"SNMP timing settings". + +We have now changed the logic that these SNMP queries are terminated which +leads to an immediately ending Check_MK check helper and also a faster ending +Microcore process. + +This change is especially important for cluster setups that have a tight +timeout configured for the stop operation of the OMD sites. With this change +the failover situations should be handled a lot faster and more stable.

6 years, 8 months

Use our common hack: Detect the right C++ compiler.

by Sven Panne

Module: check_mk Branch: master Commit: 3bab5b0dd45e494e1488d24aae1c8cdda8b3caf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bab5b0dd45e49… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 16 09:57:34 2018 +0100 Use our common hack: Detect the right C++ compiler. Change-Id: I7a7ccb54cd16ae9008e16c435d8c6fec91395334 --- omd/packages/re2/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 808ec13..0dd8293 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -11,7 +11,20 @@ DIR = $(NAME)-$(VERSION) build: tar xzf $(DIR).tar.gz - $(MAKE) -C $(DIR) DESTDIR=$(abspath dest) prefix=$(OMD_ROOT) install +# basically what part of AC_PROC_CXX does + @CXX="" ; \ + for PROG in g++-7 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ + echo -n "checking for $$PROG... "; SAVED_IFS=$$IFS; IFS=: ; \ + for DIR in $$PATH; do \ + IFS=$$SAVED_IFS ; \ + test -z "$$DIR" && DIR=. ; \ + ABS_PROG="$$DIR/$$PROG" ; \ + test -x "$$ABS_PROG" && { CXX="$$ABS_PROG"; echo "$$CXX"; break 2; } ; \ + done ; \ + echo "no"; IFS=$$SAVED_IFS ; \ + done ; \ + test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ + $(MAKE) -C $(DIR) CXX="$$CXX" DESTDIR=$(abspath dest) prefix=$(OMD_ROOT) install install:

6 years, 8 months

Added RE2 library.

by Sven Panne

Module: check_mk Branch: master Commit: a701957f81d98482b651f658b46ef50c8f4855e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a701957f81d984… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 15 16:54:50 2018 +0100 Added RE2 library. Change-Id: I53f2fbc606f52870706235ed751b84934d8cd26c --- omd/Makefile | 1 + omd/packages/re2/.gitignore | 2 ++ omd/packages/re2/Makefile | 21 +++++++++++++++++++++ omd/packages/re2/re2-2018-01-01.tar.gz | Bin 0 -> 388711 bytes 4 files changed, 24 insertions(+) diff --git a/omd/Makefile b/omd/Makefile index 34c899d..5677659 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -15,6 +15,7 @@ PACKAGES=\ perl-modules \ python \ freetds \ + re2 \ python-modules \ boost \ rrdtool \ diff --git a/omd/packages/re2/.gitignore b/omd/packages/re2/.gitignore new file mode 100644 index 0000000..78d22c2 --- /dev/null +++ b/omd/packages/re2/.gitignore @@ -0,0 +1,2 @@ +dest/ +re2-20??-??-01/ diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile new file mode 100644 index 0000000..808ec13 --- /dev/null +++ b/omd/packages/re2/Makefile @@ -0,0 +1,21 @@ +include ../../Makefile.omd + +# We use a released version from https://github.com/google/re2/, but in +# principle we could use any tag by exporting it manually via: +# ( TAG=2018-01-01; git archive --prefix=re2-$TAG/ --output=re2-$TAG.tar.gz $TAG ) +NAME = re2 +VERSION = 2018-01-01 +DIR = $(NAME)-$(VERSION) + +.PHONY: build install skel clean + +build: + tar xzf $(DIR).tar.gz + $(MAKE) -C $(DIR) DESTDIR=$(abspath dest) prefix=$(OMD_ROOT) install + +install: + +skel: + +clean: + rm -rf $(DIR) dest diff --git a/omd/packages/re2/re2-2018-01-01.tar.gz b/omd/packages/re2/re2-2018-01-01.tar.gz new file mode 100644 index 0000000..80871c8 Binary files /dev/null and b/omd/packages/re2/re2-2018-01-01.tar.gz differ

6 years, 8 months

5616 ceph_status.pgs: Added new states 'backfilling' and 'backfill_wait' which are treated as WARNING

by Simon Betz

Module: check_mk Branch: master Commit: aef805b438726030ef1ca64dba901762765c9974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aef805b4387260… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 15 10:31:24 2018 +0100 5616 ceph_status.pgs: Added new states 'backfilling' and 'backfill_wait' which are treated as WARNING Change-Id: I01c2367105dc7a5c69980cbab599ff4887b39b06 --- .werks/5616 | 10 ++++++++++ checks/ceph_status | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/5616 b/.werks/5616 new file mode 100644 index 0000000..5d9aa04 --- /dev/null +++ b/.werks/5616 @@ -0,0 +1,10 @@ +Title: ceph_status.pgs: Added new states 'backfilling' and 'backfill_wait' which are treated as WARNING +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516008607 +Class: feature + + diff --git a/checks/ceph_status b/checks/ceph_status index 6e69d64..a2948ae 100644 --- a/checks/ceph_status +++ b/checks/ceph_status @@ -191,6 +191,8 @@ def check_ceph_status_pgs(_no_item, params, parsed): map_pg_states = { "active" : (0, "active"), "backfill" : (0, "backfill"), + "backfill_wait" : (1, "backfill wait"), + "backfilling" : (1, "backfilling"), "backfill_toofull" : (0, "backfill too full"), "clean" : (0, "clean"), "creating" : (0, "creating"),

6 years, 8 months

5615 FIX ceph_status: Fixed status handling if HEALTH_ERR occurs

by Simon Betz

Module: check_mk Branch: master Commit: 26d4d5873e304bd89be61b4c6939c1db2888e152 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d4d5873e304b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 15 10:05:01 2018 +0100 5615 FIX ceph_status: Fixed status handling if HEALTH_ERR occurs Change-Id: Id93101a8591bc50c8c01096ac003e87c4d3862e7 --- .werks/5615 | 10 ++++++++++ checks/ceph_status | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5615 b/.werks/5615 new file mode 100644 index 0000000..7614307 --- /dev/null +++ b/.werks/5615 @@ -0,0 +1,10 @@ +Title: ceph_status: Fixed status handling if HEALTH_ERR occurs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516007045 +Class: fix + + diff --git a/checks/ceph_status b/checks/ceph_status index 7a5d979..6e69d64 100644 --- a/checks/ceph_status +++ b/checks/ceph_status @@ -80,10 +80,13 @@ def check_ceph_status(_no_item, params, parsed): map_health_states = { "HEALTH_OK" : (0, "OK"), "HEALTH_WARN" : (1, "warning"), - "HEALTH_CRIT" : (1, "critical"), + "HEALTH_CRIT" : (2, "critical"), + "HEALTH_ERR" : (2, "error"), } - state, state_readable = map_health_states[parsed["health"]["overall_status"]] + overall_status = parsed["health"]["overall_status"] + state, state_readable = map_health_states.get(overall_status, + (3, "unknown[%s]" % overall_status)) yield state, 'Status: %s' % state_readable yield ceph_check_epoch("ceph_status", parsed["election_epoch"], params)

6 years, 8 months

5614 FIX raritan_pdu_ocprot: Fixed wrong scaling of current value

by Simon Betz

Module: check_mk Branch: master Commit: 0fe82c6850364b701f3a6170baa3f6f49f8c7c43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fe82c6850364b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 15 09:14:24 2018 +0100 5614 FIX raritan_pdu_ocprot: Fixed wrong scaling of current value Change-Id: Ic063695763229c2805001efd629f6b393441e8cc --- .werks/5614 | 10 +++++++++ checks/raritan_pdu_ocprot | 53 ++++++++++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/.werks/5614 b/.werks/5614 new file mode 100644 index 0000000..6864076 --- /dev/null +++ b/.werks/5614 @@ -0,0 +1,10 @@ +Title: raritan_pdu_ocprot: Fixed wrong scaling of current value +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516004028 +Class: fix + + diff --git a/checks/raritan_pdu_ocprot b/checks/raritan_pdu_ocprot index 58427c8..9eb6d36 100644 --- a/checks/raritan_pdu_ocprot +++ b/checks/raritan_pdu_ocprot @@ -27,30 +27,44 @@ raritan_pdu_ocprot_current_default_levels = (14.0, 15.0) # Example for info: -# [['1.1.1', '4', '0'], -# ['1.1.15', '1', '0'], -# ['1.2.1', '4', '0'], -# ['1.2.15', '1', '0'], -# ['1.3.1', '4', '0'], -# ['1.3.15', '1', '0'], -# ['1.4.1', '4', '0'], -# ['1.4.15', '1', '0'], -# ['1.5.1', '4', '0'], -# ['1.5.15', '1', '0'], -# ['1.6.1', '4', '0'], -# ['1.6.15', '1', '0']] +# [[[u'1.1.1', u'4', u'0'], +# [u'1.1.15', u'1', u'0'], +# [u'1.2.1', u'4', u'0'], +# [u'1.2.15', u'1', u'0'], +# [u'1.3.1', u'4', u'70'], +# [u'1.3.15', u'1', u'0'], +# [u'1.4.1', u'4', u'0'], +# [u'1.4.15', u'1', u'0'], +# [u'1.5.1', u'4', u'0'], +# [u'1.5.15', u'1', u'0'], +# [u'1.6.1', u'4', u'0'], +# [u'1.6.15', u'1', u'0']], +# [[u'1'], +# [u'0'], +# [u'1'], +# [u'0'], +# [u'1'], +# [u'0'], +# [u'1'], +# [u'0'], +# [u'1'], +# [u'0'], +# [u'1'], +# [u'0']]] # Raritan implements a strange way of indexing here. The two last components # of the OID should really be swapped! def parse_raritan_pdu_ocprot(info): + flattened_info = [[end_oid, state, value, scale] + for (end_oid, state, value), (scale,) in zip(info[0], info[1])] parsed = {} - for end_oid, state, value in info: + for end_oid, state, value, scale in flattened_info: protector_id = "C" + end_oid.split(".")[1] # 1.5.1 --> Item will be "C5" if end_oid.endswith(".15"): parsed.setdefault(protector_id, {})["state"] = state elif end_oid.endswith(".1"): - parsed.setdefault(protector_id, {})["current"] = float(value) / 10 + parsed.setdefault(protector_id, {})["current"] = float(value) / pow(10, int(scale)) return parsed @@ -94,10 +108,11 @@ check_info["raritan_pdu_ocprot"] = { "check_function" : check_raritan_pdu_ocprot, "service_description" : "Overcurrent Protector %s", "group" : "ocprot_current", - "snmp_info" : (".1.3.6.1.4.1.13742.6.5.3.3.1", [ - OID_END, - "3", - "4", - ]), + "snmp_info" : [(".1.3.6.1.4.1.13742.6.5.3.3.1", [ + OID_END, + "3", + "4", + ]), + (".1.3.6.1.4.1.13742.6.3.4.4.1", ["7"])], "snmp_scan_function" : lambda oid: "13742" in oid(".1.3.6.1.2.1.1.2.0"), }

6 years, 8 months

Nuke site.pyc, too.

by Sven Panne

Module: check_mk Branch: master Commit: 825d97fe6b7655210f67da61805f1a057993dbe3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=825d97fe6b7655… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 12 13:47:51 2018 +0100 Nuke site.pyc, too. Change-Id: Icecf91bf390e8eb257a465c37c28bec348474544 --- omd/packages/net-snmp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/net-snmp/Makefile b/omd/packages/net-snmp/Makefile index 3f57682..de0ffd5 100644 --- a/omd/packages/net-snmp/Makefile +++ b/omd/packages/net-snmp/Makefile @@ -43,7 +43,7 @@ install: # creation of a lib/python/site.py, a copy of site-patch.py from setuptools. # Having this in the PYTHONPATH makes it impossible to run python3-based SW as a # site user, including gdb! So let's simply nuke it here... - $(RM) $(DESTDIR)$(OMD_ROOT)/lib/python/site.py + $(RM) $(DESTDIR)$(OMD_ROOT)/lib/python/site.py* skel:

6 years, 8 months

5600 hp_fan: New check to monitor the fans of HP switches

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3152011085040ef7727d9a4137bb0df13f90fa7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3152011085040e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jan 12 11:01:39 2018 +0100 5600 hp_fan: New check to monitor the fans of HP switches Change-Id: I8d22d79444eb9a8c409f32b54c04d841aafa457e --- .werks/5600 | 10 ++++++++++ checkman/hp_fan | 15 ++++++++++++++ checks/hp_fan | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/.werks/5600 b/.werks/5600 new file mode 100644 index 0000000..4b4871e --- /dev/null +++ b/.werks/5600 @@ -0,0 +1,10 @@ +Title: hp_fan: New check to monitor the fans of HP switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515751182 +Class: feature + + diff --git a/checkman/hp_fan b/checkman/hp_fan new file mode 100644 index 0000000..76b5c50 --- /dev/null +++ b/checkman/hp_fan @@ -0,0 +1,15 @@ +title: HP Switches: Fan Status +agents: SNMP +catalog: hw/network/hp +license: GPL +distribution: check_mk +description: + This check monitors the state of fans in HP switches. "unknown" and "maxstate" + are treated as UNKNOWN, "removed" and "off" as CRIT, "underspeed" and "overspeed" + as WARN. "ok" is OK. + +item: + The tray index and the fan index, e.g. 0/3 + +inventory: + One service per fan is created. diff --git a/checks/hp_fan b/checks/hp_fan new file mode 100644 index 0000000..2d62072 --- /dev/null +++ b/checks/hp_fan @@ -0,0 +1,61 @@ +#!/usr/bin/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. + + +def parse_hp_fan(info): + return { "%s/%s" % (tray_index, fan_index) : fan_state for fan_index, tray_index, fan_state in info } + + +def inventory_hp_fan(parsed): + for fan in parsed: + yield fan, None + + +def check_hp_fan(item, _no_params, parsed): + statemap = { + "0" : (3, "unknown"), + "1" : (2, "removed"), + "2" : (2, "off"), + "3" : (1, "underspeed"), + "4" : (1, "overspeed"), + "5" : (0, "ok"), + "6" : (3, "maxstate"), + } + return statemap[parsed[item]] + + +check_info['hp_fan'] = { + 'parse_function' : parse_hp_fan, + 'inventory_function' : inventory_hp_fan, + 'check_function' : check_hp_fan, + 'service_description' : 'Fan %s', + 'snmp_info' : ('.1.3.6.1.4.1.11.2.14.11.5.1.54.2.1.1', [ # FAN-MIB - hpicfFanEntry + OID_END, # HpicfDcFanIndex is not-accessible, so this will have to do. + "2", # hpicfFanTray + "4", # hpicfFanState + ]), + 'snmp_scan_function' : lambda oid: "hp" in oid(".1.3.6.1.2.1.1.1.0").lower() and "switch" in oid(".1.3.6.1.2.1.1.1.0").lower(), +}

6 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018