Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4026 mk_logwatch: plugin now also supports windows

by Andreas Boesl

Module: check_mk Branch: master Commit: 06285f2269ffb7558c2420d842ffbf48860bdddc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06285f2269ffb7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 20 14:01:02 2017 +0100 4026 mk_logwatch: plugin now also supports windows The mk_logwatch plugin is no longer restricted to windows. It now runs as a frozen python binary under windows, which requires no extra python installation. The plugin reads its configuration from the config/logwatch.cfg file. The syntax of the windows and linux logwatch.cfg is identical. The plugin may be configured through the WATO agent bakery with the rule "Text logfiles (Linux, Windows)". The former rule "Text logfiles (Windows)" still works, but is considered as deprecated. Keep in mind, there is difference in regex pattern matching. The legacy windows logwatch always did a case insenstive match. The new mk_logwatch.exe now also checks case sensitive, just like the linux plugin. Change-Id: I8711bcfb72963e854c64fb6dbd8ec892189e588c --- .werks/4026 | 20 +++++++ agents/plugins/mk_logwatch | 139 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 153 insertions(+), 6 deletions(-) diff --git a/.werks/4026 b/.werks/4026 new file mode 100644 index 0000000..a4928bb --- /dev/null +++ b/.werks/4026 @@ -0,0 +1,20 @@ +Title: mk_logwatch: plugin now also supports windows +Level: 2 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487595108 +Class: feature + +The mk_logwatch plugin is no longer restricted to windows. +It now runs as a frozen python binary under windows, which requires no extra python installation. + +The plugin reads its configuration from the config/logwatch.cfg file. +The syntax of the windows and linux logwatch.cfg is identical. + +The plugin may be configured through the WATO agent bakery with the rule "Text logfiles (Linux, Windows)". +The former rule "Text logfiles (Windows)" still works, but is considered as deprecated. + +Keep in mind, there is difference in regex pattern matching. +The legacy windows logwatch always did a case insenstive match. +The new mk_logwatch.exe now also checks case sensitive, just like the linux plugin. diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 55cd720..0da34a8 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -28,6 +28,90 @@ import sys, os, re, time, glob + +# .--MEI-Cleanup---------------------------------------------------------. +# | __ __ _____ ___ ____ _ | +# | | \/ | ____|_ _| / ___| | ___ __ _ _ __ _ _ _ __ | +# | | |\/| | _| | |_____| | | |/ _ \/ _` | '_ \| | | | '_ \ | +# | | | | | |___ | |_____| |___| | __/ (_| | | | | |_| | |_) | | +# | |_| |_|_____|___| \____|_|\___|\__,_|_| |_|\__,_| .__/ | +# | |_| | +# +----------------------------------------------------------------------+ +# In case the program crashes or is killed in a hard way, the frozen binary .exe +# may leave temporary directories named "_MEI..." in the temporary path. Clean them +# up to prevent eating disk space over time. + +######################################################################## +############## DUPLICATE CODE WARNING ################################## +### This code is also used in the cmk-update-agent frozen binary ####### +### Any changes to this class should also be made in cmk-update-agent ## +### In the bright future we will move this code into a library ######### +######################################################################## + +class MEIFolderCleaner(object): + def pid_running(self, pid): + import ctypes + kernel32 = ctypes.windll.kernel32 + SYNCHRONIZE = 0x100000 + + process = kernel32.OpenProcess(SYNCHRONIZE, 0, pid) + + if process != 0: + kernel32.CloseHandle(process) + return True + else: + return False + + + def find_and_remove_leftover_folders(self, hint_filenames): + if not hasattr(sys, "frozen"): + return + + import win32file + import tempfile + base_path = tempfile.gettempdir() + for f in os.listdir(base_path): + try: + path = os.path.join(base_path, f) + + if not os.path.isdir(path): + continue + + # Only care about directories related to our program + invalid_dir = False + for hint_filename in hint_filenames: + if not os.path.exists(os.path.join(path, hint_filename)): + invalid_dir = True + break + if invalid_dir: + continue + + pyinstaller_tmp_path = win32file.GetLongPathName(sys._MEIPASS).lower() # pylint: disable=no-member + if pyinstaller_tmp_path == path.lower(): + continue # Skip our own directory + + # Extract the process id from the directory and check whether or not it is still + # running. Don't delete directories of running processes! + # The name of the temporary directories is "_MEI<PID><NR>". We try to extract the PID + # by stripping of a single digit from the right. In the hope the NR is a single digit + # in all relevant cases. + pid = int(f[4:-1]) + if self.pid_running(pid): + continue + + shutil.rmtree(path) + except Exception, e: + # TODO: introduce verbose mode for mk_logwatch + pass + + +os_type = "linux" +try: + import platform + os_type = platform.system().lower() +except: + pass + if '-d' in sys.argv[1:] or '--debug' in sys.argv[1:]: tty_red = '\033[1;31m' tty_green = '\033[1;32m' @@ -192,7 +276,8 @@ def next_line(file_handle): line = file_handle.next() # Avoid parsing of (yet) incomplete lines (when acutal application # is just in the process of writing) - if not line.endswith(os.linesep): + # Just check if the line ends with a \n. This handles \n and \r\n + if not line.endswith("\n"): begin_of_line_offset = file_handle.tell() - len(line) os.lseek(file_handle.fileno(), begin_of_line_offset, 0) return None @@ -201,6 +286,22 @@ def next_line(file_handle): return None +def is_inode_cabable(path): + if "linux" in os_type: + return True + elif "windows" in os_type: + volume_name = "%s:\\\\" % path.split(":", 1)[0] + import win32api + volume_info = win32api.GetVolumeInformation(volume_name) + volume_type = volume_info[-1] + if "ntfs" in volume_type.lower(): + return True + else: + return False + else: + return False + + def process_logfile(logfile, patterns): global pushed_back_line @@ -210,7 +311,10 @@ def process_logfile(logfile, patterns): offset, prev_inode = status.get(logfile, (-1, -1)) try: file_desc = os.open(logfile, os.O_RDONLY) - inode = os.fstat(file_desc)[1] # 1 = st_ino + if not is_inode_cabable(logfile): + inode = 1 # Create a dummy inode + else: + inode = os.fstat(file_desc)[1] # 1 = st_ino except: if debug: raise @@ -227,10 +331,10 @@ def process_logfile(logfile, patterns): # current pointer to the file end. We do not want to make # a fuss about ancient log messages... if offset == -1: - if not debug: + if not debug: return - else: - offset = 0 + else: + offset = 0 # If the inode of the logfile has changed it has appearently @@ -254,7 +358,23 @@ def process_logfile(logfile, patterns): # now seek to offset where interesting data begins os.lseek(file_desc, offset, 0) # os.SEEK_SET not available in Python 2.4 - file_handle = os.fdopen(file_desc) + if os_type == "windows": + import io # Available with python 2.6 + import codecs + # Some windows files are encoded in utf_16 + # Peak the first two bytes to determine the encoding... + peak_handle = os.fdopen(file_desc, "rb") + first_two_bytes = peak_handle.read(2) + use_encoding = None + if first_two_bytes == "\xFF\xFE": + use_encoding = "utf_16" + elif first_two_bytes == "\xFE\xFF": + use_encoding = "utf_16_be" + + os.lseek(file_desc, offset, 0) # os.SEEK_SET not available in Python 2.4 + file_handle = io.open(file_desc, encoding = use_encoding) + else: + file_handle = os.fdopen(file_desc) worst = -1 outputtxt = "" lines_parsed = 0 @@ -346,6 +466,13 @@ def process_logfile(logfile, patterns): sys.stdout.write("%sW Maximum allowed logfile size (%d bytes) exceeded for the %dth time.%s\n" % (tty_yellow, opt_maxfilesize, new_offset / opt_maxfilesize, tty_normal)) +try: + # This removes leftover folders which may be generated by crashing frozen binaries + folder_cleaner = MEIFolderCleaner() + folder_cleaner.find_and_remove_leftover_folders(hint_filenames = ["mk_logwatch.exe.manifest"]) +except Exception, e: + sys.stdout.write("ERROR WHILE DOING FOLDER: %s\n" % e) + sys.exit(1) try: config = read_config()

