Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

4955 Virtual host trees: The whole WATO folder structure can now be added

by Lars Michelsen

Module: check_mk Branch: master Commit: 27017650e879d82b9607c958e29a3533e5317efa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27017650e879d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 14:58:18 2017 +0200 4955 Virtual host trees: The whole WATO folder structure can now be added Instead of configuring a fixed number of folders to the virtual host tree configuration it is now possible to add the "WATO folder tree" to the definition which makes the virtual host tree dynamically render all folders that have hosts that are part of the virtual host tree definition Change-Id: I7bd77fd68ee8d73e7a5141f51328e4e23df69cbe --- .werks/4955 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4955 b/.werks/4955 new file mode 100644 index 0000000..8d92917 --- /dev/null +++ b/.werks/4955 @@ -0,0 +1,13 @@ +Title: Virtual host trees: The whole WATO folder structure can now be added +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499691375 +Class: feature + +Instead of configuring a fixed number of folders to the virtual host tree +configuration it is now possible to add the "WATO folder tree" to the +definition which makes the virtual host tree dynamically render all folders +that have hosts that are part of the virtual host tree definition

6 years, 11 months

Virtual host tree: small refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: dabec2916e7eae2ef4fdaa1f9a638e54483d1920 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dabec2916e7eae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 14:52:31 2017 +0200 Virtual host tree: small refactoring Change-Id: Iedde70b109e7d94e360555aff17d91d9fdbfc326 --- web/plugins/sidebar/shipped.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9f18708..c758169 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1989,6 +1989,15 @@ class VirtualHostTree(SidebarSnapin): if viewname == "svcproblems": urlvars += [ ("st1", "on"), ("st2", "on"), ("st3", "on") ] + urlvars += self._get_tag_url_vars(tree_spec, node_values) + urlvars += self._get_folder_url_vars(node_values) + + return html.makeuri_contextless(urlvars, "view.py") + + + def _get_tag_url_vars(self, tree_spec, node_values): + urlvars = [] + tag_tree_spec = [ l for l in tree_spec if not l.startswith("foldertree:") and not l.startswith("folder:") ] tag_node_values = [ v for v in node_values if not v.startswith("foldertree:") @@ -2011,6 +2020,11 @@ class VirtualHostTree(SidebarSnapin): urlvars.append(("host_tag_%d_op" % nr, "is")) urlvars.append(("host_tag_%d_val" % nr, tag or "")) + return urlvars + + + def _get_folder_url_vars(self, node_values): + urlvars = [] folder_components = {} for level_spec in node_values: if level_spec.startswith("folder:") or level_spec.startswith("foldertree:"): @@ -2028,7 +2042,7 @@ class VirtualHostTree(SidebarSnapin): urlvars.append(("wato_folder", "/".join(wato_path))) - return html.makeuri_contextless(urlvars, "view.py") + return urlvars def _tag_tree_worst_state(self, tree):

6 years, 11 months

4914 FIX statgrab_mem: Plugin is now prioritized over solaris_mem if both is available

by Marcel Arentz

Module: check_mk Branch: master Commit: bd651b76cfe2a0e1a5fca0b209a2c68d99e637c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd651b76cfe2a0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 6 16:30:02 2017 +0200 4914 FIX statgrab_mem: Plugin is now prioritized over solaris_mem if both is available Until now the solaris_mem has been prioritized over statgrab_mem if both are available and deliver the same information. This has been changed by this werk. Since the memory info from top is under suspicion to be buggy we do prefer the mem information from statgrab from now on. The information from top will be a fallback only if statgrab is not available. Change-Id: I120673e1c376e22ec8e90d75580a32e6a207d94d --- .werks/4914 | 16 ++++++++++++++++ agents/check_mk_agent.solaris | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.werks/4914 b/.werks/4914 new file mode 100644 index 0000000..5ea49c5 --- /dev/null +++ b/.werks/4914 @@ -0,0 +1,16 @@ +Title: statgrab_mem: Plugin is now prioritized over solaris_mem if both is available +Level: 1 +Component: checks +Compatible: incompat +Edition: cre +Version: 1.5.0i1 +Date: 1499342226 +Class: fix + +Until now the solaris_mem has been prioritized over statgrab_mem if both are +available and deliver the same information. This has been changed by this +werk. Since the memory info from top is under suspicion to be buggy we do +prefer the mem information from statgrab from now on. The information from +top will be a fallback only if statgrab is not available. + +You may have to rediscover services to benefit from this change. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index b54dbaf..d95796b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -264,13 +264,10 @@ then grep "^$s\." /tmp/statgrab.$$ | cut -d. -f2-99 | sed 's/ *= */ /' done - # the <<<statgrab_mem>>> info is already provided by <<<solaris_mem>>> - # However, we make an exception if /usr/bin/top is missing (required by solaris_mem) - if [ ! -x /usr/bin/top ] && [ ! -x /usr/local/bin/top ] - then - echo '<<<statgrab_mem>>>' - egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' - fi + # <<<statgrab_mem>>> info is preferred over <<<solaris_mem>>> + # since solaris_mem is under suspicion to be buggy. + echo '<<<statgrab_mem>>>' + egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ fi @@ -311,11 +308,14 @@ fi # Memory -if [ -x /usr/bin/top ] || [ -x /usr/local/top ] -then - echo "<<<solaris_mem>>>" - if [ -x /usr/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi - if [ -x /usr/local/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi +# <<<solaris_mem>>> should be used if statgrab is missing and top is available. +if ! type statgrab &>/dev/null + if [ -x /usr/bin/top ] || [ -x /usr/local/top ] + then + echo "<<<solaris_mem>>>" + if [ -x /usr/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi + if [ -x /usr/local/bin/top ]; then /usr/bin/top | grep '^Memory:'; fi + fi fi if type prtdiag >/dev/null 2>&1

6 years, 11 months

4845 FIX Windows Agent / Fileinfo: now able to read files meta information (size, age) even when file is locked

by Andreas Boesl

Module: check_mk Branch: master Commit: 79a806b521e6d2f4cf7fd165287a6f99391a82fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79a806b521e6d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 10 11:49:12 2017 +0200 4845 FIX Windows Agent / Fileinfo: now able to read files meta information (size, age) even when file is locked Change-Id: Ibb0aa7880525091dab3ceef05efea1c068accc6a --- .werks/4845 | 10 ++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823789 -> 15823789 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent.exe | Bin 1318400 -> 1318400 bytes agents/windows/check_mk_agent.msi | Bin 2928640 -> 2928640 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13682205 -> 13682205 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1318400 -> 1318400 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 591911 -> 591914 bytes agents/windows/install_agent.exe | Bin 589544 -> 589544 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106761 -> 10106761 bytes agents/windows/sections/SectionFileinfo.cc | 2 +- 15 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4845 b/.werks/4845 new file mode 100644 index 0000000..24411db --- /dev/null +++ b/.werks/4845 @@ -0,0 +1,10 @@ +Title: Windows Agent / Fileinfo: now able to read files meta information (size, age) even when file is locked +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499679986 +Class: fix + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 295764c..70142a5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2836 +2838 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 4c75bb0..056374b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index fe982f8..3b9865f 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index c3d42ad..25ebfa6 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7a9e5d3..d32b0b2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 9ce298d..b65283f 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 909710a..55f6945 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 5552095..4dfd3b0 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 94ff8c7..e08ac78 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e123e9c..cb37a54 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 382e26f..dca8f40 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index a9cca69..f1b8248 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index b39cc0d..fde7dc3 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionFileinfo.cc b/agents/windows/sections/SectionFileinfo.cc index 2ffc2e4..13db252 100644 --- a/agents/windows/sections/SectionFileinfo.cc +++ b/agents/windows/sections/SectionFileinfo.cc @@ -141,7 +141,7 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const char *path) { } bool SectionFileinfo::outputFileinfo(std::ostream &out, const std::string filename) { - auto hFile = std::make_unique<ManagedHandle>(CreateFile(filename.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, + auto hFile = std::make_unique<ManagedHandle>(CreateFile(filename.c_str(), 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL)); FILETIME ftCreate, ftAccess, ftWrite;

6 years, 11 months

4954 FIX Host/Folder properties: fixed displaying of inherited checkbox tag group values

by Lars Michelsen

Module: check_mk Branch: master Commit: e6d0770188bd121a9fc9077c1569cb8c95162095 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d0770188bd12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 11:35:01 2017 +0200 4954 FIX Host/Folder properties: fixed displaying of inherited checkbox tag group values The inherited values of tag groups that have only a single tag choice was displayed wrong. It was showing a text like it was checked while in fact the inherited values was unchecked. Change-Id: I73fecb36d3eb1f01b216cdca764c7730647fc0d1 --- .werks/4954 | 13 +++++++++++++ web/htdocs/wato.py | 2 ++ web/htdocs/watolib.py | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/4954 b/.werks/4954 new file mode 100644 index 0000000..bdd01f0 --- /dev/null +++ b/.werks/4954 @@ -0,0 +1,13 @@ +Title: Host/Folder properties: fixed displaying of inherited checkbox tag group values +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499679200 + +The inherited values of tag groups that have only a single tag choice was displayed +wrong. It was showing a text like it was checked while in fact the inherited values +was unchecked. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a89a56d..ab7037a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16928,6 +16928,8 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if len(values) == 1: defvalue = values[0] + elif attr.is_checkbox_tag(): + defvalue = True else: defvalue = attr.default_value() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 109ac1d..29ddaa3 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2867,6 +2867,10 @@ class Attribute: return [] + def is_checkbox_tag(self): + return False + + # A simple text attribute. It is stored in # a Python unicode string @@ -2988,11 +2992,16 @@ class HostTagAttribute(Attribute): tag_id, title, self._taglist = tag_definition name = "tag_" + tag_id if len(self._taglist) == 1: - def_value = True + def_value = None else: def_value = self._taglist[0][0] Attribute.__init__(self, name, title, "", def_value) + + def is_checkbox_tag(self): + return len(self._taglist) == 1 + + def paint(self, value, hostname): # Localize the titles. To make the strings available in the scanned localization # files the _() function must also be placed in the configuration files

6 years, 11 months

Moved internal valuespec from plugins to general WATO code

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f223e2c1d1ed284e77c15656112163c9a95d72b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f223e2c1d1ed2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 10:54:43 2017 +0200 Moved internal valuespec from plugins to general WATO code Change-Id: I2d125d6ea2af729a1e39e071dc25925de64a6bda --- web/htdocs/wato.py | 58 +++++++++++++++++++++++++++++- web/plugins/wato/check_mk_configuration.py | 56 +---------------------------- 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 73d4176..a89a56d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3963,7 +3963,7 @@ class ModeBulkDiscovery(WatoMode): def __init__(self): super(ModeBulkDiscovery, self).__init__() self._from_html_vars() - self._vs = vs_bulk_discovery + self._vs = ModeBulkDiscovery.vs_bulk_discovery self._get_bulk_discovery_params() @@ -4210,6 +4210,62 @@ class ModeBulkDiscovery(WatoMode): return entries + @classmethod + def vs_bulk_discovery(cls, render_form=False): + if render_form: + render = "form" + else: + render = None + + return Dictionary( + title = _("Bulk discovery"), + render = render, + elements = [ + ("mode", RadioChoice( + title = _("Mode"), + orientation = "vertical", + default_value = "new", + choices = [ + ("new", _("Add unmonitored services")), + ("remove", _("Remove vanished services")), + ("fixall", _("Add unmonitored & remove vanished services")), + ("refresh", _("Refresh all services (tabula rasa)")), + ], + )), + ("selection", Tuple( + title = _("Selection"), + elements = [ + Checkbox(label = _("Include all subfolders"), + default_value = True), + Checkbox(label = _("Only include hosts that failed on previous discovery"), + default_value = False), + Checkbox(label = _("Only include hosts with a failed discovery check"), + default_value = False), + Checkbox(label = _("Exclude hosts where the agent is unreachable"), + default_value = False), + ] + )), + ("performance", Tuple( + title = _("Performance options"), + elements = [ + Checkbox(label = _("Use cached data if present"), + default_value = True), + Checkbox(label = _("Do full SNMP scan for SNMP devices"), + default_value = True), + Integer(label = _("Number of hosts to handle at once"), + default_value = 10), + ] + )), + ("error_handling", Checkbox( + title = _("Error handling"), + label = _("Ignore errors in single check plugins"), + default_value = True)), + ], + optional_keys = [], + ) + + + def find_hosts_with_failed_inventory_check(): import sites diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 39663cd..07a06d8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -78,63 +78,9 @@ def web_log_level_elements(): return elements -def vs_bulk_discovery(render_form=False): - if render_form: - render = "form" - else: - render = None - - return Dictionary( - title = _("Bulk discovery"), - render = render, - elements = [ - ("mode", RadioChoice( - title = _("Mode"), - orientation = "vertical", - default_value = "new", - choices = [ - ("new", _("Add unmonitored services")), - ("remove", _("Remove vanished services")), - ("fixall", _("Add unmonitored & remove vanished services")), - ("refresh", _("Refresh all services (tabula rasa)")), - ], - )), - ("selection", Tuple( - title = _("Selection"), - elements = [ - Checkbox(label = _("Include all subfolders"), - default_value = True), - Checkbox(label = _("Only include hosts that failed on previous discovery"), - default_value = False), - Checkbox(label = _("Only include hosts with a failed discovery check"), - default_value = False), - Checkbox(label = _("Exclude hosts where the agent is unreachable"), - default_value = False), - ] - )), - ("performance", Tuple( - title = _("Performance options"), - elements = [ - Checkbox(label = _("Use cached data if present"), - default_value = True), - Checkbox(label = _("Do full SNMP scan for SNMP devices"), - default_value = True), - Integer(label = _("Number of hosts to handle at once"), - default_value = 10), - ] - )), - ("error_handling", Checkbox( - title = _("Error handling"), - label = _("Ignore errors in single check plugins"), - default_value = True)), - ], - optional_keys = [], - ) - - register_configvar(group, "bulk_discovery_default_settings", - vs_bulk_discovery(), + ModeBulkDiscovery.vs_bulk_discovery(), domain = "multisite" )

6 years, 11 months

4953 FIX Fixed possible exception during activation when files are modified while activating

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ee0dd9360eedd68e6a8e946163d58f4d4476d90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ee0dd9360eedd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 10:11:49 2017 +0200 4953 FIX Fixed possible exception during activation when files are modified while activating When activating changes via WATO it is packing the current configuration in so called sync snapshots. In case the files are modified while being packed an error occured preventing the whole activation process. This could especially happen in environments with a larger number of active GUI users. Change-Id: I3bdff91b352a3a1ad9a054e2a9b9339119229c81 --- .werks/4953 | 14 ++++++++++++++ web/htdocs/multitar.py | 45 ++++++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.werks/4953 b/.werks/4953 new file mode 100644 index 0000000..a70f9d3 --- /dev/null +++ b/.werks/4953 @@ -0,0 +1,14 @@ +Title: Fixed possible exception during activation when files are modified while activating +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499674099 + +When activating changes via WATO it is packing the current configuration in so called sync +snapshots. In case the files are modified while being packed an error occured preventing +the whole activation process. This could especially happen in environments with a larger +number of active GUI users. diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 62cbd8f..b6d3af5 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -29,14 +29,16 @@ import cmk.paths import os, tarfile, time, shutil, cStringIO, grp +import glob +import fnmatch import subprocess import traceback import itertools from lib import * from log import logger -def create(filename, components): - tar = tarfile.open(filename, "w:gz") +def create(tar_filename, components): + tar = tarfile.open(tar_filename, "w:gz") for component in components: if len(component) == 4: what, name, path, excludes = component @@ -55,31 +57,37 @@ def create(filename, components): else: basedir = os.path.dirname(abspath) filename = os.path.basename(abspath) - subtarname = name + ".tar" - exclude_args = list(itertools.chain.from_iterable([ ("--exclude", f) for f in excludes ])) + subtar_buffer = cStringIO.StringIO() + with tarfile.TarFile(fileobj=subtar_buffer, mode="w") as subtar_obj: + subtar_obj.add(os.path.join(basedir, filename), arcname=filename, + filter=lambda x: filter_subtar_files(x, excludes)) - cmd = [ "tar", "cf", "-", "--force-local" ] \ - + exclude_args \ - + [ "-C", basedir, filename ] + subtar_size = len(subtar_buffer.getvalue()) + subtar_buffer.seek(0) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - subdata, stderr = p.communicate() - - if p.returncode != 0: - raise MKGeneralException("Failed to create tar: %s\nExit code: %d\nOutput: %s" % - (subprocess.list2cmdline(cmd), p.returncode, stderr)) - - info = tarfile.TarInfo(subtarname) + info = tarfile.TarInfo("%s.tar" % name) info.mtime = time.time() info.uid = 0 info.gid = 0 - info.size = len(subdata) + info.size = subtar_size info.mode = 0644 info.type = tarfile.REGTYPE - info.name = subtarname - tar.addfile(info, cStringIO.StringIO(subdata)) + tar.addfile(info, subtar_buffer) + + +def filter_subtar_files(tarinfo, excludes): + filename = os.path.basename(tarinfo.name) + + for exclude in excludes: + if filename == exclude: + return None + elif fnmatch.fnmatchcase(filename, exclude): + return None + + return tarinfo + def extract_from_buffer(buffer, elements): stream = cStringIO.StringIO() @@ -188,7 +196,6 @@ def extract_domains(tar, domains): exclude_files = [] for pattern in domain.get("exclude", []): if "*" in pattern: - import glob exclude_files.extend(glob.glob("%s/%s" % (domain["prefix"], pattern))) else: exclude_files.append("%s/%s" % (domain["prefix"], pattern))

6 years, 11 months

Fixed broken bulk discovery dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 27b844603bed3f8f954dd3e94f02bf88beeb6991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27b844603bed3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 11:04:00 2017 +0200 Fixed broken bulk discovery dialog Change-Id: I8811f609e427d4d17ea302f4c053e6e889e059da --- web/htdocs/valuespec.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2e4abe0..3a2301e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1951,24 +1951,30 @@ class RadioChoice(DropdownChoice): choices.sort(cmp=lambda a,b: cmp(a[1], b[1])) else: choices = self._choices - for n, entry in enumerate(choices): + + for index, entry in enumerate(choices): if self._columns != None: html.open_td() + if len(entry) > 2 and entry[2] != None: # icon! label = html.render_icon(entry[2], entry[1]) else: label = entry[1] - html.radiobutton(varprefix, str(n), value == entry[0], label) + + html.radiobutton(varprefix, self.option_id(entry[0]), value == entry[0], label) + if len(entry) > 3 and entry[3]: html.open_p() html.write(entry[3]) html.close_p() + if self._columns != None: html.close_td() - if (n+1) % self._columns == 0 and (n+1) < len(self._choices): + if (index+1) % self._columns == 0 and (index+1) < len(self._choices): html.tr('') else: html.nbsp() + if self._columns != None: mod = len(self._choices) % self._columns if mod: @@ -1976,6 +1982,7 @@ class RadioChoice(DropdownChoice): html.td('') html.close_tr() html.close_table() + html.end_radio_group()

6 years, 11 months

WATO: Fixed "check_table referenced before assignment" error on analyze services page

by Lars Michelsen

Module: check_mk Branch: master Commit: d761c2336bdc162aba5c1464d6a725671eed33e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d761c2336bdc16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 09:09:30 2017 +0200 WATO: Fixed "check_table referenced before assignment" error on analyze services page Change-Id: I9c80c8a7191f864452c150dbd194af151b4e6138 --- cmk_base/automation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/automation.py b/cmk_base/automation.py index a4559e3..20cc6de 100644 --- a/cmk_base/automation.py +++ b/cmk_base/automation.py @@ -296,7 +296,7 @@ def _automation_analyse_service(args): # 4. active checks # Compute effective check table, in order to remove SNMP duplicates - check_table = check_table.get_check_table(hostname, remove_duplicates = True) + table = check_table.get_check_table(hostname, remove_duplicates = True) # 1. Manual checks for nr, (checkgroup, entries) in enumerate(config.static_checks.items()): @@ -343,7 +343,7 @@ def _automation_analyse_service(args): ct, item, params = entry # new format without host name hn = hostname - if (ct, item) not in check_table: + if (ct, item) not in table: continue # this is a removed duplicate or clustered service descr = config.service_description(hn, ct, item) if hn == hostname and descr == servicedesc:

6 years, 11 months

Make setup target a bit more portable.

by Sven Panne

Module: check_mk Branch: master Commit: 339d27424a54040ff2578ce75c4fe134bee283c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339d27424a5404… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 10 08:27:32 2017 +0200 Make setup target a bit more portable. This way we do not get the latest Boost library on e.g. zesty, but this should not matter. Change-Id: Id684f4eb8c27a04f4462f38c79013f18c6cece69 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 90bd594..0726657 100644 --- a/Makefile +++ b/Makefile @@ -464,8 +464,8 @@ setup: bear \ build-essential \ figlet \ - libboost1.63-dev \ - libboost-system1.63-dev \ + libboost-dev \ + libboost-system-dev \ libpcap-dev \ librrd-dev \ pngcrush \

6 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017