Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a5894abba20aba7ea470cdc65d8de9b80d072c10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5894abba20aba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 26 08:22:34 2018 +0200 Removed useless "omd setup" target Change-Id: I1c24369db0b949c6b65267ad494991324c06310f --- omd/packages/omd/omd | 43 ------------------------------------------- omd/packages/omd/omd.8 | 14 -------------- 2 files changed, 57 deletions(-) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 643ad81..4f4f910 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2476,43 +2476,6 @@ def main_help(args=[], options={}): " omd COMMAND -h, --help show available options of COMMAND\n" ) -def main_setup(args, options={}): - packages = g_info["OS_PACKAGES"].split() - install_cmd = g_info["PACKAGE_INSTALL"] - command = "%s %s" % (install_cmd, " ".join(packages)) - sys.stdout.write("Going to execute '%s'\n" % command) - if 0 == os.system(command): - ok() - - # Enable Apache modules - for mod in [ "proxy", "proxy_http", "rewrite" ]: - command = g_info["APACHE_ENMOD"] % mod - if 0 != os.system(command): - sys.stdout.write("ERROR: Could not enable Apache module mod_%s\n" % mod) - - # Activate init script of OMD and APACHE - for service in [ 'omd', g_info["APACHE_INIT_NAME"] ]: - sys.stdout.write("Activating init script for \"%s\"\n" % service) - command = g_info["ACTIVATE_INITSCRIPT"].replace("%s", service) - sys.stdout.write("Going to execute '%s'\n" % command) - if 0 != os.system(command): - sys.stdout.write("ERROR\n") - - # Create group 'omd' - if not group_exists('omd'): - sys.stdout.write("Creating new group 'omd'\n") - groupadd('omd') - - # set SUID bit for certain plugins (neccessary for - # non RPM/DEB installations (FIXME: find a more elegant - # solution later) - gid = group_id('omd') - for plugin in [ 'nagios/plugins/check_icmp', 'nagios/plugins/check_dhcp', - 'cmc/icmpsender', 'cmc/icmpreceiver' ]: - path = "/omd/versions/%s/lib/%s" % (OMD_VERSION, plugin) - os.chown(path, -1, gid) - os.chmod(path, 04750) - def main_uninstall(args, options={}): global g_sitename @@ -3870,12 +3833,6 @@ commands = [ "Show general help", ""), - ( "setup", True, False, 0, 0, True, "", main_setup, - [], - "Prepare operating system for OMD (installs packages)", - "We will install missing packages from your operating system and setup the\n" - "system apache daemon (add configuration files and modules needed by omd)\n"), - ( "uninstall", True, False, 0, 0, True, "", main_uninstall, [], "Remove OMD and all sites!", diff --git a/omd/packages/omd/omd.8 b/omd/packages/omd/omd.8 index c5e4d30..8aa60d4 100644 --- a/omd/packages/omd/omd.8 +++ b/omd/packages/omd/omd.8 @@ -68,20 +68,6 @@ This mainly updates the symlink \fB/omd/versions/default\fP. On debian based dis it calls update-alternatives to change the default versions. In this case there is a special option \fBauto\fP available to let update-alternatives choose the default OMD version. .TP -.B omd setup -Prepare operating system for OMD. This includes installing all software -packages from your linux distribution that the components of OMD need -to run properly. You need to make sure that a package installation via -aptitude/zypper/yum is possible. - -After installing missing packages a group \fBomd\fP will be created, -some Apache modules will be activated, the init script \fB/etc/init.d/omd\fP -will be activated and the SUID bits for some Nagios plugins will be -correctly configured (for the group omd). - -\fBNote:\fP If you have installed OMD via RPM or DEB and have installed -all packages the omd package depends on, no \fBomd setup\fP is neccessary. -.TP .B omd uninstall This deletes all software and data of OMD and its sites. That command is mainly used for trying out OMD or testing the installation of OMD. Be aware that

6 years, 4 months

