Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

WATO Web-API: creates a changelog entry on edit hosttags

by Andreas Boesl

Module: check_mk Branch: master Commit: a419e4a51f79321a383c2414fc53f08d9640ba45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a419e4a51f7932… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 23 11:35:54 2017 +0200 WATO Web-API: creates a changelog entry on edit hosttags Change-Id: I3822942606171dd630f87fce03f6dde2f33f707f --- web/plugins/webapi/webapi.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 63ee4d5..a6f7c2b 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -842,6 +842,7 @@ class APICallHosttags(APICallCollection): "configuration: %s") % ", ".join(missing_tags)) changed_hosttags_config.save() + add_change("edit-hosttags", _("Updated host tags through Web-API")) def _get_used_grouped_tags(self):

7 years, 1 month

4855 FIX Web-API Hosttags: add_hosttags no longer raises an exception when the configuration_hash key is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 60b620e5887b6526aeca78f22243e3a231a5c31f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b620e5887b65… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 22 15:01:29 2017 +0200 4855 FIX Web-API Hosttags: add_hosttags no longer raises an exception when the configuration_hash key is missing Change-Id: I17df3f71ba8e28327d2b76360180f709e59a296a --- .werks/4855 | 10 ++++++++++ web/plugins/webapi/webapi.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4855 b/.werks/4855 new file mode 100644 index 0000000..2b0e4b7 --- /dev/null +++ b/.werks/4855 @@ -0,0 +1,10 @@ +Title: Web-API Hosttags: add_hosttags no longer raises an exception when the configuration_hash key is missing +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503406852 +Class: fix + + diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 5a042b9..63ee4d5 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -812,7 +812,7 @@ class APICallHosttags(APICallCollection): hosttags_dict = hosttags_config.get_dict_format() if "configuration_hash" in request: validate_config_hash(request["configuration_hash"], hosttags_dict) - del request["configuration_hash"] + del request["configuration_hash"] # Check for conflicts with existing configuration # Tags may be either specified grouped in a host/folder configuration, e.g agent/cmk-agent,

7 years, 1 month

Add Werk 4564

by Andreas Umbreit

