Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 0d5e7eb34729a936cc83c3e9a6b3241c851c910a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5e7eb34729a9… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Jan 17 14:03:09 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I26457a39b8dcd301f31c4f1d73c610b155db2755 --- cmk/gui/plugins/wato/check_parameters/cpu_load.py | 53 +++ .../wato/check_parameters/cpu_utilization.py | 19 ++ .../check_parameters/cpu_utilization_multiitem.py | 61 ++++ .../wato/check_parameters/db2_tablespaces.py | 130 ++++++++ .../wato/check_parameters/fpga_utilization.py | 59 ++++ cmk/gui/plugins/wato/check_parameters/humidity.py | 80 +++++ .../check_parameters/oracle_dataguard_stats.py | 73 ++++ .../wato/check_parameters/oracle_processes.py | 60 ++++ .../wato/check_parameters/oracle_recovery_area.py | 52 +++ .../wato/check_parameters/oracle_tablespaces.py | 103 ++++++ .../wato/check_parameters/single_humidity.py | 51 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 368 --------------------- 12 files changed, 741 insertions(+), 368 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d5e7eb347…

5 years, 8 months

Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: fa370de947ae294d27686a47e2101a9fce0ef722 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa370de947ae29… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Jan 17 14:11:13 2019 +0100 Refactoring: Moved check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I7441e9762ea13a5edaa132797f485ae06d8212db --- .../plugins/wato/check_parameters/asm_diskgroup.py | 63 +++ .../plugins/wato/check_parameters/mssql_backup.py | 93 +++++ .../wato/check_parameters/mssql_backup_per_type.py | 47 +++ .../wato/check_parameters/mssql_file_sizes.py | 76 ++++ .../wato/check_parameters/mssql_page_activity.py | 69 ++++ .../wato/check_parameters/mssql_tablespaces.py | 140 +++++++ .../wato/check_parameters/oracle_instance.py | 107 +++++ .../plugins/wato/check_parameters/oracle_jobs.py | 83 ++++ .../check_parameters/oracle_recovery_status.py | 62 +++ .../plugins/wato/check_parameters/oracle_rman.py | 52 +++ .../wato/check_parameters/oracle_undostat.py | 62 +++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 436 --------------------- 12 files changed, 854 insertions(+), 436 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fa370de947…

5 years, 8 months

6966 Expose HW/SW inventory via HTTP API

by Sven Panne