7 years, 8 months

refactored cmk-update-agent MEI cleanup code and Makefile

by Andreas Boesl

Module: check_mk Branch: master Commit: 985144463b790ec929be9b94b5f182e4f01073e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=985144463b790e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 20 11:57:33 2017 +0100 refactored cmk-update-agent MEI cleanup code and Makefile Change-Id: I0fa65a76cedf5ea2c870d41c257c584b329b3821 --- agents/windows/frozen_binaries/Makefile.include | 42 +++++++++++++++++++++++++ agents/windows/frozen_binaries/src/.gitignore | 4 +++ 2 files changed, 46 insertions(+) diff --git a/agents/windows/frozen_binaries/Makefile.include b/agents/windows/frozen_binaries/Makefile.include new file mode 100644 index 0000000..4a0f38e --- /dev/null +++ b/agents/windows/frozen_binaries/Makefile.include @@ -0,0 +1,42 @@ + +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 + +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 + +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 + +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 ; \ + wine c:\\Python27\\python c:\\Python27\\Scripts\\pip.exe install psutil + +setup: + sudo apt-get install scons upx-ucl wine diff --git a/agents/windows/frozen_binaries/src/.gitignore b/agents/windows/frozen_binaries/src/.gitignore new file mode 100644 index 0000000..cfeb945 --- /dev/null +++ b/agents/windows/frozen_binaries/src/.gitignore @@ -0,0 +1,4 @@ +python-*.msi +get-pip.py +pyinstaller +virtual-wine