Module: check_mk Branch: master Commit: 304ebd99e070564d8214c4ecae6f123be38fcab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=304ebd99e07056… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Aug 23 11:06:19 2017 +0200 Add Werk 4564 Change-Id: I559434f014c09205352cd77af8f5dbe6af6371a2 --- .werks/4564 | 14 ++++ .../windows/frozen_binaries/pyinstaller-deps.make | 88 ++++++++++++++-------- 2 files changed, 70 insertions(+), 32 deletions(-) diff --git a/.werks/4564 b/.werks/4564 new file mode 100644 index 0000000..a90fc72 --- /dev/null +++ b/.werks/4564 @@ -0,0 +1,14 @@ +Title: Compatibility fix for windows agent updater +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1503477269 + +The command cmk-update-agent sometimes fails with an error message like +"Loadlibrary() argument 1 must be string not unicode error" when running on Windows. +The error cause is an incompatibility within Python 2.7.13 and some Python libraries. +We fix this issue by using Python 2.7.12 instead. diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index c72a21c..fb9a930 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -1,26 +1,31 @@ -PYTHON_VERSION = 2.7.13 +.PHONY: new_packages + +# Python 2.7.13 yields a bug concerning the LoadLibrary() function on windows, +# see http://bugs.python.org/issue29082 . Use 2.7.12 instead. +PYTHON_VERSION = 2.7.12 BUILD_DIR = $(shell realpath ./../../winbuild) PLUGINS_DIR = $(shell realpath ./../../plugins) # This package list originates from resolving the dependencies of the packages -# pyinstaller, pypiwin32, pyopenssl, pyopenssl. The required packages are explicitly listed +# pyinstaller, pyopenssl, requests. The required packages are explicitly listed # in favor of providing a working setup for a pyinstaller build with python 2.7 -PYTHON_PACKAGES = src/pip/appdirs-1.4.3-py2.py3-none-any.whl \ - src/pip/idna-2.5-py2.py3-none-any.whl \ - src/pip/pyparsing-2.2.0-py2.py3-none-any.whl \ - src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl \ - src/pip/ipaddress-1.0.18-py2-none-any.whl \ - src/pip/pypiwin32-219-cp27-none-win32.whl \ - src/pip/cffi-1.10.0-cp27-cp27m-win32.whl \ - src/pip/packaging-16.8-py2.py3-none-any.whl \ - src/pip/requests-2.13.0-py2.py3-none-any.whl \ - src/pip/cryptography-1.8.1-cp27-cp27m-win32.whl \ - src/pip/pycparser-2.17.tar.gz \ - src/pip/setuptools-34.3.3-py2.py3-none-any.whl \ - src/pip/enum34-1.1.6-py2-none-any.whl \ - src/pip/PyInstaller-3.2.1.tar.bz2 \ - src/pip/six-1.10.0-py2.py3-none-any.whl \ - src/pip/future-0.16.0.tar.gz \ - src/pip/pyOpenSSL-16.2.0-py2.py3-none-any.whl +PYTHON_PACKAGES = \ +src/pip/asn1crypto-0.22.0-py2.py3-none-any.whl \ +src/pip/certifi-2017.7.27.1-py2.py3-none-any.whl \ +src/pip/cffi-1.10.0-cp27-cp27m-win32.whl \ +src/pip/chardet-3.0.4-py2.py3-none-any.whl \ +src/pip/cryptography-2.0.3-cp27-cp27m-win32.whl \ +src/pip/enum34-1.1.6-py2-none-any.whl \ +src/pip/future-0.16.0.tar.gz \ +src/pip/idna-2.6-py2.py3-none-any.whl \ +src/pip/ipaddress-1.0.18-py2-none-any.whl \ +src/pip/pycparser-2.18.tar.gz \ +src/pip/PyInstaller-3.2.1.tar.bz2 \ +src/pip/pyOpenSSL-17.2.0-py2.py3-none-any.whl \ +src/pip/pypiwin32-219-cp27-none-win32.whl \ +src/pip/requests-2.18.4-py2.py3-none-any.whl \ +src/pip/setuptools-36.2.7-py2.py3-none-any.whl \ +src/pip/six-1.10.0-py2.py3-none-any.whl \ +src/pip/urllib3-1.22-py2.py3-none-any.whl src/python-$(PYTHON_VERSION).msi: cd src && wget https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… @@ -38,23 +43,42 @@ $(PYTHON_PACKAGES): src/python-$(PYTHON_VERSION).msi wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ mkdir pip && \ cd pip && \ - wine c:\\Python27\\python.exe -m pip download --no-deps appdirs==1.4.3 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps idna==2.5 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pyparsing==2.2.0 && \ wine c:\\Python27\\python.exe -m pip download --no-deps asn1crypto==0.22.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps ipaddress==1.0.18 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pypiwin32==219 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps certifi==2017.7.27.1 && \ wine c:\\Python27\\python.exe -m pip download --no-deps cffi==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps packaging==16.8 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps requests==2.13.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps cryptography==1.8.1 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pycparser==2.17 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps setuptools==34.3.3 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps chardet==3.0.4 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps cryptography==2.0.3 && \ wine c:\\Python27\\python.exe -m pip download --no-deps enum34==1.1.6 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pyinstaller==3.2.1 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps future==0.16.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps idna==2.6 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps ipaddress==1.0.18 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pycparser==2.18 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps PyInstaller==3.2.1 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pyOpenSSL==17.2.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps pypiwin32==219 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps requests==2.18.4 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps setuptools==36.2.7 && \ wine c:\\Python27\\python.exe -m pip download --no-deps six==1.10.0 && \ - wine c:\\Python27\\python.exe -m pip download --no-deps future==0.16.0. && \ - wine c:\\Python27\\python.exe -m pip download --no-deps pyOpenSSL==16.2.0 && \ + wine c:\\Python27\\python.exe -m pip download --no-deps urllib3==1.22 && \ + mkdir -p $(CURDIR)/src/pip && \ + cp -r * $(CURDIR)/src/pip + rm -rf $(BUILD_DIR) + +new_packages: src/python-$(PYTHON_VERSION).msi + # Use this target to obtain the newest versions of the needed packages. + # You should update the explicit dependencies afterwars because the automatic + # download of the latests packages might lead to an incosistent state, e.g. + # if a package gets downloaded multiple times with different versions. + mkdir $(BUILD_DIR) && \ + export WINEPREFIX=$(BUILD_DIR) && \ + cd $(BUILD_DIR) && \ + cp $(CURDIR)/src/python-$(PYTHON_VERSION).msi . && \ + wine msiexec /qn /i python-$(PYTHON_VERSION).msi && \ + mkdir pip && \ + cd pip && \ + wine c:\\Python27\\python.exe -m pip download requests && \ + wine c:\\Python27\\python.exe -m pip download pyinstaller && \ + wine c:\\Python27\\python.exe -m pip download pyOpenSSL && \ mkdir -p $(CURDIR)/src/pip && \ cp -r * $(CURDIR)/src/pip rm -rf $(BUILD_DIR)