omd: Cleaned up pylint warnings

by Lars Michelsen

Module: check_mk Branch: master Commit: c6a04d1421f30b8018075b3833fc072e39e565e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6a04d1421f30b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 26 08:42:01 2018 +0200 omd: Cleaned up pylint warnings Change-Id: I4179c98cbc42bf453ca88e9d04ec96e56f2f320e --- omd/packages/omd/omd | 94 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index cdb8f2e..fec9cb0 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2455,7 +2455,12 @@ def check_site_user(site_must_exist): # | Implementation of actual omd commands | # '----------------------------------------------------------------------' -def main_help(args=[], options={}): +def main_help(args=None, options=None): + if args is None: + args = [] + if options is None: + options = {} + am_root = os.getuid() == 0 if am_root: sys.stdout.write("Usage (called as root):\n\n") @@ -2479,7 +2484,10 @@ def main_help(args=[], options={}): ) -def main_uninstall(args, options={}): +def main_uninstall(args, options=None): + if options is None: + options = {} + global g_sitename global g_sitedir for sitename in all_sites(): @@ -2499,7 +2507,10 @@ def main_uninstall(args, options={}): sys.stdout.write("Good bye.\n") -def main_setversion(args, options={}): +def main_setversion(args, options=None): + if options is None: + options = {} + if len(args) == 0: versions = [ (v, "Version %s" % v) for v in omd_versions() if not v == default_version() ] @@ -2539,7 +2550,10 @@ def use_update_alternatives(): return os.path.exists("/var/lib/dpkg/alternatives/omd") -def main_version(args, options={}): +def main_version(args, options=None): + if options is None: + options = {} + if len(args) > 0: site = args[0] if not site_exists(site): @@ -2553,7 +2567,10 @@ def main_version(args, options={}): sys.stdout.write("OMD - Open Monitoring Distribution Version %s\n" % version) -def main_versions(args, options={}): +def main_versions(args, options=None): + if options is None: + options = {} + for v in omd_versions(): if v == default_version() and not "bare" in options: sys.stdout.write("%s (default)\n" % v) @@ -2571,7 +2588,10 @@ def omd_versions(): def version_exists(v): return v in omd_versions() -def main_sites(args, options={}): +def main_sites(args, options=None): + if options is None: + options = {} + if on_tty and not "bare" in options: sys.stdout.write("SITE VERSION COMMENTS\n") for site in all_sites(): @@ -2604,7 +2624,10 @@ def sitename_must_be_valid(name, reuse = False): bail_out("Invalid site name. Must begin with a character, may contain characters, digits and _ and have length 1 up to 16") -def main_create(args, options={}): +def main_create(args, options=None): + if options is None: + options = {} + reuse = False if "reuse" in options: reuse = True @@ -2775,7 +2798,10 @@ def finalize_size_as_user(what): call_scripts('post-' + what) -def main_rm(args, options={}): +def main_rm(args, options=None): + if options is None: + options = {} + # omd rm is called as root but the init scripts need to be called as # site user but later steps need root privilegies. So a simple user # switch to the site user would not work. Better create a subprocess @@ -2887,12 +2913,14 @@ def get_exclude_patterns(options): return excludes -def main_mv_or_cp(what, args, options={}): +def main_mv_or_cp(what, args, options=None): + if options is None: + options = {} + set_conflict_option(options) action = what == "mv" and "rename" or "copy" global g_sitename - global g_sitedir if len(args) != 1: bail_out("omd: Usage: omd %s oldname newname" % what) new = args[0] @@ -2988,7 +3016,10 @@ def main_mv_or_cp(what, args, options={}): -def main_diff(args, options={}): +def main_diff(args, options=None): + if options is None: + options = {} + from_version = site_version(g_sitename) from_skelroot = "/omd/versions/%s/skel" % from_version @@ -3114,7 +3145,10 @@ def print_diff(rel_path, source_path, target_path, source_version, source_perms) -def main_update(args, options={}): +def main_update(args, options=None): + if options is None: + options = {} + set_conflict_option(options) if not site_is_stopped(g_sitename): @@ -3201,7 +3235,10 @@ def main_update(args, options={}): stop_logging() -def main_umount(args, options = {}): +def main_umount(args, options=None): + if options is None: + options = {} + global g_sitename global g_sitedir @@ -3239,7 +3276,10 @@ def main_umount(args, options = {}): sys.exit(0) -def main_init_action(command, args, options={}): +def main_init_action(command, args, options=None): + if options is None: + options = {} + if g_sitename: exit_status = init_action(command, args, options) sys.exit(exit_status) @@ -3358,7 +3398,10 @@ def main_init_action(command, args, options={}): sys.exit(exit_status) -def main_config(args, options={}): +def main_config(args, options=None): + if options is None: + options = {} + if (len(args) == 0 or args[0] != "show") and \ not site_is_stopped(g_sitename) and opt_force: need_start = True @@ -3384,7 +3427,10 @@ def main_config(args, options={}): if need_start: start_site(g_sitename) -def main_su(args, options={}): +def main_su(args, options=None): + if options is None: + options = {} + try: os.execl("/bin/su", "su", "-", "%s" % g_sitename) except OSError: @@ -3536,7 +3582,10 @@ def backup_site_to_tarfile(fh, mode, options): bail_out("Failed to perform backup: %s" % e) -def main_backup(args, options={}): +def main_backup(args, options=None): + if options is None: + options = {} + if len(args) == 0: bail_out("You need to provide either a path to the destination " "file or \"-\" for backup to stdout.") @@ -3558,7 +3607,10 @@ def main_backup(args, options={}): backup_site_to_tarfile(fh, tar_mode, options) -def main_restore(args, options={}): +def main_restore(args, options=None): + if options is None: + options = {} + global g_sitename global g_sitedir @@ -4251,7 +4303,13 @@ if len(main_args) < 1: command = main_args[0] args = main_args[1:] + found = False + +only_root, no_suid, needs_site, site_must_exist, \ + confirm, argumentlist, command_function, option_spec, \ + description, confirm_text = 10 * [None] + for c, only_root, no_suid, needs_site, site_must_exist, confirm, argumentlist, \ command_function, option_spec, description, confirm_text in commands: if c == command:

