Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Active check now also get their check context

by Lars Michelsen

Module: check_mk Branch: master Commit: a286a8e9a2204db914f54ba2525d4eaeb17fa9ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a286a8e9a2204d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 17:09:00 2018 +0100 Active check now also get their check context Change-Id: I6b4bf3e08d0854818f621e51bc5d4581ff5a0b81 --- cmk_base/checks.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index c83494b..f99fa80 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -145,6 +145,7 @@ def load_checks(filelist): known_vars = check_context.keys() known_checks = check_info.keys() + known_active_checks = active_check_info.keys() load_check_includes(f, check_context) @@ -159,11 +160,15 @@ def load_checks(filelist): continue new_checks = set(check_info.keys()).difference(known_checks) + new_active_checks = set(active_check_info.keys()).difference(known_active_checks) # Now store the check context for all checks found in this file for check_plugin_name in new_checks: _check_contexts[check_plugin_name] = check_context + for check_plugin_name in new_active_checks: + _check_contexts[check_plugin_name] = check_context + # Collect all variables that the check file did introduce compared to the # default check context new_check_vars = {} @@ -199,6 +204,7 @@ def load_checks(filelist): # Keep track of which variable needs to be set to which context context_ident_list = _check_variables.setdefault(varname, []) context_ident_list += new_checks + context_ident_list += new_active_checks # Now convert check_info to new format. convert_check_info()

6 years, 4 months