7 years, 1 month

Revert "Updated werk 5112"

by Simon Betz

Module: check_mk Branch: master Commit: ecc359cd1cc2ce48056f4f09e7db121e63ab8040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc359cd1cc2ce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 22 15:11:57 2017 +0200 Revert "Updated werk 5112" This reverts commit f9d8d4804cc4856428b42b2d96d74dfa3e1baa08. --- checks/if.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/if.include b/checks/if.include index d606a50..3d0a3ed 100644 --- a/checks/if.include +++ b/checks/if.include @@ -432,7 +432,7 @@ def inventory_if_common(info, has_nodeinfo = False): if ifSpeed != "" and if_inventory_monitor_speed: params["speed"] = int(ifSpeed) - local_seen.add(item) + local_seen.add(ifIndex) pre_inventory.append( (item, "%r" % params, int(ifIndex)) ) global_seen = global_seen.union(local_seen)

7 years, 1 month

Revert "5112 FIX if.include: Fixed wrong handling of duplicate interfaces if 'use alias' or ' use desccription' is configured"

by Simon Betz

Module: check_mk Branch: master Commit: a0ed7c25a7785027c443c73bdfd62edc9aecd33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0ed7c25a77850… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 22 15:11:45 2017 +0200 Revert "5112 FIX if.include: Fixed wrong handling of duplicate interfaces if 'use alias' or 'use desccription' is configured" This reverts commit 3254092ff6feefbd511c50c87d0dd3f0b6613651. --- .werks/5112 | 19 ------------------- checks/if.include | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.werks/5112 b/.werks/5112 deleted file mode 100644 index 4c20abf..0000000 --- a/.werks/5112 +++ /dev/null @@ -1,19 +0,0 @@ -Title: if.include: Fixed wrong handling of duplicate interfaces if "use alias" or "use desccription" is configured -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i1 -Date: 1502973584 - -Within the rule {{Network Interface and Switch Port Discovery}} -you are able to configure the service description to use the -interface alias or description. Per default the index is used. -If there are duplicate interfaces with same name, the interface -index should be added. - - -Unfortunately, the afore-mentioned mechanism was broken. This -has been fixed. diff --git a/checks/if.include b/checks/if.include index a5d012c..d606a50 100644 --- a/checks/if.include +++ b/checks/if.include @@ -417,7 +417,7 @@ def inventory_if_common(info, has_nodeinfo = False): # Prepare single interfaces if not is_only_in_group: - if item in global_seen: + if ifIndex in global_seen: continue if item in seen_items: # duplicate

7 years, 1 month

Hacky workaround for spurious Jenkins failures.

by Sven Panne

Module: check_mk Branch: master Commit: 3ee6dad4161a51239e1ce5d1174b9defa7ec39cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ee6dad4161a51… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 22 15:06:15 2017 +0200 Hacky workaround for spurious Jenkins failures. Change-Id: I69e8c062b01e37908cfed53eda2d9a1cd73f3709 --- tests/testlib/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 4191da8..d166b88 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1144,6 +1144,16 @@ class CMKWebSession(WebSession): "Failed to activate %s: %r" % (site_id, status) assert status["_time_ended"] > time_started + # HACK: Activating changes can involve an asynchronous(!) monitoring + # core restart/reload, so e.g. querying a Livestatus table immediately + # might not reflect the changes yet. The right way to handle this would + # be polling the "program_start" column of the "status" table until the + # reload is complete. But this will only work if there is an actual + # restart/reload involved, which we don't know here, only our caller. + # Ugly workaround: Wait a moment and hope for the best, wasting a few + # seconds is better than a false positive during testing... >:-P + time.sleep(2) + def get_regular_graph(self, hostname, service_description, graph_index, expect_error=False): result = self._api_request("webapi.py?action=get_graph", {

7 years, 1 month

Refactoring: Replace strange while-true-except-StopIteration construct in df

by Konstantin Büttner

