Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 592201edbb08f0b84cd379f174fcec00b3e7785a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=592201edbb08f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 28 21:00:27 2017 +0200 .f12 file: Respect ONLY_COPY setting Change-Id: Idb7541cbfb1ac0f2242c08a380b82b6f5b139311 --- .werks/.f12 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.werks/.f12 b/.werks/.f12 index bb0ab06..3238191 100644 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -8,4 +8,7 @@ make -C .. enterprise/werks sudo install -m 644 -g $SITE -o $SITE ../enterprise/werks /omd/sites/$SITE/share/check_mk/werks/werks-cmc make -C .. managed/werks sudo install -m 644 -g $SITE -o $SITE ../managed/werks /omd/sites/$SITE/share/check_mk/werks/werks-cme -sudo omd restart $SITE apache + +if [ -z $ONLY_COPY ]; then + sudo omd restart $SITE apache +fi

7 years, 8 months

crawl test: enable debug mode, save more logs from test run

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d57b90bfe9319825a7cee8b4aa6353f307bddda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d57b90bfe9319… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 29 08:22:46 2017 +0200 crawl test: enable debug mode, save more logs from test run Change-Id: I1ed10b51a510d824f27cff6ac609f742472152cc --- tests/testlib/__init__.py | 24 +++++++++++++++++++++++- tests/web/test_crawl.py | 17 ++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c32f7c9..a108e98 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -246,12 +246,23 @@ class Site(object): if not self._is_running_as_site_user(): p = self.execute(["cat", "%s/%s" % (self.root, rel_path)], stdout=subprocess.PIPE) if p.wait() != 0: - raise MKGeneralException("Failed to read file %s. Exit-Code: %d" % (rel_path, p.wait())) + raise Exception("Failed to read file %s. Exit-Code: %d" % (rel_path, p.wait())) return p.stdout.read() else: return open("%s/%s" % (self.root, rel_path)).read() + def write_file(self, rel_path, content): + if not self._is_running_as_site_user(): + p = self.execute(["dd", "of=%s/%s" % (self.root, rel_path)], + stdout=subprocess.PIPE, stdin=subprocess.PIPE) + p.communicate(content) + if p.wait() != 0: + raise Exception("Failed to write file %s. Exit-Code: %d" % (rel_path, p.wait())) + else: + return open("%s/%s" % (self.root, rel_path), "w").write(content) + + def file_exists(self, rel_path): if not self._is_running_as_site_user(): p = self.execute(["test", "-e", "%s/%s" % (self.root, rel_path)], stdout=subprocess.PIPE) @@ -292,6 +303,8 @@ class Site(object): if self.update_with_git: self._update_with_f12_files() + self._enable_mod_python_debug() + def _update_with_f12_files(self): paths = [ @@ -340,6 +353,15 @@ class Site(object): sys.stdout.flush() + def _enable_mod_python_debug(self): + path = "etc/check_mk/apache.conf" + content = self.read_file(path) + + self.write_file(path, + content.replace("PythonHandler index", + "PythonHandler index\n PythonDebug On")) + + def rm_if_not_reusing(self): if not self.reuse: self.rm() diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index 2186970..4e372b0 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -319,7 +319,11 @@ class TestCrawler(object): def web_log_file(self): - return var_dir() + "/craw-web.log" + return var_dir() + "/crawl-web.log" + + + def apache_error_log_file(self): + return var_dir() + "/crawl-apache_error_log.log" def load_stats(self): @@ -383,11 +387,14 @@ class TestCrawler(object): os.rename(self.report_file()+".tmp", self.report_file()) - # Save the web.log for later diagnose - if self.site.file_exists("var/log/web.log"): - open(self.web_log_file(), "w").write(self.site.read_file("var/log/web.log")) - if self.errors: + for site_path, test_path in [ + ("var/log/web.log", self.web_log_file()), + ("var/log/apache/error_log", self.apache_error_log_file()), + ]: + if self.site.file_exists(site_path): + open(test_path, "w").write(self.site.read_file(site_path)) + pytest.fail("Crawled %d URLs in %d seconds. Failures:\n%s" % (len(self.visited), time.time() - self.started, "\n".join(self.errors)))

7 years, 8 months

4532 FIX Removed inventory plugin oracle_performance in sense of werk 4485 and unified all other Oracle inventory plugins

by Simon Betz

Module: check_mk Branch: master Commit: 3551e7738600eb9fc47af49d0e4bfeebd046186f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3551e7738600eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 28 18:51:02 2017 +0200 4532 FIX Removed inventory plugin oracle_performance in sense of werk 4485 and unified all other Oracle inventory plugins Change-Id: I5b73bb731d2993f1272a1d2278c7d580c67c69dd --- .werks/4532 | 11 +++++++ inventory/oracle_dataguard_stats | 2 +- inventory/oracle_instance | 4 +-- inventory/oracle_performance | 46 --------------------------- inventory/oracle_recovery_area | 2 +- inventory/oracle_tablespaces | 2 +- web/plugins/views/inventory.py | 69 ++++++++++++++++++++-------------------- 7 files changed, 51 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3551e77386…

7 years, 8 months

Adapted paint_size function if size is None

by Simon Betz

Module: check_mk Branch: master Commit: 8c3d7ab278c3e03c7900b9ebb071af0cb9aa9f11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c3d7ab278c3e0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 28 17:37:28 2017 +0200 Adapted paint_size function if size is None Change-Id: I4908742cb51bc1de11956bfbb75250d9a414d21c --- web/plugins/views/inventory.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 676eb39..06fbe4f 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -422,6 +422,8 @@ def inv_paint_bytes(b): def inv_paint_size(b): + if b is None: + return "", "" return "number", bytes_human_readable(b)

7 years, 8 months

4544 FIX multipath: Fixed missing infos in output if a failure occurs

by Marcel Arentz

Module: check_mk Branch: master Commit: 8d9acfe2804b047490f03eb3d4b4d9450442c29d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d9acfe2804b04… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 20 14:36:58 2017 +0100 4544 FIX multipath: Fixed missing infos in output if a failure occurs The output of available/expected paths way missing, if a path was failing. Now the information of failure will be added instead of replacing the original information. Change-Id: Ifdebc0447ab7b20537bfae37f175d96c787091c0 --- .werks/4544 | 12 +++++++++ checks/multipath | 82 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 59 insertions(+), 35 deletions(-) diff --git a/.werks/4544 b/.werks/4544 new file mode 100644 index 0000000..d7cbc0c --- /dev/null +++ b/.werks/4544 @@ -0,0 +1,12 @@ +Title: multipath: Fixed missing infos in output if a failure occurs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490016471 +Class: fix + +The output of available/expected paths way missing, if a path was failing. Now +the information of failure will be added instead of replacing the original +information. diff --git a/checks/multipath b/checks/multipath index b1e8f55..08119b2 100644 --- a/checks/multipath +++ b/checks/multipath @@ -280,7 +280,8 @@ def inventory_multipath(parsed): return inventory # item is UUID (e.g. '360a9800043346937686f456f59386741') or alias (e.g. 'mpath0') -def check_multipath(item, target_numpaths, parsed): +#def check_multipath(item, target_numpaths, parsed): +def check_multipath(item, params, parsed): # Keys in parsed are the UUIDs. First assume that we are # looking for a UUID. Then fall back to aliases if item in parsed: @@ -293,7 +294,8 @@ def check_multipath(item, target_numpaths, parsed): if mmap.get("alias") == item: break else: - return 3, "Multipath device not found in agent output" + yield 3, "Multipath device not found in agent output" + return # If the item is the alias, then show the UUID in the plugin output. # If the item is the UUID, then vice versa. @@ -301,46 +303,56 @@ def check_multipath(item, target_numpaths, parsed): uuid = mmap.get('uuid') if item == uuid and alias: - aliasinfo = "(%s) " % alias + aliasinfo = "(%s):" % alias elif item == alias and uuid: - aliasinfo = "(%s) " % uuid + aliasinfo = "(%s):" % uuid else: aliasinfo = "" - numpaths = mmap['numpaths'] - broken = mmap['broken_paths'] - numbroken = len(broken) - if numbroken > 0: - return (2, "%sbroken paths: %s" % (aliasinfo, ",".join(broken))) - - if target_numpaths == None: - target_numpaths = 2 # default case: we need two paths - elif type(target_numpaths) == tuple: - warn, crit = target_numpaths - warn_num = (warn / 100.0) * numpaths - crit_num = (crit / 100.0) * numpaths - levels = " (Warning/ Critical at %d/ %d)" % (warn_num, crit_num) - info = "%spaths active: %d" % (aliasinfo, numpaths) - if numpaths <= crit_num: - return 2, info + levels - elif numpaths <= warn_num: - return 1, info + levels + all_paths = mmap['paths'] + broken_paths = mmap['broken_paths'] + num_paths = len(all_paths) + num_broken = len(broken_paths) + num_active = num_paths - num_broken + + yield 0, "%s paths active: %s, expected paths: %d" % \ + (aliasinfo, num_active, num_paths) + + if isinstance(params, tuple): + warn, crit = params + warn_num = (warn / 100.0) * num_paths + crit_num = (crit / 100.0) * num_paths + if num_active <= crit_num: + state = 2 + elif num_active <= warn_num: + state = 1 else: - return 0, info + state = 0 - info = "%spaths expected: %d, paths active: %d" % (aliasinfo, target_numpaths, numpaths) - - if numpaths < target_numpaths: - return 2, info - elif numpaths > target_numpaths: - return 1, info + if state > 0: + yield state, "(warn, crit at %d/%d)" % (warn_num, crit_num) else: - return 0, info + if isinstance(params, int): + expected_paths = params + else: + expected_paths = 2 + if num_active < expected_paths: + state = 2 + elif num_active > expected_paths: + state = 1 + else: + state = 0 + + if state > 0: + yield state, "(crit if less than %d)" % expected_paths + + if num_broken > 0: + yield 0, "broken paths: %s" % ",".join(broken_paths) check_info["multipath"] = { - 'check_function': check_multipath, - 'inventory_function': inventory_multipath, - 'parse_function': parse_multipath, - 'service_description': 'Multipath %s', - 'group': 'multipath', + 'check_function' : check_multipath, + 'inventory_function' : inventory_multipath, + 'parse_function' : parse_multipath, + 'service_description' : "Multipath %s", + 'group' : "multipath", }

7 years, 8 months

4541 esx_vsphere_vm: Added age of oldest snapshot

by Marcel Arentz

Module: check_mk Branch: master Commit: ba0515c2c740dc5cda7b160905f471a8a19618b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0515c2c740dc… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 15 17:02:52 2017 +0100 4541 esx_vsphere_vm: Added age of oldest snapshot This new information can also be configured by rule as the existing one. Change-Id: I4271b08c28da7ee7fe83f918c32dd4d6c26b344c --- .werks/4541 | 10 +++++++ checkman/esx_vsphere_vm.snapshots | 1 + checks/esx_vsphere_vm | 53 ++++++++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 12 +++++++- 4 files changed, 63 insertions(+), 13 deletions(-) diff --git a/.werks/4541 b/.werks/4541 new file mode 100644 index 0000000..aa63253 --- /dev/null +++ b/.werks/4541 @@ -0,0 +1,10 @@ +Title: esx_vsphere_vm: Added age of oldest snapshot +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489593672 +Class: feature + +This new information can also be configured by rule as the existing one. diff --git a/checkman/esx_vsphere_vm.snapshots b/checkman/esx_vsphere_vm.snapshots index 84c4315..481901e 100644 --- a/checkman/esx_vsphere_vm.snapshots +++ b/checkman/esx_vsphere_vm.snapshots @@ -6,6 +6,7 @@ distribution: check_mk description: For a virtual machine running on ESX this check reports the number of snapshots, the currently running snapshot and the age of the latest snapshot + as well as the oldest snapshot. inventory: On each VM one check is generated if there is snapshot information available diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 18501c4..c6e49b6 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -379,43 +379,72 @@ def inventory_esx_vsphere_vm_snapshots(info): return [(None, {})] def check_esx_vsphere_vm_snapshots(_no_item, params, info): + def check_levels(age, warn, crit): + if age >= crit: + return (2, "snapshot is older than %s" % get_age_human_readable(age)) + elif age >= warn: + return (1, "snapshot is older than %s" % get_age_human_readable(age)) + else: + return (0, "") + data = esx_vsphere_vm_convert(info) if 'snapshot.rootSnapshotList' not in data: yield 0, "No snapshots found" else: last_snapshot = None + oldest_snapshot = None powered_on_snapshot = None snapshots = map(lambda x: x.split(" ", 3), " ".join(data["snapshot.rootSnapshotList"]).split("|")) snapshots = map(lambda x: (int(x[0]), int(x[1]), x[2], x[3]) , snapshots) yield 0, "Number of Snapshots %d" % len(snapshots) if len(snapshots) > 0: + perfdata = [] + last_time = max(zip(*snapshots)[1]) + oldest_time = min(zip(*snapshots)[1]) last_snapshot = snapshots[0] + oldest_snapshot = snapshots[0] for snapshot in snapshots: - if snapshot[1] > last_snapshot[1]: + if last_time == snapshot[1]: last_snapshot = snapshot - if snapshot[2] == "poweredOn": + elif oldest_time == snapshot[1]: + oldest_snapshot = snapshot + + if "poweredOn" == snapshot[2]: powered_on_snapshot = snapshot yield 0, "Powered On: %s" % (powered_on_snapshot and powered_on_snapshot[3] or "None") - perfdata = [] - snapshot_age = time.time() - last_snapshot[1] + last_snapshot_age = time.time() - last_snapshot[1] if params.get("age"): warn, crit = params["age"] - if snapshot_age > crit: - yield 2, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) - elif snapshot_age > warn: - yield 1, "Snapshot is older than %s" % get_age_human_readable(snapshot_age) - perfdata = [("age", snapshot_age, warn, crit)] - else: - perfdata = [("age", snapshot_age)] - + state, message = check_levels(last_snapshot_age, warn, crit) + if state > 0: + yield state, "Last %s" % message, + perfdata = [ ("age", last_snapshot_age, warn, crit) ] + else: + perfdata = [ ("age", last_snapshot_age) ] yield 0, "Last Snapshot: %s %s" % (last_snapshot[3], time.strftime("%D %H:%M",time.localtime(last_snapshot[1]))),\ perfdata + # Display oldest snapshot only, if it is not identical with the last snapshot + if not oldest_snapshot == last_snapshot: + oldest_snapshot_age = time.time() - oldest_snapshot[1] + if params.get("age_oldest"): + warn, crit = params["age_oldest"] + state, message = check_levels(oldest_snapshot_age, warn, crit) + if state > 0: + yield state, "Oldest %s" % message, + perfdata = [ ("age_oldst", oldest_snapshot_age, warn, crit) ] + else: + perfdata = [ ("age_oldest", oldest_snapshot_age) ] + + yield 0, "Oldest Snapshot: %s %s" % (oldest_snapshot[3], + time.strftime("%D %H:%M",time.localtime(oldest_snapshot[1]))),\ + perfdata + check_info['esx_vsphere_vm.snapshots'] = { "inventory_function" : inventory_esx_vsphere_vm_snapshots, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 96d5b96..bb82c0b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -9028,7 +9028,17 @@ register_check_parameters( Age(title = _("Critical if older than")) ] ) - )] + ), + ("age_oldest", + Tuple( + title = _("Age of the oldest snapshot"), + elements = [ + Age(title = _("Warning if older than")), + Age(title = _("Critical if older than")) + ] + ) + ), + ] ), None, match_type = "dict",

