Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

mkeventd: Fixed pylint validation errors

by Lars Michelsen

Module: check_mk Branch: master Commit: b23aa23cfa5d55ff5821612bd8582bc805384fc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b23aa23cfa5d55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 18:15:11 2016 +0200 mkeventd: Fixed pylint validation errors --- bin/mkeventd | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2c80cdc..7b734ea 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -359,7 +359,7 @@ def initialize_snmptrap_engine(): initialize_snmp_credentials() g_snmp_receiver = snmp_ntfrcv.NotificationReceiver(g_snmp_engine, - lambda *args: g_event_server.handle_snmptrap(*args)) + g_event_server.handle_snmptrap) def initialize_snmp_credentials(): @@ -1314,12 +1314,19 @@ class EventServer: log('Failed to translate OIDs, no modules loaded (see above)') return [(str(oid), str(value)) for oid, value in var_bind_list] + def translate(oid, value): + # Disable mib_var[0] type detection + # pylint: disable=no-member + mib_var = ObjectType(ObjectIdentity(oid), value).resolveWithMib(self._mib_resolver) + node = mib_var[0].getMibNode() + translated_oid = mib_var[0].prettyPrint().replace("\"", "") + translated_value = mib_var[1].prettyPrint() + + return node, translated_oid, translated_value + for oid, value in var_bind_list: try: - mib_var = ObjectType(ObjectIdentity(oid), value).resolveWithMib(self._mib_resolver) - node = mib_var[0].getMibNode() - translated_oid = mib_var[0].prettyPrint().replace("\"", "") - translated_value = mib_var[1].prettyPrint() + node, translated_oid, translated_value = translate(oid, value) if hasattr(node, "getUnits"): translated_value += ' ' + node.getUnits()

8 years, 5 months

inventory: clarified node type a bit more

by Lars Michelsen