7 years, 8 months

Improve exception handling when request finalizing fails

by Lars Michelsen

Module: check_mk Branch: master Commit: 5be59166ed33f61500448c7fb5338e25608e54f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be59166ed33f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 16:49:29 2017 +0100 Improve exception handling when request finalizing fails Change-Id: I5cb32f72365ebb19e7b7ed8102b3e143c22cfdd6 --- .bugs/2487 | 7 +++++-- web/htdocs/index.py | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.bugs/2487 b/.bugs/2487 index 658ba91..b295cae 100644 --- a/.bugs/2487 +++ b/.bugs/2487 @@ -1,10 +1,13 @@ Title: Availability: Changing time range of an annotation duplicates it Component: multisite -State: open +Class: bug +State: done Date: 2016-04-07 16:50:29 Targetversion: 1.2.8p1 -Class: bug The start/end is used as a key. If you edit an existing annotation and change one of those - Check_MK thinks you are creating a new one and creates a duplicate entry. + +2017-02-20 16:47:51: changed state open -> done +Already fixed diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 8c9f7f4..3bd42f1 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -147,7 +147,11 @@ def handler(mod_python_req, fields = None, is_profiling = False): response_code = apache.OK finally: - finalize_request() + try: + finalize_request() + except: + log_exception() + raise return response_code

7 years, 8 months

Updated bug entries #2473

by Lars Michelsen

Module: check_mk Branch: master Commit: 3550ec10d445e723dd3074552339149cb3f578a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3550ec10d445e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 09:37:01 2017 +0100 Updated bug entries #2473 Change-Id: I47c65d6da83ca7a5748ff3918cd9dc054d793a80 --- .bugs/2473 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2473 b/.bugs/2473 index 9fffa17..d506bdd 100644 --- a/.bugs/2473 +++ b/.bugs/2473 @@ -1,10 +1,13 @@ Title: Virtual host trees should have ids Component: multisite -State: open +Class: bug +State: done Date: 2016-12-05 13:37:42 Targetversion: 1.2.9 -Class: bug The virtual host trees are currently being referenced by their index. In case a tree is deleted, the tree that a user references may change because the elements in the list virtual_host_trees have different indexes now. + +2017-02-21 09:36:58: changed state open -> done +Fixed.

7 years, 8 months

4389 FIX Views: Fixed "Cached" column when cache interval is reported to be 0

by Lars Michelsen