7 years, 8 months

8630 FIX ups_bat_temp, ups_capacity, ups_in_freq, ups_in_voltage, ups_out_load, ups_out_voltage, ups_power, ups_test: Extend and unify range of discovered devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: e795a9b03337e008c80eb91833c7299301e2de31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e795a9b03337e0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 28 14:51:10 2017 +0200 8630 FIX ups_bat_temp, ups_capacity, ups_in_freq, ups_in_voltage, ups_out_load, ups_out_voltage, ups_power, ups_test: Extend and unify range of discovered devices Due to overly specific SNMP scan functions, discovery did not work properly for these checks on some devices, or only for some of these checks, despite being based on the same MIB. This has been fixed. Change-Id: I3c2c072dcf3d83318d7dfdc45c9d80c52fb0ee41 --- .werks/8630 | 13 +++++++++++++ checks/ups_bat_temp | 14 +++----------- checks/ups_capacity | 21 +++------------------ checks/ups_generic.include | 43 +++++++++++++++++++++++++++++++++++++++++++ checks/ups_in_freq | 7 ++----- checks/ups_in_voltage | 8 ++------ checks/ups_out_load | 7 ++----- checks/ups_out_voltage | 8 ++------ checks/ups_power | 6 ++---- checks/ups_test | 5 ++--- 10 files changed, 74 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e795a9b033…