6 years, 4 months

Moved painter specific function from lib to painter file

by Lars Michelsen

Module: check_mk Branch: master Commit: 83b081a6a1e70b4d74d5c5173f8281bcff793199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83b081a6a1e70b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 13:36:08 2018 +0100 Moved painter specific function from lib to painter file Change-Id: I48f3d77886f9271d8416e1aef88bd88bea5f3e22 --- web/htdocs/lib.py | 14 -------------- web/plugins/views/painters.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 3b2ce37..1f1afca 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -194,20 +194,6 @@ warn_marker = 'WARN' crit_marker = 'CRIT' unknown_marker = 'UNKN' -def paint_host_list(site, hosts): - h = "" - first = True - for host in hosts: - if first: - first = False - else: - h += ", " - link = "view.py?view_name=hoststatus&site=%s&host=%s" % (html.urlencode(site), html.urlencode(host)) - if html.var("display_options"): - link += "&display_options=%s" % html.var("display_options") - h += "<a href=\"%s\">%s</a></div>" % (link, host) - return "", h - # There is common code with modules/events.py:format_plugin_output(). Please check # whether or not that function needs to be changed too # TODO(lm): Find a common place to unify this functionality. diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5aee065..37ed04c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1760,6 +1760,21 @@ multisite_painters["host_services"] = { "paint" : lambda row: paint_service_list(row, "host_services_with_state"), } + +def paint_host_list(site, hosts): + h = "" + first = True + for host in hosts: + if first: + first = False + else: + h += ", " + link = "view.py?view_name=hoststatus&site=%s&host=%s" % (html.urlencode(site), html.urlencode(host)) + if html.var("display_options"): + link += "&display_options=%s" % html.var("display_options") + h += "<a href=\"%s\">%s</a></div>" % (link, host) + return "", h + multisite_painters["host_parents"] = { "title" : _("Host's parents"), "short" : _("Parents"),