Module: check_mk Branch: master Commit: 355219f1637e2b0c093f8356a666b431bcc086e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355219f1637e2b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Aug 22 11:53:42 2017 +0200 Refactoring: Replace strange while-true-except-StopIteration construct in df Change-Id: If59b80d6242f958e615c36f666e0cabebe80003f --- checks/df | 78 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 42 deletions(-) diff --git a/checks/df b/checks/df index 2db54bf..d3e4435 100644 --- a/checks/df +++ b/checks/df @@ -94,49 +94,43 @@ def parse_df(info): df_blocks = [] df_inodes = [] btrfs_devices = set() # We might generalize that later - lines = iter(info) - - try: - is_inode = False - while True: - line = lines.next() - if line[-1] == '[df_inodes_start]': - is_inode = True - continue - elif line[-1] == '[df_inodes_end]': - is_inode = False - continue - - try: - int(line[1]) - except ValueError: - pass - else: - line = [ line[0], None ] + line[1:] - - if not is_inode: - # Handle known cases, where the file system contains spaces - for index, entry in enumerate(line): - if entry == "NTFS": - line = [ " ".join(line[:index]) ] + [line[index]] + line[index+1:index+5] + [ " ".join(line[index+5:]) ] - break - - if line[2] == "File" and line[3] == "System": - line = [ line[0], " ".join(line[1:4]) ] + line[4:] - - if line[1] == "btrfs": - device = line[0] - if device not in btrfs_devices: - btrfs_devices.add(device) - df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device - - else: - df_blocks.append(line) - else: - df_inodes.append(line) - except StopIteration: - pass + is_inode = False + for line in info: + if line[-1] == '[df_inodes_start]': + is_inode = True + continue + elif line[-1] == '[df_inodes_end]': + is_inode = False + continue + + try: + int(line[1]) + except ValueError: + pass + else: + line = [ line[0], None ] + line[1:] + + if not is_inode: + # Handle known cases, where the file system contains spaces + for index, entry in enumerate(line): + if entry == "NTFS": + line = [ " ".join(line[:index]) ] + [line[index]] + line[index+1:index+5] + [ " ".join(line[index+5:]) ] + break + + if line[2] == "File" and line[3] == "System": + line = [ line[0], " ".join(line[1:4]) ] + line[4:] + + if line[1] == "btrfs": + device = line[0] + if device not in btrfs_devices: + btrfs_devices.add(device) + df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device + + else: + df_blocks.append(line) + else: + df_inodes.append(line) return df_blocks, df_inodes

7 years, 1 month

5115 FIX zfs_arc_cache: Fixed wrong detected lines from agent output if they contain no counters, eg. 'class = misc'

by Simon Betz

Module: check_mk Branch: master Commit: 78b64711a6d1a5dc8d7dc938ceb594e5986d3f6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78b64711a6d1a5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 22 11:38:14 2017 +0200 5115 FIX zfs_arc_cache: Fixed wrong detected lines from agent output if they contain no counters, eg. 'class = misc' Change-Id: Icbbaacba412da36540ddf6efc8694dd1f9d686d9 --- .werks/5115 | 10 ++++++++++ checks/zfs_arc_cache | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5115 b/.werks/5115 new file mode 100644 index 0000000..c8be76c --- /dev/null +++ b/.werks/5115 @@ -0,0 +1,10 @@ +Title: zfs_arc_cache: Fixed wrong detected lines from agent output if they contain no counters, eg. 'class = misc' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503394551 +Class: fix + + diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index 2981a703..07afa68 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -253,7 +253,7 @@ def parse_zfs_arc_cache(info): parsed = {} for line in info: - if not (len(line) <= 2 or line[1] == "=" or line[2].isdigit()): + if not (len(line) >= 3 and line[1] == "=" and line[2].isdigit()): continue factor = 1

7 years, 1 month

Added configuration files for auto-completion via clang.

by Sven Panne