7 years, 8 months

Rewrite Makefiles for cmk-update-agent build

by Andreas Umbreit

Module: check_mk Branch: master Commit: 0d5325e02246eae8895cc1aba5d77b7a7b5fa60e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5325e02246ea… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Mar 28 14:02:14 2017 +0200 Rewrite Makefiles for cmk-update-agent build - Modify Makefile.include to fetch needed resources (indluding VC++ redistributable package) for pyinstaller build - Modify Makefile to support to build cmk-update-agent.exe using pyinstaller and including needed VC++ resources - Change build directory to "winbuild" because wine has some issues with a path containing "windows" --- agents/.gitignore | 1 + agents/windows/frozen_binaries/Makefile.include | 91 ++++++++++++++++--------- 2 files changed, 59 insertions(+), 33 deletions(-) diff --git a/agents/.gitignore b/agents/.gitignore index e68a0b4..5b1195b 100644 --- a/agents/.gitignore +++ b/agents/.gitignore @@ -1 +1,2 @@ .rpm.* +winbuild diff --git a/agents/windows/frozen_binaries/Makefile.include b/agents/windows/frozen_binaries/Makefile.include index 4cd6564..3994ac5 100644 --- a/agents/windows/frozen_binaries/Makefile.include +++ b/agents/windows/frozen_binaries/Makefile.include @@ -1,41 +1,66 @@ - PYTHON_VERSION = 2.7.13 - -clean: - [ -d build ] && rm -rf build || true - -src/virtual-wine: - cd src ; git clone https://github.com/htgoebel/virtual-wine.git +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 +# 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 src/python-$(PYTHON_VERSION).msi: - cd src ; wget https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… - -src/get-pip.py: - cd src ; wget https://bootstrap.pypa.io/get-pip.py - -src/pyinstaller: - cd src ; git clone git://github.com/pyinstaller/pyinstaller.git + cd src && wget https://www.python.org/ftp/python/$(PYTHON_VERSION)/python-$(PYTHON_VERSION… -prepare-build-env: src/virtual-wine - mkdir build - cd build ; \ - cp -pr ../src/virtual-wine . ; \ - sed -i '/winecfg$$/d' ./virtual-wine/vwine-setup ; \ - ./virtual-wine/vwine-setup venv_wine +$(PYTHON_PACKAGES): src/python-$(PYTHON_VERSION).msi + # Download needed python packages including depencencies. This has to be done + # from within wine to obtain the correct win32 packages. + # Note: This target might download different or additional versions that specified in + # PYTHON_PACKAGES because the pip download option resolves dependencies. + 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 appdirs==1.4.3 && \ + wine c:\\Python27\\python.exe -m pip download idna==2.5 && \ + wine c:\\Python27\\python.exe -m pip download pyparsing==2.2.0 && \ + wine c:\\Python27\\python.exe -m pip download asn1crypto==0.22.0 && \ + wine c:\\Python27\\python.exe -m pip download ipaddress==1.0.18 && \ + wine c:\\Python27\\python.exe -m pip download pypiwin32==219 && \ + wine c:\\Python27\\python.exe -m pip download cffi==1.10.0 && \ + wine c:\\Python27\\python.exe -m pip download packaging==16.8 && \ + wine c:\\Python27\\python.exe -m pip download requests==2.13.0 && \ + wine c:\\Python27\\python.exe -m pip download cryptography==1.8.1 && \ + wine c:\\Python27\\python.exe -m pip download pycparser==2.17 && \ + wine c:\\Python27\\python.exe -m pip download setuptools==34.3.3 && \ + wine c:\\Python27\\python.exe -m pip download enum34==1.1.6 && \ + wine c:\\Python27\\python.exe -m pip download pyinstaller==3.2.1 && \ + wine c:\\Python27\\python.exe -m pip download six==1.10.0 && \ + wine c:\\Python27\\python.exe -m pip download future==0.16.0. && \ + wine c:\\Python27\\python.exe -m pip download pyOpenSSL==16.2.0 && \ + mkdir -p $(CURDIR)/src/pip && \ + cp -r * $(CURDIR)/src/pip + rm -rf $(BUILD_DIR) -prepare-python: src/python-$(PYTHON_VERSION).msi src/get-pip.py src/pyinstaller - cd build ; \ - . venv_wine/bin/activate ; \ - wine msiexec /qn /i ../src/python-$(PYTHON_VERSION).msi ; \ - cp ../src/get-pip.py venv_wine/drive_c/ ; \ - cp -pr ../src/pyinstaller venv_wine/drive_c/pyinstaller ; \ - wine c:\\Python27\\python c:\\get-pip.py ; \ - cd venv_wine/drive_c/pyinstaller ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install . ; \ - cd ../../.. ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install pypiwin32 ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install pyopenssl ; \ - wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install requests +src/vcredist_x86.exe: + cd src && \ + wget https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… setup: sudo apt-get install scons upx-ucl wine

