Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5797 FIX netapp_api_luns: fixed interchanged free/ used names in WATO configuration rule

by Andreas Boesl

Module: check_mk Branch: master Commit: d81e3fec816816b88949ab2763d32a067fe7b06a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d81e3fec816816… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 29 16:21:28 2018 +0200 5797 FIX netapp_api_luns: fixed interchanged free/used names in WATO configuration rule The levels configuration for netapp_api_luns was incorrectly named. The free space levels were treated as used space and vice versa. Change-Id: Ia14e354a06438a5b46cb2e5b8f6ed8090596e29e --- .werks/5797 | 13 +++++++++++++ web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5797 b/.werks/5797 new file mode 100644 index 0000000..4374356 --- /dev/null +++ b/.werks/5797 @@ -0,0 +1,13 @@ +Title: netapp_api_luns: fixed interchanged free/used names in WATO configuration rule +Level: 1 +Component: wato +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1522333081 + +The levels configuration for netapp_api_luns was incorrectly named. +The free space levels were treated as used space and vice versa. + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7019231..b3db19b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -12592,9 +12592,9 @@ register_check_parameters( default_value = (80.0, 90.0), match = match_dual_level_type, elements = [ - get_free_used_dynamic_valuespec("free", "LUN"), + get_free_used_dynamic_valuespec("used", "LUN"), Transform( - get_free_used_dynamic_valuespec("used", "LUN", default_value = (20.0, 10.0)), + get_free_used_dynamic_valuespec("free", "LUN", default_value = (20.0, 10.0)), allow_empty = False, forth = transform_filesystem_free, back = transform_filesystem_free,

6 years, 5 months

Removed global variable g_perfcounters.

by Sven Panne

Module: check_mk Branch: master Commit: c9643ad68bd3ef7c681384c13048de5165465075 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9643ad68bd3ef… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 29 14:46:34 2018 +0200 Removed global variable g_perfcounters. Change-Id: I7cefd9fe7375b0b517f0425f843e2cf9729501d6 --- cmk/ec/main.py | 55 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9643ad68b…

6 years, 5 months

Removed global variable g_event_status.

by Sven Panne

Module: check_mk Branch: master Commit: 4d814ba25697655e33b960ce3bdc4a7e4d74d30a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d814ba2569765… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 29 14:56:10 2018 +0200 Removed global variable g_event_status. Change-Id: I0d1a61a7c30a5d680690e878b82ab3445586d5ab --- cmk/ec/main.py | 126 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d814ba256…

6 years, 5 months

Win-agent: extract SectionHeader

by Jukka Aro

Module: check_mk Branch: master Commit: 85386fd44bcaafbd07666f6d2a628bbe2f1dc815 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85386fd44bcaaf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 27 16:42:34 2018 +0200 Win-agent: extract SectionHeader This is the first step of splitting the Section class (hierarchy) to smaller logical entities. The section header forms its own independent part of section output and has its own parameters that are independent from the rest of the section. Define SectionHeader as a separator-character-templated class that is used as a member variable of Section. Subsection header is implemented by subclassing the SectionHeader. In order to use the templated SectionHeader with std::unique_ptr, define a abstract base class ISectionHeader that all templated SectionHeaders inherit from. The next steps in splitting Section will be to extract SectionBody to its own class hierarchy and to provide a factory for instantiating the sections. --- agents/windows/Makefile.am | 1 + agents/windows/SectionManager.cc | 33 +++++-- agents/windows/build_version | 2 +- agents/windows/sections/Section.cc | 42 ++++----- agents/windows/sections/Section.h | 20 ++--- agents/windows/sections/SectionCheckMK.cc | 4 +- agents/windows/sections/SectionDF.cc | 5 +- agents/windows/sections/SectionDF.h | 1 - agents/windows/sections/SectionEventlog.cc | 5 +- agents/windows/sections/SectionFileinfo.cc | 5 +- agents/windows/sections/SectionFileinfo.h | 2 - agents/windows/sections/SectionGroup.cc | 27 ++++-- agents/windows/sections/SectionGroup.h | 7 +- agents/windows/sections/SectionHeader.h | 105 ++++++++++++++++++++++ agents/windows/sections/SectionLogwatch.cc | 9 +- agents/windows/sections/SectionMRPE.cc | 4 +- agents/windows/sections/SectionMem.cc | 5 +- agents/windows/sections/SectionPS.cc | 5 +- agents/windows/sections/SectionPS.h | 1 - agents/windows/sections/SectionPerfcounter.cc | 6 +- agents/windows/sections/SectionPerfcounter.h | 1 - agents/windows/sections/SectionPluginGroup.cc | 13 ++- agents/windows/sections/SectionPluginGroup.h | 2 - agents/windows/sections/SectionServices.cc | 5 +- agents/windows/sections/SectionSkype.cc | 2 +- agents/windows/sections/SectionSpool.cc | 5 +- agents/windows/sections/SectionSpool.h | 3 - agents/windows/sections/SectionSystemtime.cc | 4 +- agents/windows/sections/SectionUptime.cc | 4 +- agents/windows/sections/SectionWMI.cc | 21 ++++- agents/windows/sections/SectionWMI.h | 3 +- agents/windows/sections/SectionWinperf.cc | 4 +- agents/windows/test/sections/SectionHeaderTest.cc | 67 ++++++++++++++ 33 files changed, 326 insertions(+), 97 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85386fd44b…

6 years, 5 months

Make rate calculation code more similar to the one in CMC.

by Sven Panne

Module: check_mk Branch: master Commit: 8bea6ec3d463d41d51e979cf77fcaa0f80923356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bea6ec3d463d4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 29 12:12:55 2018 +0200 Make rate calculation code more similar to the one in CMC. Change-Id: I73e2cce6ba2fb889f79bd0c05d7dae09d4cee0c5 --- cmk/ec/main.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 4a0a61e..55478f9 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1140,6 +1140,11 @@ def get_logfile_timespan(path): # | Helper class for performance counting | # '----------------------------------------------------------------------' +def lerp(a, b, t): + """Linear interpolation between a and b with weight t""" + return (1 - t) * a + t * b; + + class Perfcounters(object): _counter_names = [ "messages", @@ -1176,17 +1181,14 @@ class Perfcounters(object): def count_time(self, counter, ptime): with self._lock: - if counter not in self._times: - self._times[counter] = ptime + if counter in self._times: + self._times[counter] = lerp(ptime, self._times[counter], self._weights[counter]) else: - weight = self._weights[counter] - self._times[counter] *= weight - self._times[counter] += (1.00 - weight) * ptime + self._times[counter] = ptime def do_statistics(self): with self._lock: now = time.time() - weight = 0.9 # We could make this configurable if self._last_statistics: duration = now - self._last_statistics else: @@ -1197,8 +1199,8 @@ class Perfcounters(object): rate = delta / duration self._rates[name] = rate if name in self._average_rates: - self._average_rates[name] = \ - self._average_rates[name] * weight + rate * (1.0 - weight) + # We could make the weight configurable + self._average_rates[name] = lerp(rate, self._average_rates[name], 0.9) else: self._average_rates[name] = rate

6 years, 5 months

5931 FIX Fixed "skipping unimplemented check" warning message of active checks

by Simon Betz

Module: check_mk Branch: master Commit: f237194ae3168f3290b651fec676c69ce8a011d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f237194ae3168f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 29 11:58:53 2018 +0200 5931 FIX Fixed "skipping unimplemented check" warning message of active checks Change-Id: If08001edb2cf2cea9ab2140c798b4f39cd78d013 --- .werks/5931 | 14 ++++++++++ cmk_base/discovery.py | 2 +- web/htdocs/wato.py | 75 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 69 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f237194ae3…

6 years, 5 months

5933 FIX HW/SW inventory: Fixed AttributeError

by Simon Betz

Module: check_mk Branch: master Commit: eea7a1cc2d22592b25ba8942445349a56d9eac15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eea7a1cc2d2259… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 29 11:42:01 2018 +0200 5933 FIX HW/SW inventory: Fixed AttributeError Change-Id: I7445d0c4094fd138bee2a7b9068c563762b3faf3 --- .werks/5933 | 10 ++++++ web/plugins/views/inventory.py | 80 +++++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 37 deletions(-) diff --git a/.werks/5933 b/.werks/5933 new file mode 100644 index 0000000..853396e --- /dev/null +++ b/.werks/5933 @@ -0,0 +1,10 @@ +Title: HW/SW inventory: Fixed AttributeError +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522316461 +Class: fix + + diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 4f64ae0..29d7724 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -46,7 +46,7 @@ def paint_host_inventory_tree(row, invpath=".", column="host_inventory"): if attributes_key is None: return _paint_host_inventory_tree_children(struct_tree, parsed_path, tree_renderer) else: - return _paint_host_inventory_tree_value(struct_tree, parsed_path, invpath, attributes_key) + return _paint_host_inventory_tree_value(struct_tree, parsed_path, tree_renderer, invpath, attributes_key) def _paint_host_inventory_tree_children(struct_tree, parsed_path, tree_renderer): @@ -63,19 +63,23 @@ def _paint_host_inventory_tree_children(struct_tree, parsed_path, tree_renderer) return "invtree", code -def _paint_host_inventory_tree_value(struct_tree, parsed_path, invpath, attributes_key): - #TODO what about numerations? +def _paint_host_inventory_tree_value(struct_tree, parsed_path, tree_renderer, invpath, attributes_key): if attributes_key == []: child = struct_tree.get_sub_numeration(parsed_path) else: child = struct_tree.get_sub_attributes(parsed_path) + if child is None: return "", "" + with html.plugged(): if invpath.endswith(".") or invpath.endswith(":"): invpath = invpath[:-1] - show_child_value(child.get_child_data().get(attributes_key), - inv_display_hint(invpath)) + if attributes_key == []: + tree_renderer.show_numeration(child, path=invpath) + else: + tree_renderer.show_attribute(child.get_child_data().get(attributes_key), + inv_display_hint(invpath)) code = html.drain() return "invtree", code @@ -1423,26 +1427,6 @@ def render_inv_dicttable(*args): pass -def show_child_value(value, hint): - if "paint_function" in hint: - tdclass, code = hint["paint_function"](value) - html.write(code) - elif type(value) == str: - try: - text = value.decode("utf-8") - except: - text = value - html.write_text(text) - elif type(value) == unicode: - html.write_text(value) - elif type(value) == int: - html.write(str(value)) - elif type(value) == float: - html.write("%.2f" % value) - elif value != None: - html.write(str(value)) - - class NodeRenderer(object): def __init__(self, hostname, tree_id, invpath, show_internal_tree_paths=False): @@ -1594,12 +1578,13 @@ class NodeRenderer(object): html.write(self._get_header(title, key, "#DDD")) html.close_th() html.open_td() - self._show_attribute(value, hint) + self.show_attribute(value, hint) html.close_td() html.close_tr() html.close_table() - def _show_attribute(self, value, hint): + + def show_attribute(self, value, hint): raise NotImplementedError() # ---helper--------------------------------------------------------------- @@ -1610,6 +1595,7 @@ class NodeRenderer(object): else: return path.strip(".") + def _get_header(self, title, key, hex_color): header = HTML(title) if self._show_internal_tree_paths: @@ -1618,14 +1604,34 @@ class NodeRenderer(object): return header + def _show_child_value(self, value, hint): + if "paint_function" in hint: + tdclass, code = hint["paint_function"](value) + html.write(code) + elif type(value) == str: + try: + text = value.decode("utf-8") + except: + text = value + html.write_text(text) + elif type(value) == unicode: + html.write_text(value) + elif type(value) == int: + html.write(str(value)) + elif type(value) == float: + html.write("%.2f" % value) + elif value != None: + html.write(str(value)) + + class AttributeRenderer(NodeRenderer): def _show_numeration_value(self, value, hint): - show_child_value(value, hint) + self._show_child_value(value, hint) - def _show_attribute(self, value, hint): - show_child_value(value, hint) + def show_attribute(self, value, hint): + self._show_child_value(value, hint) @@ -1633,26 +1639,26 @@ class DeltaNodeRenderer(NodeRenderer): def _show_numeration_value(self, value, hint): if value is None: value = (None, None) - self._show_attribute(value, hint) + self.show_attribute(value, hint) - def _show_attribute(self, value, hint): + def show_attribute(self, value, hint): old, new = value if old is None and new is not None: html.open_span(class_="invnew") - show_child_value(new, hint) + self._show_child_value(new, hint) html.close_span() elif old is not None and new is None: html.open_span(class_="invold") - show_child_value(old, hint) + self._show_child_value(old, hint) html.close_span() elif old is not None and new is not None: html.open_span(class_="invold") - show_child_value(old, hint) + self._show_child_value(old, hint) html.close_span() html.write(u" → ") html.open_span(class_="invnew") - show_child_value(new, hint) + self._show_child_value(new, hint) html.close_span() elif old == new: - show_child_value(old, hint) + self._show_child_value(old, hint)

6 years, 5 months

bandit: Ignore external modules in virtual environment

by Lars Michelsen

Module: check_mk Branch: master Commit: e4a8f8dd0b4a284388e049677f2bde61e9a446bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a8f8dd0b4a28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 10:52:04 2018 +0200 bandit: Ignore external modules in virtual environment Change-Id: I90cd813b0dce5eff676a2c2a00824750d5017de5 --- bandit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bandit.yaml b/bandit.yaml index 0e42cae..024ed80 100644 --- a/bandit.yaml +++ b/bandit.yaml @@ -8,6 +8,7 @@ exclude_dirs: - '/scripts' - '/agents/windows/plugins/build' - '/agents/windows/chroot' + - '/.venv/' ### Bandit config file generated from: # '/usr/local/bin/bandit-config-generator -o ../bandit.yaml'

6 years, 5 months

Improved pipenv integration

by Lars Michelsen

Module: check_mk Branch: master Commit: 6977ead4ffcebaddf9a9d202f76538a5ab155cc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6977ead4ffceba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 10:06:49 2018 +0200 Improved pipenv integration * The virtual environments are now stored in .venv in the project directory. * The test-* targets in tests/Makefile now have a make dependency to the .venv directory * The test-* targets now automatically enable the virtual environment context in case it is not already active * The .venv directory will automatically be created in case it is missing and automatically be updated in case Pipfile or Pipfile.lock change. Change-Id: Ifdac444d3fc50dbabc39d71a9ec587b9447a559a --- .envrc | 9 ++++++++- .gitignore | 1 + Makefile | 11 +++++------ Pipfile.lock | 60 ++++++++++++++++++++++++++++++++++------------------------ tests/Makefile | 22 ++++++++++++++------- 5 files changed, 64 insertions(+), 39 deletions(-) diff --git a/.envrc b/.envrc index 347fd97..4030cf6 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,9 @@ # Check_MK config for direnv (Environment switcher for the shell) -source $(pipenv --venv)/bin/activate +export PIPENV_VENV_IN_PROJECT=true + +VENV_DIR=$(pipenv --venv) +if [ -n "$VENV_DIR" ]; then + source $VENV_DIR/bin/activate +else + echo "Execute \"make setup\" to create the virtual environment" +fi diff --git a/.gitignore b/.gitignore index 9214b4e..cff1690 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ stamp-h1 tags tests/web/data/* .idea/ +.venv diff --git a/Makefile b/Makefile index 36d9547..ec40ba4 100644 --- a/Makefile +++ b/Makefile @@ -414,17 +414,12 @@ setup: python-pip \ chrpath \ enchant - $(MAKE) setup-virtualenv + sudo pip install pipenv $(MAKE) -C omd setup ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/locale setup endif -setup-virtualenv: - sudo pip install pipenv - pipenv install --dev - direnv allow - linesofcode: @wc -l $$(find -type f -name "*.py" -o -name "*.js" -o -name "*.cc" -o -name "*.h" -o -name "*.css" | grep -v openhardwaremonitor | grep -v jquery | grep -v livestatus/src ) | sort -n @@ -539,6 +534,10 @@ ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/core/src documentation endif +.venv: Pipfile Pipfile.lock + source .envrc ; pipenv install --dev + direnv allow + # This dummy rule is called from subdirectories whenever one of the # top-level Makefile's dependencies must be updated. It does not # need to depend on %MAKEFILE% because GNU make will always make sure diff --git a/Pipfile.lock b/Pipfile.lock index 88b7da8..610624e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ff770046312e2fc4f477d59f7c5c73e38e23ce5c491f76b25ecee85e5aab0dc9" + "sha256": "f14253af35778fb415b16fc06b99cc42ec00644b16d0cb877bfe8770f0d8abd3" }, "pipfile-spec": 6, "requires": { @@ -106,26 +106,27 @@ }, "cryptography": { "hashes": [ - "sha256:0f61273eccc681dc5a77dcd517cc2cb74078d1b00adb2b273d0a010153ae43c7", - "sha256:27dd18e180608c512433c843ad2d62396399608a0f3603c4d805500caeeec3d6", - "sha256:2893ee1d67dace6178732c9ea8c176fedf5b6a6463f72f1378b779cdba8a0ea5", - "sha256:2c5265c622e02af289bdc5e96c0a572bffa2fc2ac3f86fac3bace632ab25888c", - "sha256:34a433c3783946106236c25a89e0c271a3bb1a8e8cd8f12782e8bf8bec4e351e", - "sha256:39532ae44154ce88eec25d2a361e9c285b2477e0a4b4fc61fb9d4bcb3804dec6", - "sha256:469a72fda257b2179bb43e431b822d8087da53b40e68813bcfa54a16c3ebcdfe", - "sha256:54029ce210d3013dccced6478f4dfb25e7a409e13086f714be9c14489c64e2c7", - "sha256:54776f1e2ffd957571b79738fb41d8df69a93edb6d148ca149494d73975e8cab", - "sha256:84642ad31dccf9969b2613fa532ff5e871e9ee592ab0244dc9f6724e56591b8b", - "sha256:8ce363eed7ccc70f53be6ea4200aa20bbff99c8cbfce21a904f98e76c2bf5887", - "sha256:95b7822c8bf203bafb95527eaf8995d9dd4eef1b6899631f9293aa6926dab1d9", - "sha256:9f2d66952fc55f13f9c62ea6ae6ff88c2f9c2c21533065e1f7bddf0cf33c4cb9", - "sha256:c27ed8b01d5feeff8479384ed782bad1e5071563f47194703f0dc20c1b558503", - "sha256:cf1069fda0c8e1d2bbef2cf0de0be797860c8a34d1df3a24f1180045fc06974f", - "sha256:dddad9d322a3f0867009ff9f25477b8f7c0bdbedf143704b384c9472f11cb2d3", - "sha256:e42b290eb7804d82c6d614b55e3b726dee464099a0e6240175f8d7b682b9295d" + "sha256:3f3b65d5a16e6b52fba63dc860b62ca9832f51f1a2ae5083c78b6840275f12dd", + "sha256:551a3abfe0c8c6833df4192a63371aa2ff43afd8f570ed345d31f251d78e7e04", + "sha256:5cb990056b7cadcca26813311187ad751ea644712022a3976443691168781b6f", + "sha256:60bda7f12ecb828358be53095fc9c6edda7de8f1ef571f96c00b2363643fa3cd", + "sha256:6fef51ec447fe9f8351894024e94736862900d3a9aa2961528e602eb65c92bdb", + "sha256:77d0ad229d47a6e0272d00f6bf8ac06ce14715a9fd02c9a97f5a2869aab3ccb2", + "sha256:808fe471b1a6b777f026f7dc7bd9a4959da4bfab64972f2bbe91e22527c1c037", + "sha256:9b62fb4d18529c84b961efd9187fecbb48e89aa1a0f9f4161c61b7fc42a101bd", + "sha256:9e5bed45ec6b4f828866ac6a6bedf08388ffcfa68abe9e94b34bb40977aba531", + "sha256:9fc295bf69130a342e7a19a39d7bbeb15c0bcaabc7382ec33ef3b2b7d18d2f63", + "sha256:abd070b5849ed64e6d349199bef955ee0ad99aefbad792f0c587f8effa681a5e", + "sha256:ba6a774749b6e510cffc2fb98535f717e0e5fd91c7c99a61d223293df79ab351", + "sha256:c332118647f084c983c6a3e1dba0f3bcb051f69d12baccac68db8d62d177eb8a", + "sha256:d6f46e862ee36df81e6342c2177ba84e70f722d9dc9c6c394f9f1f434c4a5563", + "sha256:db6013746f73bf8edd9c3d1d3f94db635b9422f503db3fc5ef105233d4c011ab", + "sha256:f57008eaff597c69cf692c3518f6d4800f0309253bb138b526a37fe9ef0c7471", + "sha256:f6c821ac253c19f2ad4c8691633ae1d1a17f120d5b01ea1d256d7b602bc59887" ], "index": "pypi", - "version": "==2.2.1" + "markers": "python_version != '3.3'", + "version": "==2.2.2" }, "dicttoxml": { "hashes": [ @@ -232,6 +233,14 @@ "index": "pypi", "version": "==2.3.0" }, + "pbr": { + "hashes": [ + "sha256:8b9a7c3704657cb0831b3ded0a6b61377947c8235b76649bb7de4bfe2e6cfa56", + "sha256:cf66675e22ae91a4f20e4b8354f117d3e3d1de651513051d109cc39645fb3672" + ], + "index": "pypi", + "version": "==4.0.0" + }, "pillow": { "hashes": [ "sha256:0013f590a8f260df60bcfd65db19d18efc04e7f046c3c82a40e2e2b3292a937c", @@ -539,11 +548,11 @@ }, "python-dateutil": { "hashes": [ - "sha256:14eb44faa298942c6385636bfd76bd5c21361632cf8ebc9c20d63fd00f6a069f", - "sha256:6c0e72580272b561d8594362ab0e6b5b2191c703982150fc06ed45f7fae725be" + "sha256:3220490fb9741e2342e1cf29a503394fdac874bc39568288717ee67047ff29df", + "sha256:9d8074be4c993fbe4947878ce593052f71dac82932a677d49194d8ce9778002e" ], "index": "pypi", - "version": "==2.7.1" + "version": "==2.7.2" }, "python-ldap": { "hashes": [ @@ -907,10 +916,11 @@ }, "pbr": { "hashes": [ - "sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1", - "sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac" + "sha256:8b9a7c3704657cb0831b3ded0a6b61377947c8235b76649bb7de4bfe2e6cfa56", + "sha256:cf66675e22ae91a4f20e4b8354f117d3e3d1de651513051d109cc39645fb3672" ], - "version": "==3.1.1" + "index": "pypi", + "version": "==4.0.0" }, "pluggy": { "hashes": [ diff --git a/tests/Makefile b/tests/Makefile index 0f8ab66..ceff31e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ SHELL=/bin/bash -e -PYTEST=py.test -s -vv +PYTEST=source $$(pipenv --venv)/bin/activate ; py.test -s -vv .PHONY: help test-pylint test-integration test-gui-crawl \ test-bandit test-shellcheck setup format test-mypy \ @@ -14,27 +14,35 @@ help: @echo "test-bandit - Run bandit (security) tests" @echo "test-shellcheck - Run shellcheck tests" -test-unit: +# This target needs to be phony so it is run every time because only the other +# makefile can determine that there's nothing to be done. +# TODO: Move everything to top level makefile? +.PHONY: ../.venv + +../.venv: + $(MAKE) -C .. .venv + +test-unit: ../.venv $(PYTEST) -T unit -test-integration: +test-integration: ../.venv $(PYTEST) -T integration -test-gui-crawl: +test-gui-crawl: ../.venv $(PYTEST) -T gui_crawl -test-pylint: +test-pylint: ../.venv $(PYTEST) -T pylint -test-packageing: +test-packaging: ../.venv $(PYTEST) -T packaging -test-bandit: +test-bandit: ../.venv # Currently only care about high severity reported issues. Once this is reached, # go and enable the medium/low checks. CMK_DIR="$(realpath ..)" ; \

6 years, 5 months

5941 FIX Fixed nagios using outdated config when not using "cmk -R/-O"

by Lars Michelsen

Module: check_mk Branch: master Commit: 2df7ba9f2c2700849ec15af8e74c563f54b93f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df7ba9f2c2700… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 29 09:37:11 2018 +0200 5941 FIX Fixed nagios using outdated config when not using "cmk -R/-O" When using "omd start/restart" or the init script etc/init.d/nagios to start or restart nagios, it was possible that the core started with an outdated configuration. During start/restart the nagios init script is working in two steps: 1. config validation and 2. start/restart of the nagios process. During both steps the whole object configuration (etc/nagios/conf.d) needs to be processed. To optimize this the first step is perfoming some precompiling of the read config files. The result is saved in the file var/nagios/objects.precache and read by the core during startup instead of the single object config files. The init script had an option set (CORE_NOVERIFY=yes) in all cases that prevented the config verification even when executed manually. Without the config verification the object precache was not updated before the restart, making the core load an outdated file. The variable CORE_NOVERIFY=yes should only be set when the config verification has already been done. For example cmk -R/-O is doing exactly this. A workaround is to trigger the restarts using "cmk -R". Change-Id: I92cb76637094e5a136561423fe3a6bbfed2e1267 --- .werks/5941 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.werks/5941 b/.werks/5941 new file mode 100644 index 0000000..e320653 --- /dev/null +++ b/.werks/5941 @@ -0,0 +1,28 @@ +Title: Fixed nagios using outdated config when not using "cmk -R/-O" +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522308528 +Class: fix + +When using "omd start/restart" or the init script etc/init.d/nagios to +start or restart nagios, it was possible that the core started with an +outdated configuration. + +During start/restart the nagios init script is working in two steps: 1. config +validation and 2. start/restart of the nagios process. During both steps the +whole object configuration (etc/nagios/conf.d) needs to be processed. To +optimize this the first step is perfoming some precompiling of the read config +files. The result is saved in the file var/nagios/objects.precache and read +by the core during startup instead of the single object config files. + +The init script had an option set (CORE_NOVERIFY=yes) in all cases that +prevented the config verification even when executed manually. Without the +config verification the object precache was not updated before the restart, +making the core load an outdated file. The variable CORE_NOVERIFY=yes should +only be set when the config verification has already been done. For example cmk +-R/-O is doing exactly this. + +A workaround is to trigger the restarts using "cmk -R".

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018