Module: check_mk Branch: master Commit: 9ff3249217941ac31de529373f8a05ba2a2ad42c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ff3249217941a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Aug 21 16:13:50 2017 +0200 Added configuration files for auto-completion via clang. Strictly speaking, the .clang_complete files are artifacts, because they could be generated from Makefile.am, perhaps via compile_commands.json. (BTW: Why on earth does clang_complete insist on its own creative home-grown format when there is a perfectly fine, standardized format: clang's compilation database compile_commands.json, invented just for tools like this? >:-P Yet another instance of "not invented here"...) OTOH, their content will change only very infrequently, and having some sane configuration for editing right out of the box is very convenient. Perhaps this is a tradeoff we might reconsider in the future... Change-Id: I6afa3246b315ede31834f082ee7a842cfe61d447 --- livestatus/src/.clang_complete | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/livestatus/src/.clang_complete b/livestatus/src/.clang_complete new file mode 100644 index 0000000..22f5fdd --- /dev/null +++ b/livestatus/src/.clang_complete @@ -0,0 +1,7 @@ +-I. +-I../.. +-I.. +-DHAVE_CONFIG_H +-std=c++14 +-Wall +-Wextra

7 years, 1 month

5113 FIX cifsmounts, nfsmounts: Fixed wrong reported error message if user has not right permissions on mount point

by Simon Betz

Module: check_mk Branch: master Commit: 90541b0c7d5ca988457327f7fedb96c04caa7f0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90541b0c7d5ca9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 18 13:23:37 2017 +0200 5113 FIX cifsmounts, nfsmounts: Fixed wrong reported error message if user has not right permissions on mount point Change-Id: I8e3eaf518034a6c6fb1d6d31796c19731461933d --- .werks/5113 | 10 +++++ agents/check_mk_agent.aix | 20 ++++++--- agents/check_mk_agent.linux | 30 +++++++------ agents/check_mk_agent.openwrt | 22 ++++++---- checks/cifsmounts | 1 + checks/network_fs.include | 97 ++++++++++++++++++++++++++----------------- checks/nfsmounts | 1 + 7 files changed, 115 insertions(+), 66 deletions(-) diff --git a/.werks/5113 b/.werks/5113 new file mode 100644 index 0000000..c0cc253 --- /dev/null +++ b/.werks/5113 @@ -0,0 +1,10 @@ +Title: cifsmounts, nfsmounts: Fixed wrong reported error message if user has not right permissions on mount point +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503055157 +Class: fix + + diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index ad0996e..1a91b67 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -136,18 +136,26 @@ fi # Check for hanging NFS mounts. This needs a GNU stat installed in the PATH if type stat >/dev/null 2>&1 ; then echo '<<<nfsmounts>>>' - mount | grep ' nfs' | awk '{print $3;}' | \ + mount | grep ' nfs' | awk '{print $3;}' | \ while read MP do - waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ - echo "$MP hanging 0 0 0 0" + if [ ! -r $MP ]; then + echo "$MP Permission denied" + else + waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ + echo "$MP hanging 0 0 0 0" + fi done echo '<<<cifsmounts>>>' - mount | grep ' cifs' | awk '{print $3;}' | \ + mount | grep ' cifs' | awk '{print $3;}' | \ while read MP do - waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ - echo "$MP hanging 0 0 0 0" + if [ ! -r $MP ]; then + echo "$MP Permission denied" + else + waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ + echo "$MP hanging 0 0 0 0" + fi done fi diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index caeed2a..2f5b94b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -300,28 +300,32 @@ then sed 's/\\040/ /g' | while read MP do - if [ $STAT_VERSION != $STAT_BROKE ]; then - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ - echo "$MP hanging 0 0 0 0" - else - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ - printf '\n'|| echo "$MP hanging 0 0 0 0" - fi + if [ ! -r $MP ]; then + echo "$MP Permission denied" + elif [ $STAT_VERSION != $STAT_BROKE ]; then + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ + echo "$MP hanging 0 0 0 0" + else + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ + printf '\n'|| echo "$MP hanging 0 0 0 0" + fi done echo '<<<cifsmounts>>>' sed -n '/ cifs\? /s/[^ ]* $[^ ]*$ .*/\1/p' < /proc/mounts | sed 's/\\040/ /g' | while read MP - do - if [ $STAT_VERSION != $STAT_BROKE ]; then + do + if [ ! -r $MP ]; then + echo "$MP Permission denied" + elif [ $STAT_VERSION != $STAT_BROKE ]; then waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" - else + else waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ - printf '\n'|| echo "$MP hanging 0 0 0 0" - fi - done + printf '\n'|| echo "$MP hanging 0 0 0 0" + fi + done fi # Check mount options. Filesystems may switch to 'ro' in case diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index ca6838d..d8ff0ec 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -278,13 +278,15 @@ then sed 's/\\040/ /g' | while read MP do - if [ $STAT_VERSION != $STAT_BROKE ]; then - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ - echo "$MP hanging 0 0 0 0" - else - waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ - printf '\n'|| echo "$MP hanging 0 0 0 0" - fi + if [ ! -r $MP ]; then + echo "$MP Permission denied" + if [ $STAT_VERSION != $STAT_BROKE ]; then + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ + echo "$MP hanging 0 0 0 0" + else + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ + printf '\n'|| echo "$MP hanging 0 0 0 0" + fi done echo '<<<cifsmounts>>>' @@ -292,12 +294,14 @@ then sed 's/\\040/ /g' | while read MP do - if [ $STAT_VERSION != $STAT_BROKE ]; then + if [ ! -r $MP ]; then + echo "$MP Permission denied" + elif [ $STAT_VERSION != $STAT_BROKE ]; then waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ echo "$MP hanging 0 0 0 0" else waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ - printf '\n'|| echo "$MP hanging 0 0 0 0" + printf '\n'|| echo "$MP hanging 0 0 0 0" fi done fi diff --git a/checks/cifsmounts b/checks/cifsmounts index 08e17ce..c1e88b8 100644 --- a/checks/cifsmounts +++ b/checks/cifsmounts @@ -31,6 +31,7 @@ check_info["cifsmounts"] = { + 'parse_function': parse_network_fs_mounts, 'check_function': check_network_fs_mounts, 'inventory_function': inventory_network_fs_mounts, 'service_description': 'CIFS mount %s', diff --git a/checks/network_fs.include b/checks/network_fs.include index 730267e..a52dd15 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -28,48 +28,69 @@ # <<<...mounts>>> # /foobar hanging 0 0 0 0 # /with spaces ok 217492 123563 112515 524288 +# /with spaces Permission denied -def inventory_network_fs_mounts(info): - return [ (" ".join(line[:-5]), None) for line in info ] +def parse_network_fs_mounts(info): + parsed = {} + for line in info: + if " ".join(line[-2:]) == "Permission denied": + parsed.setdefault(" ".join(line[:-2]), {"state": "Permission denied"}) + else: + parsed.setdefault(" ".join(line[:-5]), { + "state": line[-5], + "data": line[-4:], + }) -def check_network_fs_mounts(item, params, info): - for line in info: - mountpoint = " ".join(line[:-5]) - if mountpoint == item: - # On some operating systems there is no information about - # used and free space, but just dashes (e.g. AIX) - if line[-4] == '-': - if line[-5] == 'ok': - return 0, "mount seems OK" - else: - return 2, "Server not responding" - - size_blocks = int(line[-4]) - free_blocks = int(line[-2]) # for non-root user - blocksize = int(line[-1]) - - if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024*1024: - return 2, "Stale fs handle" - - size_bytes = size_blocks * blocksize - free_bytes = free_blocks * blocksize - used_bytes = size_bytes - free_bytes - used_perc = 100.0 * used_bytes / size_bytes - perfdata = None - if params is not None and params.get("has_perfdata"): - perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] - - if line[-5] == 'ok': - if size_bytes == 0: - return 0, "server is responding", perfdata - - return 0, "%.1f%% used (%s of %s)" % \ - (used_perc, get_bytes_human_readable(used_bytes), - get_bytes_human_readable(size_bytes)), perfdata + return parsed + + +def inventory_network_fs_mounts(parsed): + for mp in parsed: + yield mp, None + + +def check_network_fs_mounts(item, params, parsed): + if item in parsed: + attrs = parsed[item] + state = attrs["state"] + data = attrs.get("data") + + if state == "Permission denied" or data is None: + return 2, "Permissions denied" + size_blocks_, unused_, free_blocks_, block_size_ = data + if size_blocks_ == "-": + if state == 'ok': + return 0, "mount seems OK" else: - return 2, "server not responding", perfdata + return 2, "Server not responding" + + size_blocks = int(size_blocks_) + free_blocks = int(free_blocks_) # for non-root user + blocksize = int(block_size_) + + if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024*1024: + return 2, "Stale fs handle" + + size_bytes = size_blocks * blocksize + free_bytes = free_blocks * blocksize + used_bytes = size_bytes - free_bytes + used_perc = 100.0 * used_bytes / size_bytes + perfdata = None + if params is not None and params.get("has_perfdata"): + perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] + + if state == 'ok': + if size_bytes == 0: + return 0, "server is responding", perfdata + + return 0, "%.1f%% used (%s of %s)" % \ + (used_perc, get_bytes_human_readable(used_bytes), + get_bytes_human_readable(size_bytes)), perfdata + + else: + return 2, "server not responding", perfdata - return 3, "not mounted" + return 3, "%s not mounted" % item diff --git a/checks/nfsmounts b/checks/nfsmounts index a9cc3eb..b9ef802 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -31,6 +31,7 @@ check_info["nfsmounts"] = { + 'parse_function' : parse_network_fs_mounts, 'check_function' : check_network_fs_mounts, 'inventory_function' : inventory_network_fs_mounts, 'service_description' : 'NFS mount %s',

7 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017