Module: check_mk Branch: master Commit: 1dc3701e10393ca39c2f05cce62dda2cd0b5418e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dc3701e10393c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 08:08:32 2016 +0200 inventory: clarified node type a bit more --- inventory/aix_packages | 2 +- inventory/aix_service_packs | 2 +- inventory/aruba_wlc_aps | 2 +- inventory/dmidecode | 6 +++--- inventory/esx_vsphere_clusters | 2 +- inventory/if | 2 +- inventory/lnx_ip_a | 2 +- inventory/lnx_ip_r | 2 +- inventory/lnx_packages | 2 +- inventory/lnx_video | 2 +- inventory/mssql_versions | 2 +- inventory/netapp_api_disks | 2 +- inventory/snmp_extended_info | 2 +- inventory/solaris_pkginfo | 2 +- inventory/win_disks | 2 +- inventory/win_exefiles | 2 +- inventory/win_reg_uninstall | 2 +- inventory/win_video | 2 +- inventory/win_wmi_software | 2 +- modules/inventory.py | 8 ++++++++ 20 files changed, 29 insertions(+), 21 deletions(-) diff --git a/inventory/aix_packages b/inventory/aix_packages index fcfe7e3..7552626 100644 --- a/inventory/aix_packages +++ b/inventory/aix_packages @@ -36,7 +36,7 @@ def inv_aix_packages(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") headers = info[0] headers[0] = headers[0].lstrip("#") for line in info[1:]: diff --git a/inventory/aix_service_packs b/inventory/aix_service_packs index 50f258c..ee97af7 100644 --- a/inventory/aix_service_packs +++ b/inventory/aix_service_packs @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def inv_aix_service_packs(info): - node = inv_tree("software.os.service_packs:") + node = inv_tree_list("software.os.service_packs:") for line in info: node.append({ "name" : line[0]}) diff --git a/inventory/aruba_wlc_aps b/inventory/aruba_wlc_aps index eb3443d..8269cee 100644 --- a/inventory/aruba_wlc_aps +++ b/inventory/aruba_wlc_aps @@ -44,7 +44,7 @@ def inv_aruba_wlc_aps(info): "72" : "ap227", "73" : "ap214", "74" : "ap215", "75" : "ap228", "76" : "ap205H", "9999" : "undefined", } - node = inv_tree("networking.wlan.controller.accesspoints:") + node = inv_tree_list("networking.wlan.controller.accesspoints:") for ap_name, ap_status, ap_unprovisioned, ap_ip, ap_group, \ ap_model, ap_serial, ap_sysloc in info: node.append({ diff --git a/inventory/dmidecode b/inventory/dmidecode index c553139..7bf90c2 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -172,7 +172,7 @@ def inv_dmidecode_parse_processor(lines): # node["module_voltage"] = dmidecode_parse_voltage(line[1]) # # def inv_dmidecode_parse_mem_module(lines): -# node = inv_tree("hardware.memory.modules:") +# node = inv_tree_list("hardware.memory.modules:") # module = {} # node.append(module) # for line in lines: @@ -191,7 +191,7 @@ def inv_dmidecode_parse_processor(lines): def inv_dmidecode_parse_physical_mem_array(lines): # We expect several possible arrays - node = inv_tree("hardware.memory.arrays:") + node = inv_tree_list("hardware.memory.arrays:") # If we have a dummy entry from previous Memory Devices (see below) # then we fill that entry rather than creating a new one @@ -217,7 +217,7 @@ def inv_dmidecode_parse_mem_device(lines): # we assume that this device belongs to the most recently # read array. Otherwise we create a dummy entry and replace # that later with actual information - node = inv_tree("hardware.memory.arrays:") + node = inv_tree_list("hardware.memory.arrays:") if node: array = node[-1] else: diff --git a/inventory/esx_vsphere_clusters b/inventory/esx_vsphere_clusters index ffd6eb6..71b4637 100644 --- a/inventory/esx_vsphere_clusters +++ b/inventory/esx_vsphere_clusters @@ -31,7 +31,7 @@ def inv_esx_vsphere_clusters(info): - node = inv_tree("software.applications.vmwareesx:") + node = inv_tree_list("software.applications.vmwareesx:") datacenters = {} for line in info: diff --git a/inventory/if b/inventory/if index d7aa318..f45c967 100644 --- a/inventory/if +++ b/inventory/if @@ -44,7 +44,7 @@ def inv_if(info, params): total_ethernet_ports = 0 available_ethernet_ports = 0 - node = inv_tree("networking.interfaces:") + node = inv_tree_list("networking.interfaces:") for if_index, if_descr, if_alias, if_type, if_speed, if_high_speed, \ if_oper_status, if_admin_status, if_phys_address, if_last_change in port_info: diff --git a/inventory/lnx_ip_a b/inventory/lnx_ip_a index aba85f5..f557fa7 100644 --- a/inventory/lnx_ip_a +++ b/inventory/lnx_ip_a @@ -50,7 +50,7 @@ def inv_lnx_ip_a(info): "type" : '.' in address and "ipv4" or "ipv6", } - addresses = inv_tree("networking.addresses:") + addresses = inv_tree_list("networking.addresses:") for line in info: if line[0][-1] == ':': device = line[1].rstrip(':') diff --git a/inventory/lnx_ip_r b/inventory/lnx_ip_r index a9f4d12..a7535e5 100644 --- a/inventory/lnx_ip_r +++ b/inventory/lnx_ip_r @@ -58,7 +58,7 @@ def parse_lnx_ip_route(line): def inv_lnx_ip_r(info): - routes = inv_tree("networking.routes:") + routes = inv_tree_list("networking.routes:") for line in info: routes.append(parse_lnx_ip_route(line)) diff --git a/inventory/lnx_packages b/inventory/lnx_packages index eb0a3d9..a01fd40 100644 --- a/inventory/lnx_packages +++ b/inventory/lnx_packages @@ -43,7 +43,7 @@ def inv_lnx_packages(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") for pacname, version, arch, pactype, summary, inststate in info: if pactype == "deb": if "installed" not in inststate: diff --git a/inventory/lnx_video b/inventory/lnx_video index 1adba39..4446aa9 100644 --- a/inventory/lnx_video +++ b/inventory/lnx_video @@ -44,7 +44,7 @@ def inv_lnx_video(info): - node = inv_tree("hardware.video:") + node = inv_tree_list("hardware.video:") array = {} for line in info: if len(line) > 1: diff --git a/inventory/mssql_versions b/inventory/mssql_versions index bcf6b7e..f0e6080 100644 --- a/inventory/mssql_versions +++ b/inventory/mssql_versions @@ -33,7 +33,7 @@ # MSSQL_MSSQLSERVER|10.50.1600.1|Enterprise Edition def inv_mssql_versions(info): - node = inv_tree("software.applications.mssql.instances") + node = inv_tree_list("software.applications.mssql.instances:") for line in info: if len(line) not in [2, 4]: diff --git a/inventory/netapp_api_disks b/inventory/netapp_api_disks index aef23ab..df412f4 100644 --- a/inventory/netapp_api_disks +++ b/inventory/netapp_api_disks @@ -29,7 +29,7 @@ # disk 4E455441:50502020:56442D39:3030304D:422D465A:2D353230:38383633:32303037:00000000:00000000 used-space 9458679808 serial-number 88632007 raid-type pending vendor-id .. def inv_netapp_api_disk(info): - node = inv_tree("hardware.storage.disks:") + node = inv_tree_list("hardware.storage.disks:") for line in info: disk = {} line_dict = dict(map(lambda x: x.split(" ", 1), line)) diff --git a/inventory/snmp_extended_info b/inventory/snmp_extended_info index 63cbed7..980f563 100644 --- a/inventory/snmp_extended_info +++ b/inventory/snmp_extended_info @@ -66,7 +66,7 @@ def inv_snmp_extended_info(info): location_info = (map_type[parsed[parent][2]], parent) else: location_info = ("Missing in ENTITY table", parent) - node = inv_tree("hardware.components.%ss:" % (map_type[entity_type]).lower()) + node = inv_tree_list("hardware.components.%ss:" % (map_type[entity_type]).lower()) node.append({ "index" : index, "name" : name, diff --git a/inventory/solaris_pkginfo b/inventory/solaris_pkginfo index a243907..0196639 100644 --- a/inventory/solaris_pkginfo +++ b/inventory/solaris_pkginfo @@ -47,7 +47,7 @@ def inv_solaris_pkginfo(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") entry = {} translation_dict = { "ARCH" : "arch", diff --git a/inventory/win_disks b/inventory/win_disks index 013c3ed..05e7627 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -58,7 +58,7 @@ # SCSITargetId : 0 def inv_win_disks(info): - node = inv_tree("hardware.storage.disks:") + node = inv_tree_list("hardware.storage.disks:") array = {} first_varname = None diff --git a/inventory/win_exefiles b/inventory/win_exefiles index d9a1641..3e30976 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -32,7 +32,7 @@ # C:\Program Files\Common Files\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPSVC.EXE|5132888 def inv_win_exefiles(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") for line in info: if len(line) != 6: continue # ignore broken lines containing parse errors diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 903389d..a8d3c0f 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -29,7 +29,7 @@ # ... def inv_win_reg_uninstall(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") for line in info: if len(line) == 7: display_name, publisher, path, pacname, version, estimated_size, date = line diff --git a/inventory/win_video b/inventory/win_video index ab4489e..8733530 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -37,7 +37,7 @@ def inv_win_video(info): - node = inv_tree("hardware.video:") + node = inv_tree_list("hardware.video:") array = {} first_varname = None for line in info: diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index 1140c71..00a778b 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -35,7 +35,7 @@ def inv_win_wmi_software(info): - paclist = inv_tree("software.packages:") + paclist = inv_tree_list("software.packages:") for line in info: pacname, vendor, version = line[0:3] dat = line[3] diff --git a/modules/inventory.py b/modules/inventory.py index 0070cf2..937e960 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -67,6 +67,14 @@ for f in filelist: sys.exit(5) +# This is just a small wrapper for the inv_tree() function which makes +# it clear that the requested tree node is treated as a list. +def inv_tree_list(path): + l = [] + l += inv_tree(path) + return l + + # Function for accessing the inventory tree of the current host # Example: path = "software.packages:17." # The path must end with : or .

8 years, 5 months

pylint: Always showing repo paths in pylint results

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ff5d3325112e7b525d26ae71f6e28644e3cd4ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ff5d3325112e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 08:58:55 2016 +0200 pylint: Always showing repo paths in pylint results --- pylint/pylint_cmk.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pylint/pylint_cmk.py b/pylint/pylint_cmk.py index b2b7fc6..1ce6a07 100644 --- a/pylint/pylint_cmk.py +++ b/pylint/pylint_cmk.py @@ -175,8 +175,31 @@ def ensure_equal_branches(): # python sources class CMKFixFileMixin(object): def handle_message(self, msg): - lines = file(msg.abspath).readlines() + new_path, new_line = self._orig_location_from_compiled_file(msg) + + if new_path == None: + new_path = self._change_path_to_repo_path(msg) + + if new_path != None: + msg = msg._replace(path=new_path) + if new_line != None: + msg = msg._replace(line=new_line) + + super(CMKFixFileMixin, self).handle_message(msg) + + def _change_path_to_repo_path(self, msg): + abspath = os.path.join(os.getcwd(), msg.abspath) + parts = abspath.split("/") + while parts and parts[0] not in ["check_mk", "cmc"]: + parts.pop(0) + + if parts: + return "/".join(parts) + + + def _orig_location_from_compiled_file(self, msg): + lines = file(msg.abspath).readlines() line_nr = msg.line orig_file, went_back = None, -3 while line_nr > 0: @@ -187,10 +210,10 @@ class CMKFixFileMixin(object): orig_file = line.split(": ", 1)[1].strip() break - if orig_file != None: - msg = msg._replace(line=went_back, path=orig_file) + if orig_file == None: + went_back = None - super(CMKFixFileMixin, self).handle_message(msg) + return orig_file, went_back

8 years, 5 months

3526 FIX Inventory scripts are no longer called when no data is available for their section

by Andreas Boesl

Module: check_mk Branch: master Commit: 7e5170b4fc6b9a48f86708913ad660fd73a30c56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e5170b4fc6b9a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 28 16:24:04 2016 +0200 3526 FIX Inventory scripts are no longer called when no data is available for their section This fixes an error where the aix_packages inventory plugin was always called on any host. --- inventory/aix_packages | 5 ----- 1 file changed, 5 deletions(-) diff --git a/inventory/aix_packages b/inventory/aix_packages index 869d26c..fcfe7e3 100644 --- a/inventory/aix_packages +++ b/inventory/aix_packages @@ -36,12 +36,7 @@ def inv_aix_packages(info): - if not info: - return # Empty section - paclist = inv_tree("software.packages:") - if not info: - return headers = info[0] headers[0] = headers[0].lstrip("#") for line in info[1:]:

8 years, 5 months

3526 FIX Inventory scripts are no longer called when no data is available for their section

by Andreas Boesl

Module: check_mk Branch: master Commit: 8efcc901311746173eb5ab9eda5bce07341e3a06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8efcc901311746… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 28 16:24:04 2016 +0200 3526 FIX Inventory scripts are no longer called when no data is available for their section This fixes an error where the aix_packages inventory plugin was always called on any host. --- .werks/3526 | 9 +++++++++ ChangeLog | 1 + modules/inventory.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3526 b/.werks/3526 new file mode 100644 index 0000000..9343406 --- /dev/null +++ b/.werks/3526 @@ -0,0 +1,9 @@ +Title: Inventory scripts are no longer called when no data is available for their section +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.9i1 +Date: 1461853219 +Class: fix + +This fixes an error where the aix_packages inventory plugin was always called on any host. diff --git a/ChangeLog b/ChangeLog index 4cfb241..7e42481 100644 --- a/ChangeLog +++ b/ChangeLog @@ -388,6 +388,7 @@ * 3013 FIX: Inventory: snmp inventory plugins never use cached data... * 3340 FIX: Fixed exception when searching for software package sizes * 3025 FIX: solaris_pkginfo: the last element of the reported software package list was always missing + * 3526 FIX: Inventory scripts are no longer called when no data is available for their section... 1.2.8b1: diff --git a/modules/inventory.py b/modules/inventory.py index 07ae365..0070cf2 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -254,7 +254,7 @@ def do_inv_for(hostname): raise # Otherwise simply ignore missing agent section continue - if info == None: # section not present (None or []) + if not info: # section not present (None or []) # Note: this also excludes existing sections without info.. continue

8 years, 5 months

3241 FIX Fixed broken apt plugin

by Sven Panne

Module: check_mk Branch: master Commit: 5ea7a0081fc3d014376931767c0279d2f6fb8c4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ea7a0081fc3d0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 28 15:20:02 2016 +0200 3241 FIX Fixed broken apt plugin --- .werks/3241 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_apt | 9 +++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/3241 b/.werks/3241 new file mode 100644 index 0000000..3ff85a2 --- /dev/null +++ b/.werks/3241 @@ -0,0 +1,10 @@ +Title: Fixed broken apt plugin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461849557 + + diff --git a/ChangeLog b/ChangeLog index d66279f..4cfb241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -198,6 +198,7 @@ * 3443 FIX: mk_logwatch: Fixed exception in agent plugin configuration parsing error handling * 3444 FIX: mssql: Reworked agent plugin to use less WMI calls * 3525 FIX: Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout... + * 3241 FIX: Fixed broken apt plugin Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/mk_apt b/agents/plugins/mk_apt index 19369de..c4ded2d 100755 --- a/agents/plugins/mk_apt +++ b/agents/plugins/mk_apt @@ -43,7 +43,12 @@ DO_UPDATE=yes function check_apt_update { if [ "$DO_UPDATE" = yes ] ; then - apt-get update -qq + # NOTE: Even with -qq, apt-get update can output several lines to + # stderr, e.g.: + # + # W: There is no public key available for the following key IDs: + # 1397BC53640DB551 + apt-get update -qq 2> /dev/null fi apt-get -o 'Debug::NoLocking=true' -s -qq "$UPGRADE" | grep -v '^Conf' } @@ -52,7 +57,7 @@ function check_apt_update { if type apt-get > /dev/null ; then echo '<<<apt:sep(0)>>>' out=$(check_apt_update) - if [ -z $out ]; then + if [ -z "$out" ]; then echo "No updates pending for installation" else echo "$out"

8 years, 5 months

Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b3a79f045f32502cc99019fb152597f0f21f9ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b3a79f045f325… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 28 15:15:40 2016 +0200 Updated Werk description --- .werks/2934 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2934 b/.werks/2934 index 0763e4b..6a92c35 100644 --- a/.werks/2934 +++ b/.werks/2934 @@ -1,5 +1,5 @@ -Title: all temperature checks rewritten to use the shared temperature api -Level: 3 +Title: All temperature checks now use common code and have the same features +Level: 2 Component: checks Compatible: incomp Version: 1.2.7i4

8 years, 5 months

3525 FIX Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout

by Andreas Boesl

Module: check_mk Branch: master Commit: 9950613ccc196701417d49afc08e92881b2ef448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9950613ccc1967… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 28 12:25:56 2016 +0200 3525 FIX Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout Datasource programs like the special agents for ESX and NetApp did not get killed correctly, when the service timeout was reached. This bug only applies to the Nagios Core. --- .werks/3525 | 10 ++++++++++ ChangeLog | 3 ++- modules/check_mk_base.py | 14 +++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.werks/3525 b/.werks/3525 new file mode 100644 index 0000000..03205ad --- /dev/null +++ b/.werks/3525 @@ -0,0 +1,10 @@ +Title: Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461838635 +Class: fix + +Datasource programs like the special agents for ESX and NetApp did not get killed correctly, +when the service timeout was reached. This bug only applies to the Nagios Core. diff --git a/ChangeLog b/ChangeLog index 6ea00c3..d66279f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -197,9 +197,9 @@ * 3126 FIX: fixed crash in some wmi-based checks when items disappear from the agent output * 3443 FIX: mk_logwatch: Fixed exception in agent plugin configuration parsing error handling * 3444 FIX: mssql: Reworked agent plugin to use less WMI calls + * 3525 FIX: Nagios Core: fixed bug, incomplete cleanup of process tree on service check timeout... Multisite: - * 3127 new icon on services that are outside their check period * 3187 notification view: new filter for log command via regex * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... @@ -211,6 +211,7 @@ NOTE: Please refer to the migration notes! * 3397 Show IP addresses of a host when hovering over its name... * 3436 Views/Dashobards: Can now be published to members of contact groups... + * 3127 new icon on services that are outside their check period * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 167fd94..903ab58 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -786,9 +786,17 @@ def get_agent_info_program(commandline): vverbose("Calling external program %s\n" % commandline) try: - p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull), - stdout=subprocess.PIPE, stderr = subprocess.PIPE, - preexec_fn=os.setsid, close_fds=True) + if monitoring_core == "cmc": + p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull), + stdout=subprocess.PIPE, stderr = subprocess.PIPE, + preexec_fn=os.setsid, close_fds=True) + else: + # We can not create a separate process group when running Nagios + # Upon reaching the service_check_timeout Nagios only kills the process + # group of the active check. + p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull), + stdout=subprocess.PIPE, stderr = subprocess.PIPE, + close_fds=True) stdout, stderr = p.communicate() exitstatus = p.returncode except MKTimeout:

8 years, 5 months

3444 FIX mssql: Reworked agent plugin to use less WMI calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 86267cdda25f287bc90f362b7a5b7944cb3187ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86267cdda25f28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 09:25:14 2016 +0200 3444 FIX mssql: Reworked agent plugin to use less WMI calls --- .werks/3444 | 9 ++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 198 ++++++++++++++++++-------------------- checks/mssql_versions | 12 ++- 4 files changed, 111 insertions(+), 109 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=86267cdda2…

8 years, 5 months

3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition

by Lars Michelsen

Module: check_mk Branch: master Commit: e029dbff25c2ce29bbf5597fc98be25f54da5dfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e029dbff25c2ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 28 09:26:03 2016 +0200 3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition --- .werks/3445 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/3445 b/.werks/3445 new file mode 100644 index 0000000..e3e2827 --- /dev/null +++ b/.werks/3445 @@ -0,0 +1,9 @@ +Title: mssql_versions: With up-to-date agent plugin it is now writing out the used edition +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461828353 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f48814d..9ab192d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ * 3473 fileinfo.groups: the include patterns now also support the pattern YESTERDAY, in addition to DATE... * 3428 bluenet2_powerrail, bluenet2_powerrail.rcm, bluenet2_powerrail.temp, bluenet2_powerrail.humidity: new checks for Bachmann Bluenet2 Powerrails which support the BACHMANN-bluenet2-MIB * 3524 fileinfo, fileinfo.groups: both checks are now cluster ready... + * 3445 mssql_versions: With up-to-date agent plugin it is now writing out the used edition * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016