6 years, 4 months

Cleaned up host list painter function

by Lars Michelsen

Module: check_mk Branch: master Commit: 799797d96ba79179ba77d2a41359314eab1f7116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799797d96ba791… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 13:39:34 2018 +0100 Cleaned up host list painter function Change-Id: I6cfce5a05dcd8ea6a02e1617abd878c1c6b44124 --- web/plugins/views/painters.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 37ed04c..59c780d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1762,18 +1762,21 @@ multisite_painters["host_services"] = { def paint_host_list(site, hosts): - h = "" - first = True + entries = [] for host in hosts: - if first: - first = False - else: - h += ", " - link = "view.py?view_name=hoststatus&site=%s&host=%s" % (html.urlencode(site), html.urlencode(host)) + args = [ + ("view_name", "hoststatus"), + ("site", site), + ("host", host), + ] + if html.var("display_options"): - link += "&display_options=%s" % html.var("display_options") - h += "<a href=\"%s\">%s</a></div>" % (link, host) - return "", h + args.append(("display_options", html.var("display_options"))) + + url = html.makeuri_contextless(args, filename="view.py") + entries.append(html.render_a(host, href=url)) + + return "", HTML(", ").join(entries) multisite_painters["host_parents"] = { "title" : _("Host's parents"),

6 years, 4 months

GUI: Moved exceptions from "lib" to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: dcf8917ebb34c9bcc182f5d592fc44994e4bf269 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcf8917ebb34c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 19:14:21 2018 +0200 GUI: Moved exceptions from "lib" to dedicated module Change-Id: I378850b8488461128abe054713ef57527137e195 --- web/htdocs/backup.py | 2 +- web/htdocs/bi.py | 2 + web/htdocs/config.py | 2 + web/htdocs/crash_reporting.py | 1 + web/htdocs/cron.py | 2 + web/htdocs/dashboard.py | 2 + web/htdocs/forms.py | 1 + web/htdocs/gui_exceptions.py | 91 +++++++++++++++++++++++++++++++++++++++++++ web/htdocs/guitester.py | 1 + web/htdocs/html_mod_python.py | 3 +- web/htdocs/htmllib.py | 2 +- web/htdocs/index.py | 7 ++++ web/htdocs/inventory.py | 6 ++- web/htdocs/key_mgmt.py | 1 + web/htdocs/lib.py | 52 +------------------------ web/htdocs/login.py | 2 + web/htdocs/logwatch.py | 1 + web/htdocs/metrics.py | 4 ++ web/htdocs/mkeventd.py | 1 + web/htdocs/mobile.py | 1 + web/htdocs/multitar.py | 3 ++ web/htdocs/notify.py | 2 + web/htdocs/pagetypes.py | 2 + web/htdocs/prediction.py | 1 + web/htdocs/sidebar.py | 1 + web/htdocs/userdb.py | 1 + web/htdocs/valuespec.py | 7 +++- web/htdocs/views.py | 1 + web/htdocs/visuals.py | 1 + web/htdocs/wato.py | 2 + web/htdocs/watolib.py | 1 + web/htdocs/webapi.py | 2 + web/htdocs/weblib.py | 6 ++- 33 files changed, 155 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dcf8917ebb…

6 years, 4 months

Fixed access to undefined variables - Thanks pylint

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c911eb59415dfb0d7e2a5f788ce95db80a24641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c911eb59415df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 26 08:38:51 2018 +0200 Fixed access to undefined variables - Thanks pylint Change-Id: Ib6ec0779ee8dcf90715ebb41935fcd735d0b1d13 --- omd/packages/omd/index.py | 2 +- omd/packages/omd/omd | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/omd/packages/omd/index.py b/omd/packages/omd/index.py index d25d22c..a14848e 100644 --- a/omd/packages/omd/index.py +++ b/omd/packages/omd/index.py @@ -1,4 +1,4 @@ -from mod_python import apache,util +from mod_python import apache,util # pylint: disable=import-error import os, re def site_name(req): diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 4f4f910..cdb8f2e 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -665,13 +665,12 @@ def read_skel_permissions(): global g_skel_permissions g_skel_permissions = load_skel_permissions(OMD_VERSION) if not g_skel_permissions: - bail_out("%s is missing or currupted." % file_path) + bail_out("%s is missing or currupted." % skel_permissions_file_path(OMD_VERSION)) def load_skel_permissions(version): perms = {} - file_path = "/omd/versions/%s/share/omd/skel.permissions" % version try: - for line in file(file_path): + for line in file(skel_permissions_file_path(version)): line = line.strip() if line == "" or line[0] == "#": continue @@ -682,6 +681,9 @@ def load_skel_permissions(version): except: return None +def skel_permissions_file_path(version): + return "/omd/versions/%s/share/omd/skel.permissions" % version + def get_skel_permissions(version, perms, relpath): try: return perms[relpath] @@ -3036,7 +3038,7 @@ def diff_list(from_skelroot, g_sitedir, from_version, orig_path): if abs_path == ".": abs_path = "" elif abs_path.startswith("./"): - abs_path = path[2:] + abs_path = abs_path[2:] abs_path = os.getcwd() + "/" + abs_path abs_path = abs_path.rstrip("/")

6 years, 4 months

Moved make_nagios_directory() and make_nagios_directories() to cmk.store

by Lars Michelsen

Module: check_mk Branch: master Commit: 55b570be5ff1ccc4b2b735fd97b5fd2733184421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55b570be5ff1cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 14:35:23 2018 +0100 Moved make_nagios_directory() and make_nagios_directories() to cmk.store Change-Id: Ica4ab9ce73d19bf2d5e134a1c7cc598d51135c0d --- cmk/store.py | 52 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/availability.py | 2 +- web/htdocs/config.py | 5 ++-- web/htdocs/key_mgmt.py | 6 +++-- web/htdocs/lib.py | 46 ------------------------------------ web/htdocs/notify.py | 2 +- web/htdocs/userdb.py | 6 ++--- web/htdocs/views.py | 16 +++++++++++++ web/htdocs/wato.py | 10 ++++---- web/htdocs/watolib.py | 29 +++++++++++------------ web/htdocs/weblib.py | 1 - web/plugins/userdb/hook_auth.py | 3 ++- web/plugins/wato/bi.py | 4 +++- web/plugins/wato/mkeventd.py | 2 +- 14 files changed, 104 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=55b570be5f…

6 years, 4 months

Dropped create_user_file()

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b6697d03140d29135b26ee3a6f8a83d4bcdb28a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b6697d03140d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 14:44:37 2018 +0100 Dropped create_user_file() Change-Id: I1f54ee3fafb9d9ed9b1d8eaa63e44128fa95dbc8 --- web/htdocs/key_mgmt.py | 6 +----- web/htdocs/lib.py | 8 -------- web/htdocs/watolib.py | 3 ++- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/web/htdocs/key_mgmt.py b/web/htdocs/key_mgmt.py index c8d8e7b..be3ab60 100644 --- a/web/htdocs/key_mgmt.py +++ b/web/htdocs/key_mgmt.py @@ -38,7 +38,6 @@ import cmk.store as store import table import config from valuespec import * -from lib import create_user_file from gui_exceptions import MKUserError @@ -61,10 +60,7 @@ class KeypairStore(object): def save(self, keys): store.mkdir(os.path.dirname(self._path)) - # TODO: Recode to store. functions. But this is also used in appliance code, do we have cma system wide available? - out = create_user_file(self._path, "w") - out.write("# Written by WATO\n# encoding: utf-8\n\n") - out.write("%s.update(%s)\n\n" % (self._attr, pprint.pformat(keys))) + store.save_mk_file(self._path, "%s.update(%s)" % (self._attr, pprint.pformat(keys))) def choices(self): diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 23b865f..139858e 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -33,14 +33,6 @@ import cmk.paths from log import logger -# TODO: Deprecate this function! Don't use this anymore. Use the store.* functions! -def create_user_file(path, mode): - path = make_utf8(path) - f = file(path, mode, 0) - os.chmod(path, 0660) - return f - - # TODO: Remove this helper function. Replace with explicit checks and covnersion # in using code. def savefloat(f): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ca2d995..46d677a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -214,7 +214,8 @@ def log_entry(linkinfo, action, message, user_id=None): user_id = user_id.encode("utf-8") store.mkdir(os.path.dirname(audit_log_path)) - with create_user_file(audit_log_path, "ab") as f: + with open(audit_log_path, "ab") as f: + os.chmod(f.name, 0660) f.write("%d %s %s %s %s\n" % (int(time.time()), link, user_id, action, message.replace("\n", "\\n")))

6 years, 4 months

Moved lqencode() to livestatus module

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a9ed2f2a699fddc4fbe1572d7651099b113e4e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a9ed2f2a699fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 13:52:07 2018 +0100 Moved lqencode() to livestatus module Change-Id: Id87a7dba3b126e95fc2588a9f7d90dec2c580941 --- livestatus/api/python/livestatus.py | 9 +++++++++ web/htdocs/crash_reporting.py | 3 ++- web/htdocs/inventory.py | 4 ++-- web/htdocs/lib.py | 11 ----------- web/htdocs/logwatch.py | 6 +++--- web/htdocs/prediction.py | 5 +++-- web/htdocs/valuespec.py | 3 ++- web/htdocs/views.py | 11 ++++++----- web/plugins/dashboard/dashlets.py | 2 +- web/plugins/sidebar/search.py | 4 +++- web/plugins/views/commands.py | 11 ++++++----- web/plugins/visuals/filters.py | 37 +++++++++++++++++++------------------ web/plugins/visuals/mkeventd.py | 5 +++-- 13 files changed, 59 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a9ed2f2a6…

6 years, 4 months

Moved format_plugin_output() to views

by Lars Michelsen

Module: check_mk Branch: master Commit: a44bea611442d4c08702faa6c12f1ab18fab458d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a44bea611442d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 13:56:37 2018 +0100 Moved format_plugin_output() to views Change-Id: I2061ffad4023989cd54eb0e62a0fa08c7608ee2a --- web/htdocs/bi.py | 3 ++- web/htdocs/lib.py | 37 ----------------------------- web/htdocs/views.py | 55 +++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 4 +++- web/plugins/views/painters.py | 17 ------------- 5 files changed, 60 insertions(+), 56 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 917739c..4d634bd 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3138,7 +3138,8 @@ class FoldableTreeRendererTree(FoldableTreeRenderer): html.close_span() - output = format_plugin_output(effective_state["output"]) + import views + output = views.format_plugin_output(effective_state["output"]) if output: output = html.render_b(HTML("&diams;"), class_="bullet") + output else: diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5606f65..c39174f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -189,43 +189,6 @@ def pnp_cleanup(s): def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'" -ok_marker = 'OK' -warn_marker = 'WARN' -crit_marker = 'CRIT' -unknown_marker = 'UNKN' - -# There is common code with modules/events.py:format_plugin_output(). Please check -# whether or not that function needs to be changed too -# TODO(lm): Find a common place to unify this functionality. -def format_plugin_output(output, row = None): - import config - if config.escape_plugin_output: - output = html.attrencode(output) - - output = output.replace("(!)", warn_marker) \ - .replace("(!!)", crit_marker) \ - .replace("(?)", unknown_marker) \ - .replace("(.)", ok_marker) - - if row and "[running on" in output: - a = output.index("[running on") - e = output.index("]", a) - hosts = output[a+12:e].replace(" ","").split(",") - css, h = paint_host_list(row["site"], hosts) - output = output[:a] + "running on " + h + output[e+1:] - - if config.escape_plugin_output: - # (?:<A HREF="), (?: target="_blank">)? and endswith(" </A>") is a special - # handling for the HTML code produced by check_http when "clickable URL" option is active. - output = re.sub("(?:<A HREF=")?(http[s]?://[^\"'>\t\s\n,]+)(?: target="_blank">)?", - lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % - (p.group(1).replace('"', ''), p.group(1).replace('"', '')), output) - - if output.endswith(" </A>"): - output = output[:-11] - - return output - def log_exception(msg=None): if msg is None: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8e8c605..dff613e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -3114,6 +3114,61 @@ def output_csv_headers(view): filename = filename.encode("utf-8") html.req.headers_out['Content-Disposition'] = 'Attachment; filename="%s"' % filename + +def paint_host_list(site, hosts): + entries = [] + for host in hosts: + args = [ + ("view_name", "hoststatus"), + ("site", site), + ("host", host), + ] + + if html.var("display_options"): + args.append(("display_options", html.var("display_options"))) + + url = html.makeuri_contextless(args, filename="view.py") + entries.append(html.render_a(host, href=url)) + + return "", HTML(", ").join(entries) + + +# There is common code with modules/events.py:format_plugin_output(). Please check +# whether or not that function needs to be changed too +# TODO(lm): Find a common place to unify this functionality. +def format_plugin_output(output, row = None): + ok_marker = 'OK' + warn_marker = 'WARN' + crit_marker = 'CRIT' + unknown_marker = 'UNKN' + + if config.escape_plugin_output: + output = html.attrencode(output) + + output = output.replace("(!)", warn_marker) \ + .replace("(!!)", crit_marker) \ + .replace("(?)", unknown_marker) \ + .replace("(.)", ok_marker) + + if row and "[running on" in output: + a = output.index("[running on") + e = output.index("]", a) + hosts = output[a+12:e].replace(" ","").split(",") + css, h = paint_host_list(row["site"], hosts) + output = output[:a] + "running on " + h + output[e+1:] + + if config.escape_plugin_output: + # (?:<A HREF="), (?: target="_blank">)? and endswith(" </A>") is a special + # handling for the HTML code produced by check_http when "clickable URL" option is active. + output = re.sub("(?:<A HREF=")?(http[s]?://[^\"'>\t\s\n,]+)(?: target="_blank">)?", + lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % + (p.group(1).replace('"', ''), p.group(1).replace('"', '')), output) + + if output.endswith(" </A>"): + output = output[:-11] + + return output + #. # .--Icon Selector-------------------------------------------------------. # | ___ ____ _ _ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1ebebef..4439830 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8926,7 +8926,9 @@ def mode_notifications(phase): table.cell(_("Host"), context.get("HOSTNAME", "")) table.cell(_("Service"), context.get("SERVICEDESC", "")) output = context.get("SERVICEOUTPUT", context.get("HOSTOUTPUT")) - table.cell(_("Plugin output"), format_plugin_output(output)) + + import views + table.cell(_("Plugin output"), views.format_plugin_output(output)) # Add toggleable notitication context table.row(class_="notification_context hidden", diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 59c780d..0710d41 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1761,23 +1761,6 @@ multisite_painters["host_services"] = { } -def paint_host_list(site, hosts): - entries = [] - for host in hosts: - args = [ - ("view_name", "hoststatus"), - ("site", site), - ("host", host), - ] - - if html.var("display_options"): - args.append(("display_options", html.var("display_options"))) - - url = html.makeuri_contextless(args, filename="view.py") - entries.append(html.render_a(host, href=url)) - - return "", HTML(", ").join(entries) - multisite_painters["host_parents"] = { "title" : _("Host's parents"), "short" : _("Parents"),

6 years, 4 months

← Newer
1
...
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018