Module: check_mk Branch: master Commit: 9bf6849b41cbdfcedd21e16d7432b35a57eddd04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf6849b41cbdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 16:09:39 2017 +0100 4389 FIX Views: Fixed "Cached" column when cache interval is reported to be 0 A "ZeroDivisionError (float division by zero)" exception could occur in views containing the "Cached agent data" painter. Change-Id: Iddf29141c5aad3c2b78b74f399dd205095aac21e --- .werks/4389 | 11 +++++++++++ web/plugins/views/painters.py | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/4389 b/.werks/4389 new file mode 100644 index 0000000..dea4664 --- /dev/null +++ b/.werks/4389 @@ -0,0 +1,11 @@ +Title: Views: Fixed "Cached" column when cache interval is reported to be 0 +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487603291 + +A "ZeroDivisionError (float division by zero)" exception could occur in views +containing the "Cached agent data" painter. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 8c1c541..90f134f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -798,9 +798,15 @@ def paint_cache_info(row): cached_at = row["service_cached_at"] cache_interval = row["service_cache_interval"] cache_age = time.time() - cached_at - percentage = 100.0 * cache_age / cache_interval - return "", _("Cache generated %s ago, cache interval: %s, elapsed cache lifespan: %s") % ( - age_human_readable(cache_age), age_human_readable(cache_interval), percent_human_redable(percentage)) + + text = _("Cache generated %s ago, cache interval: %s") % \ + (age_human_readable(cache_age), age_human_readable(cache_interval)) + + if cache_interval: + percentage = 100.0 * cache_age / cache_interval + text += _(", elapsed cache lifespan: %s") % percent_human_redable(percentage) + + return "", text multisite_painters["svc_check_cache_info"] = { "title" : _("Cached agent data"),

7 years, 8 months

4388 FIX Views: Fixed exception with host tag columns which tag has been deleted

by Lars Michelsen

Module: check_mk Branch: master Commit: b1fd331ea93d7288d0b37db645d26d48683b3fb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1fd331ea93d72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 15:28:43 2017 +0100 4388 FIX Views: Fixed exception with host tag columns which tag has been deleted This fixes a possible exception "TypeError ('NoneType' object is unsubscriptable)". Change-Id: I2e1f273f42cfc7086ffb2d18c0ec88fd41e19883 --- .werks/4388 | 10 ++++++++++ web/htdocs/views.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4388 b/.werks/4388 new file mode 100644 index 0000000..e1e1216 --- /dev/null +++ b/.werks/4388 @@ -0,0 +1,10 @@ +Title: Views: Fixed exception with host tag columns which tag has been deleted +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487600861 + +This fixes a possible exception "TypeError ('NoneType' object is unsubscriptable)". diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 73f82a9..99b2686 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2880,7 +2880,7 @@ def get_tag_group(tgid): for entry in config.wato_host_tags: g_taggroups_by_id[entry[0]] = (entry[1], entry[2]) - return g_taggroups_by_id.get(tgid) + return g_taggroups_by_id.get(tgid, (_("N/A"), [])) def get_custom_var(row, key): for name, val in zip(row["custom_variable_names"],

7 years, 8 months

4360 Availability: now percentage and time format can be choosen simultaneously in the availability option 'Format time ranges'

by Simon Betz

Module: check_mk Branch: master Commit: adc43dd46de991ba83b4b16dc9703f20a5f73625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adc43dd46de991… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 14 13:59:45 2017 +0100 4360 Availability: now percentage and time format can be choosen simultaneously in the availability option 'Format time ranges' Change-Id: Idee0e240e38701f8d12f68ed9765470cc52fd609 --- .werks/4360 | 9 + web/htdocs/availability.py | 421 +++++++++++++++++++++----------------- web/plugins/views/availability.py | 2 - 3 files changed, 242 insertions(+), 190 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=adc43dd46d…

7 years, 8 months

4387 FIX Git integration: Fixed error handling when enabling it while git is not installed

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b2d5d8b74d0ff71cf171dc708b49c42bbac6c17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b2d5d8b74d0ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 14:39:06 2017 +0100 4387 FIX Git integration: Fixed error handling when enabling it while git is not installed Change-Id: Icf6dbaebd926d2190948567bf79cc825c6d78889 --- .werks/4387 | 10 ++++++++++ web/htdocs/watolib.py | 18 ++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/4387 b/.werks/4387 new file mode 100644 index 0000000..99c502b --- /dev/null +++ b/.werks/4387 @@ -0,0 +1,10 @@ +Title: Git integration: Fixed error handling when enabling it while git is not installed +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487597918 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 63786cc..7d38969 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7565,8 +7565,16 @@ def unlock_exclusive(): def git_command(args): command = [ "git" ] + [ a.encode("utf-8") for a in args ] - p = subprocess.Popen(command, cwd=cmk.paths.default_config_dir, + try: + p = subprocess.Popen(command, cwd=cmk.paths.default_config_dir, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + except OSError, e: + if e.errno == 2: + raise MKGeneralException(_("Error executing GIT command <tt>%s</tt>:<br><br>%s") % + (subprocess.list2cmdline(command), e)) + else: + raise + status = p.wait() if status != 0: raise MKGeneralException(_("Error executing GIT command <tt>%s</tt>:<br><br>%s") % @@ -7615,9 +7623,15 @@ def git_add_files(): def git_has_pending_changes(): - return subprocess.Popen(["git", "status", "--porcelain"], + try: + return subprocess.Popen(["git", "status", "--porcelain"], cwd=cmk.paths.default_config_dir, stdout=subprocess.PIPE).stdout.read() != "" + except OSError, e: + if e.errno == 2: + return False # ignore missing git command + else: + raise # Make sure that .gitignore-files are present and uptodate. Only files below the "wato" directories

7 years, 8 months

4381 FIX Fixed exception when WATO ruleset without main group definition exists

by Lars Michelsen

Module: check_mk Branch: master Commit: b958e9fc7d668740fc967033b0dc403467c9994e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b958e9fc7d6687… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 11:46:16 2017 +0100 4381 FIX Fixed exception when WATO ruleset without main group definition exists An exception "AttributeError ('NoneType' object has no attribute 'title')" could occur on WATO ruleset list pages when a custom Check_MK ruleset definition exists without previous register_rulegroup() call for the main group. Change-Id: I188ae4404086ffa82b9c83a44a4f6bb8a84a641a --- .werks/4381 | 11 +++++++++++ web/htdocs/watolib.py | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/4381 b/.werks/4381 new file mode 100644 index 0000000..947ec16 --- /dev/null +++ b/.werks/4381 @@ -0,0 +1,11 @@ +Title: Fixed exception when WATO ruleset without main group definition exists +Level: 1 +Component: wato +Compatible: compat +Version: 1.5.0i1 +Date: 1487587493 +Class: fix + +An exception "AttributeError ('NoneType' object has no attribute 'title')" could occur on +WATO ruleset list pages when a custom Check_MK ruleset definition exists without previous +register_rulegroup() call for the main group. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index cab353d..63786cc 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -5913,7 +5913,11 @@ class Rulespecs(object): choices = [] for main_group_name in self.get_main_groups(): - main_group_title = g_rulegroups.get(main_group_name).title + main_group = g_rulegroups.get(main_group_name) + if main_group: + main_group_title = main_group.title + else: + main_group_title = main_group_name if mode == "static_checks" and main_group_name != "static": continue

7 years, 8 months

4382 FIX Views: Silently ignore configured but not existing view filters

by Lars Michelsen

Module: check_mk Branch: master Commit: 042cad8f3d5b3f74599717d39c06fab825760831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=042cad8f3d5b3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 11:53:48 2017 +0100 4382 FIX Views: Silently ignore configured but not existing view filters Change-Id: Ie7097827f0b5edbefb6b381c12c8a5335a6fdc7a --- .werks/4382 | 10 ++++++++++ web/htdocs/visuals.py | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/4382 b/.werks/4382 new file mode 100644 index 0000000..f4bb6b9 --- /dev/null +++ b/.werks/4382 @@ -0,0 +1,10 @@ +Title: Views: Silently ignore configured but not existing view filters +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487588005 + + diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index c202d99..8be6f07 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -999,10 +999,14 @@ def filters_of_visual(visual, info_keys, show_all=False, link_filters=None): if info_key in visual['single_infos']: for key in info_params(info_key): filters.append(get_filter(key)) + elif not show_all: for key, val in visual['context'].items(): if type(val) == dict: # this is a real filter - filters.append(get_filter(key)) + try: + filters.append(get_filter(key)) + except KeyError: + pass # Silently ignore not existing filters # See get_link_filter_names() comment for details for key, dst_key in get_link_filter_names(visual, info_keys, link_filters): @@ -1015,6 +1019,7 @@ def filters_of_visual(visual, info_keys, show_all=False, link_filters=None): for fn in ubiquitary_filters: # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view filter = get_filter(fn) + if fn == "wato_folder" and (not filter.available() or 'host' in visual['single_infos']): continue if not filter.info or filter.info in info_keys: @@ -1272,9 +1277,16 @@ def visual_title(what, visual): # the value of the context variable(s) is None. In order to avoid exceptions, # we simply drop these here. extra_titles = [ v for k, v in get_singlecontext_html_vars(visual).items() if v != None ] + # FIXME: Is this really only needed for visuals without single infos? if not visual['single_infos']: - used_filters = [ multisite_filters[fn] for fn in visual["context"].keys() ] + used_filters = [] + for fn in visual["context"].keys(): + try: + used_filters.append(get_filter(fn)) + except KeyError: + pass # silently ignore not existing filters + for filt in used_filters: heading = filt.heading_info() if heading: @@ -1288,6 +1300,7 @@ def visual_title(what, visual): # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view if fn == "wato_folder" and (not config.wato_enabled or 'host' in visual['single_infos']): continue + heading = get_filter(fn).heading_info() if heading: title = heading + " - " + title

7 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017