7 years, 8 months

Unified paint functions for HW/SW inventory: numerical values should always be right-aligned, textual fields left-aligned

by Simon Betz

Module: check_mk Branch: master Commit: ed19e14f48abf941283a037a340d3eb567ef764b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed19e14f48abf9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 28 14:01:13 2017 +0200 Unified paint functions for HW/SW inventory: numerical values should always be right-aligned, textual fields left-aligned Change-Id: Ib924844b516fff3e59d04a09ad893a4afdcc1acb --- web/plugins/views/inventory.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 55bed31..676eb39 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -530,20 +530,20 @@ def inv_paint_volt(volt): def inv_paint_date(timestamp): if timestamp: date_painted = time.strftime("%Y-%m-%d", time.localtime(timestamp)) - return "date", "%s" % date_painted + return "number", "%s" % date_painted else: return "", "" def inv_paint_date_and_time(timestamp): if timestamp: date_painted = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) - return "date", "%s" % date_painted + return "number", "%s" % date_painted else: return "", "" def inv_paint_age(age): if age: - return "", age_human_readable(age) + return "number", age_human_readable(age) else: return "", "" @@ -567,12 +567,13 @@ def inv_paint_timestamp_as_age_days(timestamp): change_day = round_to_day(timestamp) age_days = (now_day - change_day) / 86400 + css_class = "number" if age_days == 0: - return "", _("today") + return css_class, _("today") elif age_days == 1: - return "", _("yesterday") + return css_class, _("yesterday") else: - return "", "%d %s ago" % (int(age_days), _("days")) + return css_class, "%d %s ago" % (int(age_days), _("days")) inventory_displayhints.update({ "." : { "title" : _("Inventory") },

7 years, 8 months

4540 emcvnx_disks: Thresholds for count of failures can be set now

by Marcel Arentz

Module: check_mk Branch: master Commit: 40583f6f0a10407b16d5c306f8a42bcfdccd357a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40583f6f0a1040… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 15 16:37:43 2017 +0100 4540 emcvnx_disks: Thresholds for count of failures can be set now Previously only the state for hard read or write failures could be set. As from now additionally a counter of failures can be set. The Service will change the state only if the amount of failure will be equal or higher than set in rule. On default the Service will be go critical if there are 2 or more failures detected. Change-Id: Id71eee97c51c8f75ac29c04eff3573ec66c96bc0 --- .werks/4540 | 15 ++++++++++++++ checks/emcvnx_disks | 16 +++++++++++---- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++++++---------- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/.werks/4540 b/.werks/4540 new file mode 100644 index 0000000..7cd0864 --- /dev/null +++ b/.werks/4540 @@ -0,0 +1,15 @@ +Title: emcvnx_disks: Thresholds for count of failures can be set now +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1489591974 +Class: feature + +Previously only the state for hard read or write failures could be set. As from +now additionally a counter of failures can be set. The Service will change the +state only if the amount of failure will be equal or higher than set in rule. + +On default the Service will be go critical if there are 2 or more failures +detected. diff --git a/checks/emcvnx_disks b/checks/emcvnx_disks index c717bc3..0bb7c92 100644 --- a/checks/emcvnx_disks +++ b/checks/emcvnx_disks @@ -111,6 +111,13 @@ # 'state': 'Enabled'}, # } +factory_settings['emcvnx_disks_default_levels'] = { + 'state_read_error' : (2, 2), # (state, count of errors) + 'state_write_error' : (2, 2), # (state, count of errors) + 'state_rebuilding' : 1, +} + + def parse_emcvnx_disks(info): parsed = {} for line in info: @@ -162,14 +169,14 @@ def check_emcvnx_disks(item, params, parsed): read_errors = parsed[item]["Hard Read Errors"] message += ", Hard Read Errors: %s" % read_errors - if read_errors > 0: - nagstate = params.get("state_read_error", 2) + if read_errors >= params["state_read_error"][1]: + nagstate = params["state_read_error"][0] message += " %s" % state_markers[nagstate] write_errors = parsed[item]["Hard Write Errors"] message += ", Hard Write Errors: %s" % write_errors - if write_errors > 0: - nagstate = params.get("state_write_error", 2) + if write_errors >= params["state_write_error"][1]: + nagstate = params["state_write_error"][0] message += " %s" % state_markers[nagstate] read_bytes = parsed[item]["Kbytes Read"] * 1024 @@ -195,4 +202,5 @@ check_info['emcvnx_disks'] = { "service_description" : "Enclosure %s", "group" : "emcvnx_disks", "has_perfdata" : True, + "default_levels_variable" : "emcvnx_disks_default_levels" } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bd08bf8..96d5b96 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4349,22 +4349,40 @@ register_check_parameters( Dictionary( elements = [ ("state_read_error", - MonitoringState( - default_value = 2, - title = _("State on hard read error") - ) + Tuple( + title = _("State on hard read error"), + elements = [ + MonitoringState( + title = _("State"), + default_value = 2, + ), + Integer( + title = _("Minimum error count"), + default_value = 2, + ), + ] + ) ), ("state_write_error", - MonitoringState( - default_value = 2, - title = _("State on hard write error") - ) + Tuple( + title = _("State on hard write error"), + elements = [ + MonitoringState( + title = _("State"), + default_value = 2, + ), + Integer( + title = _("Minimum error count"), + default_value = 2, + ), + ] + ) ), ("state_rebuilding", - MonitoringState( + MonitoringState( default_value = 1, title = _("State when rebuildung enclosure") - ) + ) ), ] ),

7 years, 8 months

← Newer
1
2
3
4
5
6
7
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017