Module: check_mk Branch: master Commit: 95848f87ff1b462fe945636dfd91e30a8563c23e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95848f87ff1b46… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 18 11:56:28 2019 +0100 6966 Expose HW/SW inventory via HTTP API Check_MK already has an API to retrieve the HW/SW inventory (see Werk a new <tt>get_inventory</tt> call has been added to the latter, and this is now the recommended way to retrieve the HW/SW inventory. The <tt>get_inventory</tt> call has one mandatory key <tt>hosts</tt>, which has to be a list of host names for which the inventory should be retrieved. In addtion, two optional keys are supported: <ul> <li><tt>paths</tt>: a list of inventory paths for filtering the inventory tree</li> <li><tt>site</tt>: the site to use</li> </ul> Change-Id: Ibf0efe0bf299021029b084ce076fcb293b7d8d02 --- .werks/6966 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/6966 b/.werks/6966 new file mode 100644 index 0000000..3dd1668 --- /dev/null +++ b/.werks/6966 @@ -0,0 +1,22 @@ +Title: Expose HW/SW inventory via HTTP API +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547808070 +Class: feature + +Check_MK already has an API to retrieve the HW/SW inventory (see Werk +#3585), but it is totally separate from the rest of our usual HTTP API. Now +a new <tt>get_inventory</tt> call has been added to the latter, and this is +now the recommended way to retrieve the HW/SW inventory. + +The <tt>get_inventory</tt> call has one mandatory key <tt>hosts</tt>, which +has to be a list of host names for which the inventory should be retrieved. +In addtion, two optional keys are supported: + +<ul> +<li><tt>paths</tt>: a list of inventory paths for filtering the inventory tree</li> +<li><tt>site</tt>: the site to use</li> +</ul>

5 years, 8 months

Make agents makefile ready for incremental builds

by Alex Zurhake

Module: check_mk Branch: master Commit: 9e030da6a6dbee96f8c4f360baf15a28ebf4c1eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e030da6a6dbee… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Jan 18 07:47:32 2019 +0100 Make agents makefile ready for incremental builds Change-Id: I9b8ab6cadaec8c85adf62b248bd87041276db3ea --- agents/Makefile | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 54a94f5..5d8940a 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -24,14 +24,14 @@ include ../defines.make -RPM_VERSION = $(subst -,_,$(VERSION)) -NAME = check-mk-agent -DISTNAME = $(NAME)-$(VERSION) -RPM_TOPDIR = $$(pwd)/.rpm.topdir -RPM_BUILDROOT = $$(pwd)/.rpm.buildroot -RPM_PACKAGE = $(DISTNAME)-1.noarch.rpm -DEB_PACKAGE = check-mk-agent_$(VERSION)-1_all.deb - +RPM_VERSION := $(subst -,_,$(VERSION)) +NAME := check-mk-agent +DISTNAME := $(NAME)-$(VERSION) +RPM_TOPDIR := $$(pwd)/.rpm.topdir +RPM_BUILDROOT := $$(pwd)/.rpm.buildroot +RPM_PACKAGE := $(DISTNAME)-1.noarch.rpm +DEB_PACKAGE := check-mk-agent_$(VERSION)-1_all.deb +WIN_PACKAGE := windows/check_mk_agent.msi usage: @echo "make waitmax -- compile waitmax.c" @echo "make build -- create all files needed for \"make dist\" of Check_MK" @@ -65,17 +65,22 @@ setversion: sed -i "s/^AC_INIT.*/AC_INIT([$$package], [$(NEW_VERSION)], [$$mail])/" \ windows/configure.ac -build: - $(MAKE) packages +build: $(DEB_PACKAGE) $(RPM_PACKAGE) $(WIN_PACKAGE) + +$(WIN_PACKAGE): cd windows && sudo \ - CHROOT_NAME=$$CHROOT_NAME \ - CHROOT_BASE_PATH=$$CHROOT_BASE_PATH \ - CHROOT_BUILD_DIR=$$CHROOT_BUILD_DIR \ - ./make-agent + CHROOT_NAME=$$CHROOT_NAME \ + CHROOT_BASE_PATH=$$CHROOT_BASE_PATH \ + CHROOT_BUILD_DIR=$$CHROOT_BUILD_DIR \ + ./make-agent + +packages: $(DEB_PACKAGE) $(RPM_PACKAGE) + +deb: $(DEB_PACKAGE) -packages: rpm deb +rpm: $(RPM_PACKAGE) -rpm $(RPM_PACKAGE): waitmax +$(RPM_PACKAGE): waitmax rm -rf $(RPM_TOPDIR) mkdir -p $(RPM_TOPDIR)/RPMS mkdir -p $(RPM_TOPDIR)/SRPMS @@ -104,7 +109,7 @@ rpm $(RPM_PACKAGE): waitmax # TODO: Replace alien usage. Debian packages should be created just like the bakery does # Keep in mind that we still need to use gz compression by default for the agent # packages. -deb $(DEB_PACKAGE): $(RPM_PACKAGE) +$(DEB_PACKAGE): $(RPM_PACKAGE) @echo "Sorry. Debian packages currently via alien" rm -f *.deb fakeroot alien --scripts -k --to-deb $(RPM_PACKAGE)

5 years, 8 months

7010 quantum_libsmall_status: Supports Quantum Tape Library which provides SNMP table .1.3.6.1.4.1.3764

by Simon Betz

Module: check_mk Branch: master Commit: fda56cc19971017c2f6b150f55c3537d491d93b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fda56cc1997101… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 17 15:45:34 2019 +0100 7010 quantum_libsmall_status: Supports Quantum Tape Library which provides SNMP table .1.3.6.1.4.1.3764 Change-Id: I902bac18cf73e4ea20f58ca4e5a9fca63ecf696c --- .werks/7010 | 10 +++ checks/quantum_libsmall_status | 85 +++++++++++++--------- .../quantum_libsmall_status_12_regression.py | 29 ++++++++ .../quantum_libsmall_status_15_regression.py | 29 ++++++++ 4 files changed, 119 insertions(+), 34 deletions(-) diff --git a/.werks/7010 b/.werks/7010 new file mode 100644 index 0000000..dc60d9c --- /dev/null +++ b/.werks/7010 @@ -0,0 +1,10 @@ +Title: quantum_libsmall_status: Supports Quantum Tape Library which provides SNMP table .1.3.6.1.4.1.3764 +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547736134 +Class: feature + + diff --git a/checks/quantum_libsmall_status b/checks/quantum_libsmall_status index ead4534..4adb2ce 100644 --- a/checks/quantum_libsmall_status +++ b/checks/quantum_libsmall_status @@ -24,55 +24,72 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +DEVICE_TYPE_MAP = { + "1": "Power", + "2": "Cooling", + "3": "Control", + "4": "Connectivity", + "5": "Robotics", + "6": "Media", + "7": "Drive", + "8": "Operator action request", +} -def inventory_quantum_libsmall_status(info): - if info: - return [(None, None)] +RAS_STATUS_MAP = { + "1": (0, "good"), + "2": (2, "failed"), + "3": (2, "degraded"), + "4": (1, "warning"), + "5": (0, "informational"), + "6": (3, "unknown"), + "7": (3, "invalid"), +} +OPNEED_STATUS_MAP = { + "0": (0, "no"), + "1": (2, "yes"), + "2": (0, "no"), +} -def check_quantum_libsmall_status(_no_item, _no_params, info): - ras_status = { - 1: (0, "good"), - 2: (2, "failed"), - 3: (2, "degraded"), - 4: (1, "warning"), - 5: (0, "informational"), - 6: (3, "unknown"), - 7: (3, "invalid"), - } +def parse_quantum_libsmall_status(info): + parsed = [] + for line in info: + for oidend, dev_state in line: + dev_type = DEVICE_TYPE_MAP.get(oidend.split('.')[0]) + if not (dev_type or dev_state): + continue + parsed.append((dev_type, dev_state)) + return parsed - opneed_status = { - 0: (0, "no"), - 1: (2, "yes"), - } - oidtothing = { - "1": (ras_status, "Power"), - "2": (ras_status, "Cooling"), - "3": (ras_status, "Control"), - "4": (ras_status, "Connectivity"), - "5": (ras_status, "Robotics"), - "6": (ras_status, "Media"), - "7": (ras_status, "Drive"), - "8": (opneed_status, "Operator action request"), - } +def inventory_quantum_libsmall_status(parsed): + if parsed: + return [(None, None)] + - for oidend, devstate in info: - stateint = int(devstate) - interpret, thing = oidtothing[oidend[0]] - status, statname = interpret[stateint] - yield status, thing + ": " + statname +def check_quantum_libsmall_status(_no_item, _no_params, parsed): + for dev_type, dev_state in parsed: + if dev_type == "Operator action request": + state, state_readable = OPNEED_STATUS_MAP.get(dev_state, (3, 'unknown[%s]' % dev_state)) + else: + state, state_readable = RAS_STATUS_MAP.get(dev_state, (3, 'unknown[%s]' % dev_state)) + yield state, "%s: %s" % (dev_type, state_readable) check_info['quantum_libsmall_status'] = { + "parse_function" : parse_quantum_libsmall_status, "check_function" : check_quantum_libsmall_status, "inventory_function" : inventory_quantum_libsmall_status, "service_description" : "Tape library status", - "snmp_info" : (".1.3.6.1.4.1.3697.1.10.10.1.15", [ + "snmp_info" : [(".1.3.6.1.4.1.3697.1.10.10.1.15", [ OID_END, "10", - ]), + ]), + (".1.3.6.1.4.1.3764.1.10.10", [ + OID_END, + "12", + ])], "snmp_scan_function" : lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0", "").lower() \ and "library" in oid(".1.3.6.1.2.1.1.6.0", "").lower(), } diff --git a/tests/unit/checks/generictests/datasets/quantum_libsmall_status_12_regression.py b/tests/unit/checks/generictests/datasets/quantum_libsmall_status_12_regression.py new file mode 100644 index 0000000..79c9e7a --- /dev/null +++ b/tests/unit/checks/generictests/datasets/quantum_libsmall_status_12_regression.py @@ -0,0 +1,29 @@ + + +checkname = 'quantum_libsmall_status' + + +info = [[], + [[u'1.0', u'1'], + [u'2.0', u'1'], + [u'3.0', u'1'], + [u'4.0', u'1'], + [u'5.0', u'1'], + [u'6.0', u'1'], + [u'7.0', u'1'], + [u'8.0', u'2']]] + + +discovery = {'': [(None, None)]} + + +checks = {'': [(None, + {}, + [(0, 'Power: good', []), + (0, 'Cooling: good', []), + (0, 'Control: good', []), + (0, 'Connectivity: good', []), + (0, 'Robotics: good', []), + (0, 'Media: good', []), + (0, 'Drive: good', []), + (0, 'Operator action request: no', [])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/datasets/quantum_libsmall_status_15_regression.py b/tests/unit/checks/generictests/datasets/quantum_libsmall_status_15_regression.py new file mode 100644 index 0000000..c59283c --- /dev/null +++ b/tests/unit/checks/generictests/datasets/quantum_libsmall_status_15_regression.py @@ -0,0 +1,29 @@ + + +checkname = 'quantum_libsmall_status' + + +info = [[[u'1.0', u'1'], + [u'2.0', u'1'], + [u'3.0', u'1'], + [u'4.0', u'1'], + [u'5.0', u'1'], + [u'6.0', u'1'], + [u'7.0', u'1'], + [u'8.0', u'0']], + []] + + +discovery = {'': [(None, None)]} + + +checks = {'': [(None, + {}, + [(0, 'Power: good', []), + (0, 'Cooling: good', []), + (0, 'Control: good', []), + (0, 'Connectivity: good', []), + (0, 'Robotics: good', []), + (0, 'Media: good', []), + (0, 'Drive: good', []), + (0, 'Operator action request: no', [])])]} \ No newline at end of file

5 years, 8 months

6956 FIX docker_node_info: Inventory no longer crashes upon missing info

by Moritz Kiemer

Module: check_mk Branch: master Commit: f28e8833dca96428c507626695840d219e16f02f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f28e8833dca964… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 16 13:16:47 2019 +0100 6956 FIX docker_node_info: Inventory no longer crashes upon missing info Change-Id: I8726f59ee878fc8a0d9ce2b6353ac665a7148939 --- .werks/6956 | 10 ++++ inventory/docker_node_info | 35 +++++++------ tests/unit/inventory/test_inv_docker_node_info.py | 62 +++++++++++++++++++++++ 3 files changed, 89 insertions(+), 18 deletions(-) diff --git a/.werks/6956 b/.werks/6956 new file mode 100644 index 0000000..a095990 --- /dev/null +++ b/.werks/6956 @@ -0,0 +1,10 @@ +Title: docker_node_info: Inventory no longer crashes upon missing info +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547640973 +Class: fix + + diff --git a/inventory/docker_node_info b/inventory/docker_node_info index f6de95f..89cf62d 100644 --- a/inventory/docker_node_info +++ b/inventory/docker_node_info @@ -25,37 +25,36 @@ # Boston, MA 02110-1301 USA. +def _try_set(node, nkey, data, dkey): + if dkey in data: + node[nkey] = data[dkey] + + def inv_docker_node_info(parsed, inventory_tree, status_data_tree): if not parsed or not isinstance(parsed, dict): # String with error message in case the daemon is not running return node = inventory_tree.get_dict("software.applications.docker.") - node["version"] = parsed[u"ServerVersion"] - node["registry"] = parsed["IndexServerAddress"] + _try_set(node, "version", parsed, u"ServerVersion") + _try_set(node, "registry", parsed, "IndexServerAddress") # {"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null} - if parsed["Swarm"]["LocalNodeState"] == "inactive": - node["swarm_state"] = parsed["Swarm"]["LocalNodeState"] - else: - node.update({ - "swarm_state": parsed["Swarm"]["LocalNodeState"], - "swarm_manager": parsed["Swarm"]["RemoteManagers"], - "swarm_node_id": parsed["Swarm"]["NodeID"], - }) + swarm_data = parsed.get("Swarm", {}) + _try_set(node, "swarm_state", swarm_data, "LocalNodeState") + _try_set(node, "swarm_manager", swarm_data, "RemoteManagers") + _try_set(node, "swarm_node_id", swarm_data, "NodeID") - labels = parsed[u"Labels"] + labels = parsed.get(u"Labels") if labels: node_labels = inventory_tree.get_list("software.applications.docker.node_labels:") node_labels += [{"label": label} for label in labels] status_node = status_data_tree.get_dict("software.applications.docker.") - status_node.update({ - "num_containers_total": parsed["Containers"], - "num_containers_running": parsed["ContainersRunning"], - "num_containers_paused": parsed["ContainersPaused"], - "num_containers_stopped": parsed["ContainersStopped"], - "num_images": parsed["Images"], - }) + _try_set(status_node, "num_containers_total", parsed, "Containers") + _try_set(status_node, "num_containers_running", parsed, "ContainersRunning") + _try_set(status_node, "num_containers_paused", parsed, "ContainersPaused") + _try_set(status_node, "num_containers_stopped", parsed, "ContainersStopped") + _try_set(status_node, "num_images", parsed, "Images") inv_info['docker_node_info'] = { diff --git a/tests/unit/inventory/test_inv_docker_node_info.py b/tests/unit/inventory/test_inv_docker_node_info.py new file mode 100644 index 0000000..5fa6e99 --- /dev/null +++ b/tests/unit/inventory/test_inv_docker_node_info.py @@ -0,0 +1,62 @@ +import os +import pytest + +INV_FILE = os.path.join(os.path.dirname(__file__), '../../../inventory/docker_node_info') + + +class MockTree(object): + def __init__(self): + self.data = {} + + def get_dict(self, path): + return self.data.setdefault(path, dict()) + + def get_list(self, path): + return self.data.setdefault(path, list()) + + +(a)pytest.mark.parametrize('parsed,inv_data,stat_data', [ + ({"nothing": "usable"}, + {"software.applications.docker.": {}}, + {"software.applications.docker.": {}}), + ({'ServerVersion': u'1.17', + 'IndexServerAddress': u'https://registry.access.redhat.com/v1/', + u'Containers': 11, + u'ContainersPaused': 0, + u'ContainersRunning': 11, + u'ContainersStopped': 0, + u'Images': 22, + u'Swarm': {'LocalNodeState': u'active', + 'NodeID': u'Hier koennte ihre Werbung stehen.'}, + }, + { + "software.applications.docker.": { + "version": "1.17", + "registry": u'https://registry.access.redhat.com/v1/', + "swarm_state": "active", + "swarm_node_id": u'Hier koennte ihre Werbung stehen.', + }, + }, + { + "software.applications.docker.": { + "num_containers_total": 11, + "num_containers_running": 11, + "num_containers_paused": 0, + "num_containers_stopped": 0, + "num_images": 22, + }, + }) +]) +def test_inv_docker_node_info(parsed, inv_data, stat_data): + inventory_tree = MockTree() + status_data_tree = MockTree() + + context = {'inv_info': {}} + execfile(INV_FILE, context) + inv_docker_node_info = context["inv_docker_node_info"] + + inv_docker_node_info(parsed, inventory_tree, status_data_tree) + assert inventory_tree.data == inv_data + assert status_data_tree.data == stat_data + +

5 years, 8 months

7092 apc_netbotz_sensors: Shows sensor label in service details

by Simon Betz

Module: check_mk Branch: master Commit: fa9d94853a6cf3610172ad9b2c1d767008249cb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa9d94853a6cf3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 18 09:56:47 2019 +0100 7092 apc_netbotz_sensors: Shows sensor label in service details Change-Id: I3a0ffcc67e354c48547207e06041cfcb704c6ab4 --- .werks/7092 | 10 ++++++++++ checks/apc_netbotz_sensors | 24 ++++++++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.werks/7092 b/.werks/7092 new file mode 100644 index 0000000..e8faea7 --- /dev/null +++ b/.werks/7092 @@ -0,0 +1,10 @@ +Title: apc_netbotz_sensors: Shows sensor label in service details +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547801784 +Class: feature + + diff --git a/checks/apc_netbotz_sensors b/checks/apc_netbotz_sensors index 8bde785..5996725 100644 --- a/checks/apc_netbotz_sensors +++ b/checks/apc_netbotz_sensors @@ -124,14 +124,15 @@ def parse_apc_netbotz_sensors(info): "3": "dewpoint", } parsed = {} - for oid_item, reading_str, plugged_in_state in info: + for oid_item, reading_str, label, plugged_in_state in info: if plugged_in_state: item_info = oid_item.split(".") item_type = map_sensors[item_info[0]] item_name = " ".join(item_info[2:]) - parsed.setdefault(item_type, {}) - parsed[item_type][item_name] = float(reading_str) / 10 - + parsed.setdefault(item_type, {}).setdefault(item_name, { + "reading": float(reading_str) / 10, + "label": label + }) return parsed @@ -141,9 +142,10 @@ def inventory_apc_netbotz_sensors_temp(parsed, what): def check_apc_netbotz_sensors_temp(item, params, parsed, what): if item in parsed.get(what, []): - return check_temperature(parsed[what][item], params, - "apc_netbotz_sensors_%s_%s" % (what, item)) - + data = parsed[what][item] + state, infotext, perf = check_temperature(data['reading'], params, + "apc_netbotz_sensors_%s_%s" % (what, item)) + return state, "[%s] %s" % (data['label'], infotext), perf check_info['apc_netbotz_sensors'] = { 'parse_function' : parse_apc_netbotz_sensors, @@ -160,8 +162,8 @@ check_info['apc_netbotz_sensors'] = { ], [ "1", # NETBOTZV2-MIB::*SensorId "2", # NETBOTZV2-MIB::*SensorValue - "7", # NETBOTZV2-MIB::*ValueStr - # empty if sensor is not plugged in + "4", # NETBOTZV2-MIB::*SensorLabel + "7", # NETBOTZV2-MIB::*ValueStr; empty if sensor is not plugged in ]), 'snmp_scan_function' : lambda oid: \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10"), @@ -220,7 +222,9 @@ def inventory_apc_netbotz_sensors_humidity(parsed): def check_apc_netbotz_sensors_humidity(item, params, parsed): if item in parsed.get("humidity", []): - return check_humidity(parsed["humidity"][item], params) + data = parsed["humidity"][item] + state, infotext, perf = check_humidity(data['reading'], params) + return state, "[%s] %s" % (data['label'], infotext), perf check_info['apc_netbotz_sensors.humidity'] = {

5 years, 8 months

fix werk

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8b0e82480ebc0657717ff498e577a7314fb7f897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b0e82480ebc06… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jan 18 10:09:22 2019 +0100 fix werk Change-Id: Ic28cf73a9a96e4818ffa783d6ceff88eb1689eeb --- .werks/6957 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6957 b/.werks/6957 index f5c6f5b..dae1ef9 100644 --- a/.werks/6957 +++ b/.werks/6957 @@ -1,4 +1,4 @@ -Ttle: mk_job: Allow monitoring of jobs of users without login shell +Title: mk_job: Allow monitoring of jobs of users without login shell Level: 1 Component: checks Compatible: compat

5 years, 8 months

7009 FIX cpu.threads: On Solaris the number of threads was calculated incorrectly

by Simon Betz

Module: check_mk Branch: master Commit: 4b6733f8b8ff3d4d39a7476c8d8e0d644784a797 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b6733f8b8ff3d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 17 12:56:45 2019 +0100 7009 FIX cpu.threads: On Solaris the number of threads was calculated incorrectly In order to get the number of threads correctly we use 'ps -AL' instead of 'ps -o comm $ZONE'. Perhaps you have to adapt configured rules {{Number of threads}}. Change-Id: I9d1e762dcba95aa0e014c217d246cb288b73622c --- .werks/7009 | 13 +++++++++++++ agents/check_mk_agent.solaris | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/7009 b/.werks/7009 new file mode 100644 index 0000000..b13befe --- /dev/null +++ b/.werks/7009 @@ -0,0 +1,13 @@ +Title: cpu.threads: On Solaris the number of threads was calculated incorrectly +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547725852 +Class: fix + +In order to get the number of threads correctly we use 'ps -AL' +instead of 'ps -o comm $ZONE'. + +Perhaps you have to adapt configured rules {{Number of threads}}. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c92143a..0a2c320 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -289,9 +289,9 @@ fi # Simulated Output of Linux /proc/cpu echo '<<<cpu>>>' load=$(uptime|sed -e 's;.*average: $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$.*;\1 \2 \3;') -ps=$(($(ps -o comm $pszone | wc -l))) +nthreads=$(ps -AL --no-headers | wc -l) procs=$(($(psrinfo | wc -l))) -echo $load 1/$ps $$ $procs +echo $load 1/$nthreads $$ $procs # zpool status

5 years, 8 months

6957 FIX mk_job: Allow monitoring of jobs of users without login shell

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4d585dc76b4c107a2f2fb51ff10927c73bf22f91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d585dc76b4c10… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 17 16:23:10 2019 +0100 6957 FIX mk_job: Allow monitoring of jobs of users without login shell Previously, no shell was specified when changing the user ID to read the users job files. This made it impossible to monitor jobs of users without login shell, such as "www-data". The environment variable SHELL is now passed to su. Change-Id: I1fec0ed68b3ce959f4622b0b7b8f407b4cbe2178 --- .werks/6957 | 13 +++++++++++++ agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.openwrt | 2 +- agents/check_mk_agent.solaris | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.werks/6957 b/.werks/6957 new file mode 100644 index 0000000..f5c6f5b --- /dev/null +++ b/.werks/6957 @@ -0,0 +1,13 @@ +Ttle: mk_job: Allow monitoring of jobs of users without login shell +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547738482 +Class: fix + +Previously, no shell was specified when changing the user ID to read +the users job files. This made it impossible to monitor jobs of users +without login shell, such as "www-data". +The environment variable SHELL is now passed to su. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5e42273..2baf6fa 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -987,7 +987,7 @@ if pushd "$MK_VARDIR/job" >/dev/null; then do if [ -d "$username" ] && cd "$username" ; then if [ $EUID -eq 0 ]; then - su "$username" -c "head -n -0 -v *" + su -s "$SHELL" "$username" -c "head -n -0 -v *" else head -n -0 -v ./* fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 331b93c..71d6381 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -737,7 +737,7 @@ if pushd $MK_VARDIR/job >/dev/null; then do if [ -d "$username" ] && cd "$username" ; then if [ $EUID -eq 0 ]; then - su "$username" -c "head -n -0 -v *" + su -s "$SHELL" "$username" -c "head -n -0 -v *" else head -n -0 -v * fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 3420367..c92143a 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -166,14 +166,14 @@ if pushd $MK_VARDIR/job >/dev/null; then for username in * do if [ -d "$username" ] && cd "$username" ; then - count=$(su "$username" -c "ls -1 * | wc -l") + count=$(su -s "$SHELL" "$username" -c "ls -1 * | wc -l") if [ "$count" -eq "1" ]; then - filename=$(su "$username" -c "ls -1 *") + filename=$(su -s "$SHELL" "$username" -c "ls -1 *") echo "==> $filename <==" fi - su "$username" -c "head -n1000 *" + su -s "$SHELL" "$username" -c "head -n1000 *" cd .. fi done

5 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019