Revert "ucd_mem: Modify service description to be uniform with other checks"

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2beda1b9ec8603a025ba602450bcb7dc0d70cb9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2beda1b9ec8603… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Mar 8 15:56:26 2018 +0100 Revert "ucd_mem: Modify service description to be uniform with other checks" This reverts commit 8401f69d9623c109e1ea74230e73f3b8a5a8e61b. The situation is more complicated, as there are multiple checks involved. --- checks/ucd_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index 54924aa..8fe5a01 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -52,7 +52,7 @@ def check_ucd_mem(_no_item, params, info): check_info['ucd_mem'] = { 'inventory_function' : inventory_ucd_mem, 'check_function' : check_ucd_mem, - 'service_description' : 'Memory used', + 'service_description' : 'Memory', 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.2021.4", [ "5", # memTotal -> kB

6 years, 4 months

Adapted test

by Simon Betz

Module: check_mk Branch: master Commit: f4c16bbff986b55e2f79f6834996bd41a927335d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4c16bbff986b5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 8 15:56:12 2018 +0100 Adapted test Change-Id: Ic8bcf84154324cdfb3194c2a834ec9f9ceede287 --- tests/cmk_base/test_modes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmk_base/test_modes.py b/tests/cmk_base/test_modes.py index 56578a5..80bfaf6 100644 --- a/tests/cmk_base/test_modes.py +++ b/tests/cmk_base/test_modes.py @@ -582,7 +582,7 @@ def test_inventory_as_check(test_cfg, site): stdout, stderr = p.communicate() assert p.wait() == 0 assert stderr == "" - assert stdout.startswith("OK - found ") + assert stdout.startswith("OK - [Inventory] Found ") #.

6 years, 4 months

ucd_mem: Modify service description to be uniform with other checks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8401f69d9623c109e1ea74230e73f3b8a5a8e61b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8401f69d9623c1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Mar 8 15:30:25 2018 +0100 ucd_mem: Modify service description to be uniform with other checks Change-Id: I39bdcb090ac3cccde8e8130224098a331a4ef273 --- checks/ucd_mem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ucd_mem b/checks/ucd_mem index 8fe5a01..54924aa 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -52,7 +52,7 @@ def check_ucd_mem(_no_item, params, info): check_info['ucd_mem'] = { 'inventory_function' : inventory_ucd_mem, 'check_function' : check_ucd_mem, - 'service_description' : 'Memory', + 'service_description' : 'Memory used', 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.2021.4", [ "5", # memTotal -> kB

6 years, 4 months

Improved service details

by Simon Betz

Module: check_mk Branch: master Commit: c76d0b6a3eeb0955831a37e198268722f0eed8f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c76d0b6a3eeb09… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 8 14:53:04 2018 +0100 Improved service details Change-Id: I0d54582615f5671c5c5a4576bcfb83818357d25c --- cmk_base/inventory.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 70eedf9..79e9810 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -121,13 +121,13 @@ def do_inv_check(options, hostname): else: ipaddress = ip_lookup.lookup_ip_address(hostname) - old_timestamp, inventory_tree = do_inv_for(hostname, ipaddress) - if inventory_tree.is_empty(): - console.output("OK - Found no data\n") + old_timestamp, inventory_tree, status_data_tree = do_inv_for(hostname, ipaddress) + if inventory_tree.is_empty() and status_data_tree.is_empty(): + console.output("OK - [Inventory/Status data] Found no data\n") return 0 infotexts = [] - infotexts.append("found %d entries" % inventory_tree.count_entries()) + infotexts.append("[Inventory] Found %d entries" % inventory_tree.count_entries()) state = 0 if not inventory_tree.has_edge("software") and _inv_sw_missing: infotexts.append("software information is missing" + check_api.state_markers[_inv_sw_missing]) @@ -159,7 +159,11 @@ def do_inv_check(options, hostname): for exc in exceptions: infotexts.append("%s" % exc) - console.output("%s - %s\n" % (defines.short_service_state_name(state), ", ".join(infotexts))) + infotext = ", ".join(infotexts) + if not status_data_tree.is_empty(): + infotext += " [Status data] Found %s entries" % status_data_tree.count_entries() + + console.output("%s - %s\n" % (defines.short_service_state_name(state), infotext)) return state except Exception, e: @@ -197,7 +201,7 @@ def do_inv_for(hostname, ipaddress): (tty.bold, tty.yellow, status_data_tree.count_entries(), tty.normal)) _run_inventory_export_hooks(hostname, inventory_tree) - return old_timestamp, inventory_tree + return old_timestamp, inventory_tree, status_data_tree def _do_inv_for_cluster(hostname, inventory_tree):

6 years, 4 months

5624 oracle_performance, oracle_tablespaces: Inventory plugins provide status data

by Simon Betz

Module: check_mk Branch: master Commit: 3c26df7e39b5eb68895c7fc97924cd1979c94563 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c26df7e39b5eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 29 10:10:38 2018 +0100 5624 oracle_performance, oracle_tablespaces: Inventory plugins provide status data Change-Id: I1de9ac1a0179413f2d31c75064e0b948e10baab6 --- .werks/5624 | 10 ++++ inventory/oracle_performance | 47 ++++++++++++++++++ inventory/oracle_recovery_area | 2 +- inventory/oracle_tablespaces | 110 ++++++++++++++++++++++++++++++++++++++--- web/plugins/views/inventory.py | 18 ++++++- 5 files changed, 179 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3c26df7e39…

6 years, 4 months

5894 FIX Fixed possible exception on service discovery page for SNMP hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 38aaaef9a456cbed629abf75540cb9b66b52b218 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38aaaef9a456cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 13:09:53 2018 +0100 5894 FIX Fixed possible exception on service discovery page for SNMP hosts When inline SNMP is used it might happen that the service discovery page shows an error "Exception TypeError: "'NoneType' object is not callable" instead of the table of services. Change-Id: Idf81187b333a89bc75fe49d43c89f3192cda512c --- .werks/5894 | 12 ++++++++++++ .../0013-fix-possible-TypeError-in-__del__.dif | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/.werks/5894 b/.werks/5894 new file mode 100644 index 0000000..8d62749 --- /dev/null +++ b/.werks/5894 @@ -0,0 +1,12 @@ +Title: Fixed possible exception on service discovery page for SNMP hosts +Level: 1 +Component: inline-snmp +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1520510916 +Class: fix + +When inline SNMP is used it might happen that the service discovery page +shows an error "Exception TypeError: "'NoneType' object is not callable" instead +of the table of services. diff --git a/omd/packages/net-snmp/patches/0013-fix-possible-TypeError-in-__del__.dif b/omd/packages/net-snmp/patches/0013-fix-possible-TypeError-in-__del__.dif new file mode 100644 index 0000000..0d9b03b --- /dev/null +++ b/omd/packages/net-snmp/patches/0013-fix-possible-TypeError-in-__del__.dif @@ -0,0 +1,21 @@ +diff -Nur net-snmp-734f855.orig/python/netsnmp/client.py net-snmp-734f855/python/netsnmp/client.py +--- net-snmp-734f855.orig/python/netsnmp/client.py 2018-03-08 13:05:07.718970500 +0100 ++++ net-snmp-734f855/python/netsnmp/client.py 2018-03-08 13:07:23.259098808 +0100 +@@ -202,8 +202,15 @@ + return res + + def __del__(self): +- res = client_intf.delete_session(self) +- return res ++ try: ++ res = client_intf.delete_session(self) ++ return res ++ except TypeError: ++ # Saw this exception: ++ # Exception TypeError: "'NoneType' object is not callable" in <bound method Session.__del__ of <netsnmp.client.Session object at 0x7f173765f890>> ignored ++ # Add the exception handler here to catch this problem. ++ pass ++ + + import netsnmp +

6 years, 4 months

net-snmp: Cleaned up .f12 file

by Lars Michelsen

Module: check_mk Branch: master Commit: 372ac970e4b4ca84f69deef6fa164b6f1bbb7842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=372ac970e4b4ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 13:04:43 2018 +0100 net-snmp: Cleaned up .f12 file Change-Id: Iac2bc8a4e0b6592914812e7150b3e029cefbb316 --- omd/packages/net-snmp/.f12 | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/omd/packages/net-snmp/.f12 b/omd/packages/net-snmp/.f12 index 3762c7a..12a9d73 100755 --- a/omd/packages/net-snmp/.f12 +++ b/omd/packages/net-snmp/.f12 @@ -5,24 +5,14 @@ SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE -echo "Installing to site \"$SITE\"..." +VERSION=$(sed -n 's/VERSION.*= $.*$/\1/p' Makefile) -if [ ! -d net-snmp-5.7.3 ]; then +echo "Compile net-snmp..." +if [ ! -d net-snmp-$VERSION ]; then make - cd net-snmp-5.7.3 else - cd net-snmp-5.7.3 - make || exit 1 + make -C net-snmp-$VERSION || exit 1 fi -cd python -sudo PYTHONPATH=$PYTHONPATH:$ROOT/lib/python \ - python setup.py install --home=$ROOT \ - --prefix='' \ - --install-platlib=$ROOT/lib/python \ - --install-purelib=$ROOT/lib/python - -cd .. - -sudo install -m 755 apps/.libs/snmp{bulkwalk,walk,get} $ROOT/bin -sudo install -m 644 snmplib/.libs/libnetsnmp.* $ROOT/lib +echo "Installing to site \"$SITE\"..." +sudo make install OMD_ROOT=$ROOT

6 years, 4 months

5895 mgmt_ipmi_firmware: New inventory plugin to gather the IPMI board firmware version

by Lars Michelsen

Module: check_mk Branch: master Commit: 12c010a97c5006a08a5ab2d1e10e15b109489b0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12c010a97c5006… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 13:37:43 2018 +0100 5895 mgmt_ipmi_firmware: New inventory plugin to gather the IPMI board firmware version This inventory plugin adds the path "Hardware/Management Interface" to the HW-/SW inventory tree when using IPMI management board monitoring. Change-Id: Ic14fd06bbebcf288f39b084aa6ec3fac297b3120 --- .werks/5895 | 11 +++++++++ inventory/mgmt_ipmi_firmware | 53 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/.werks/5895 b/.werks/5895 new file mode 100644 index 0000000..45110c5 --- /dev/null +++ b/.werks/5895 @@ -0,0 +1,11 @@ +Title: mgmt_ipmi_firmware: New inventory plugin to gather the IPMI board firmware version +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520512605 +Class: feature + +This inventory plugin adds the path "Hardware/Management Interface" to the HW-/SW inventory +tree when using IPMI management board monitoring. diff --git a/inventory/mgmt_ipmi_firmware b/inventory/mgmt_ipmi_firmware new file mode 100644 index 0000000..751193d --- /dev/null +++ b/inventory/mgmt_ipmi_firmware @@ -0,0 +1,53 @@ +#!/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- +# 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_mgmt_ipmi_firmware(info): + parsed = {} + + if not info: + return parsed + + for line in info: + if line[0] == "BMC Version" and line[1] == "version": + parsed["version"] = line[2] + + parsed["type"] = "IPMI" + + return parsed + + +def inv_mgmt_ipmi_firmware(info, inventory_tree): + parsed = parse_mgmt_ipmi_firmware(info) + if not parsed: + return + + node = inventory_tree.get_dict("hardware.management_interface.") + node.update(parsed) + + +inv_info["mgmt_ipmi_firmware"] = { + "inv_function" : inv_mgmt_ipmi_firmware, +}

6 years, 4 months

Win-agent: add comment about different statefiles

by Jukka Aro

Module: check_mk Branch: master Commit: 1ba16c69bcc647f3280771807c33919bbf9bb6f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ba16c69bcc647… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 8 10:29:06 2018 +0100 Win-agent: add comment about different statefiles --- agents/windows/sections/SectionEventlog.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index c1f88c5..04a646c 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -485,7 +485,10 @@ bool SectionEventlog::produceOutputInner( handleExistingLog(out, state); } } - // The offsets are persisted in a state file. + // The offsets are persisted in a statefile. + // Always use the first available statefile name. In case of a TCP/IP + // connection, this is the host-IP-specific statefile, and in case of + // non-TCP (test / debug run etc.) the general eventstate.txt. const auto &statefile = statefiles.front(); saveEventlogOffsets(statefile, states); }

6 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018