Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3125 FIX fixed grouping of werk list by version

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7d6b08580cbfd3225b5ccca97fb76d3672a7e75a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6b08580cbfd3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 26 17:27:48 2016 +0200 3125 FIX fixed grouping of werk list by version The entries in the werk list when grouping by version were still sorted by date only and thus there could be multiple groups for one version, interrupted by an older version. --- .werks/3125 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/werks.py | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.werks/3125 b/.werks/3125 new file mode 100644 index 0000000..bdba236 --- /dev/null +++ b/.werks/3125 @@ -0,0 +1,11 @@ +Title: fixed grouping of werk list by version +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461684350 + +The entries in the werk list when grouping by version were still sorted by date only and thus there +could be multiple groups for one version, interrupted by an older version. diff --git a/ChangeLog b/ChangeLog index fcaeffb..d6f5372 100644 --- a/ChangeLog +++ b/ChangeLog @@ -247,6 +247,7 @@ * 3402 FIX: Using information from inventory in column tooltips now longer crashes * 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag filter * 3029 FIX: rule editor icon: fixed query of invalid livestatus column... + * 3125 FIX: fixed grouping of werk list by version... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 8363ace..89e4c5f 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -384,7 +384,14 @@ def render_werks_table(): def begin_group(title): table.begin(title=title, limit=None, searchable = False, sortable = False, css="werks") - for werk in werks_sorted_by_date(g_werks.values()): + werklist = [] + + if werk_table_options["grouping"] == "version": + werklist = werks_sorted_by_version(g_werks.values()) + else: + werklist = werks_sorted_by_date(g_werks.values()) + + for werk in werklist: if werk_matches_options(werk, werk_table_options): group = werk_group_value(werk, werk_table_options["grouping"]) if group != current_group: @@ -581,3 +588,14 @@ def insert_manpage_links(text): def werks_sorted_by_date(werks): return sorted(werks, cmp = lambda a, b: -cmp(a["date"], b["date"])) + + +# sort by version and within one version by date +def werks_sorted_by_version(werks): + def by_version(lhs, rhs): + if lhs["version"] == rhs["version"]: + return cmp(lhs["date"], rhs["date"]) + else: + return cmp(lhs["version"], rhs["version"]) + + return sorted(werks, cmp=by_version, reverse=True)

8 years, 2 months

pylint: Now also checking inventory, agent bakery plugins, mkeventd, active checks and some more

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e55c219181bdd35951557ffaf12dda52a6c9f67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e55c219181bdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 17:25:38 2016 +0200 pylint: Now also checking inventory, agent bakery plugins, mkeventd, active checks and some more --- pylint/Makefile | 12 ++++++++---- pylint/pylint-checks | 10 +++++++++- pylint/pylint-misc | 24 ++++++++++++++++++++++++ pylint/pylint-modules | 2 +- pylint/pylint-web | 2 +- pylint/pylint_cmk.py | 41 ++++++++++++++++++++++++++++++++++++----- 6 files changed, 79 insertions(+), 12 deletions(-) diff --git a/pylint/Makefile b/pylint/Makefile index fd709eb..e11f349 100644 --- a/pylint/Makefile +++ b/pylint/Makefile @@ -1,12 +1,13 @@ help: @echo "all - Run ALL checks" - @echo "modules - Run Check_MK modules checks" - @echo "web - Run Check_MK web checks" - @echo "checks - Run Check_MK check checks" + @echo "modules - Check modules" + @echo "web - Check web" + @echo "checks - Check checks, inventory, bakery plugins" + @echo "misc - Check other files (mkeventd, active checks, agent plugins)" @echo @echo "build - Run all checks from build system" -all: modules web checks +all: modules web checks misc modules: ./pylint-modules || true @@ -17,6 +18,9 @@ web: checks: ./pylint-checks || true +misc: + ./pylint-misc || true + build: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ diff --git a/pylint/pylint-checks b/pylint/pylint-checks index 16044ed..57850d6 100755 --- a/pylint/pylint-checks +++ b/pylint/pylint-checks @@ -18,6 +18,14 @@ for path in pylint_cmk.ordered_module_files(): for path in pylint_cmk.check_files(): pylint_cmk.add_file(f, path) +# Also add inventory plugins +for path in pylint_cmk.check_files("../inventory"): + pylint_cmk.add_file(f, path) + +# Also add bakery plugins +for path in pylint_cmk.check_files("../../cmc/agents/bakery"): + pylint_cmk.add_file(f, path) + f.close() -sys.exit(pylint_cmk.run_pylint(base_path)) +sys.exit(pylint_cmk.run_pylint(base_path, cleanup_test_dir=True)) diff --git a/pylint/pylint-misc b/pylint/pylint-misc new file mode 100755 index 0000000..09d2de4 --- /dev/null +++ b/pylint/pylint-misc @@ -0,0 +1,24 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import sys +import pylint_cmk + +pylint_cmk.ensure_equal_branches() + +search_paths = [ + "../bin", + "../notifications", + "../agents/plugins", + "../doc/treasures/active_checks", + "../../cmc/agents/plugins", + "../../cmc/bin", + "../../cmc/misc", +] + +worst = 0 +for path in search_paths: + worst = max(worst, pylint_cmk.run_pylint(path)) + +sys.exit(worst) diff --git a/pylint/pylint-modules b/pylint/pylint-modules index da40389..1cad4bd 100755 --- a/pylint/pylint-modules +++ b/pylint/pylint-modules @@ -14,4 +14,4 @@ for path in pylint_cmk.ordered_module_files(): pylint_cmk.add_file(f, path) f.close() -sys.exit(pylint_cmk.run_pylint(base_path)) +sys.exit(pylint_cmk.run_pylint(base_path, cleanup_test_dir=True)) diff --git a/pylint/pylint-web b/pylint/pylint-web index e910547..da75a89 100755 --- a/pylint/pylint-web +++ b/pylint/pylint-web @@ -66,4 +66,4 @@ for plugin_dir in get_web_plugin_dirs(): pylint_cmk.add_file(module, plugin_path) module.close() -sys.exit(pylint_cmk.run_pylint(base_path)) +sys.exit(pylint_cmk.run_pylint(base_path, cleanup_test_dir=True)) diff --git a/pylint/pylint_cmk.py b/pylint/pylint_cmk.py index fb5efc9..b2b7fc6 100644 --- a/pylint/pylint_cmk.py +++ b/pylint/pylint_cmk.py @@ -57,8 +57,8 @@ def module_files(): return modules -def check_files(): - filelist = sorted([ "../checks/" + f for f in os.listdir("../checks") +def check_files(base_dir="../checks"): + filelist = sorted([ base_dir + "/" + f for f in os.listdir(base_dir) if not f.startswith(".") ]) # Sort: first includes, then other @@ -93,7 +93,7 @@ def get_test_dir(): return base_path -def run_pylint(base_path): +def run_pylint(base_path, check_files=None, cleanup_test_dir=False): pylint_args = os.environ.get("PYLINT_ARGS", "") if pylint_args: pylint_args += " " @@ -101,8 +101,13 @@ def run_pylint(base_path): pylint_cfg = os.getcwd() + "/pylintrc" + check_files = get_pylint_files(base_path, "*") + if not check_files: + print "Nothing to do..." + return 0 # nothing to do + os.putenv("PYLINT_PATH", os.getcwd()) - cmd = "pylint --rcfile=\"%s\" %s*.py" % (pylint_cfg, pylint_args) + cmd = "pylint --rcfile=\"%s\" %s%s" % (pylint_cfg, pylint_args, " ".join(check_files)) print("Running pylint with: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True, cwd=base_path) @@ -117,7 +122,7 @@ def run_pylint(base_path): exit_code = p.returncode print("Finished with exit code: %d" % exit_code) - if exit_code == 0: + if exit_code == 0 and cleanup_test_dir: # Don't remove directory when specified via WORKDIR env if not os.environ.get("WORKDIR"): print("Removing build path...") @@ -126,6 +131,32 @@ def run_pylint(base_path): return exit_code +def get_pylint_files(base_path, file_pattern): + files = [] + for path in glob.glob("%s/%s" % (base_path, file_pattern)): + f = path[len(base_path)+1:] + + if is_python_file(path): + files.append(f) + + return files + + +def is_python_file(path): + if not os.path.isfile(path) or os.path.islink(path): + return False + + if path.endswith(".py"): + return True + + # Only add python files + shebang = file(path, "r").readline() + if shebang.startswith("#!") and "python" in shebang: + return True + + return False + + def ensure_equal_branches(): cmk_branch = os.popen("git rev-parse --abbrev-ref HEAD").read().strip() cmc_branch = os.popen("cd ../../cmc ; "

8 years, 2 months

Fixed some typos

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e0f13d7b6ad1bbd8762f8e797254ca76bb2f14c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0f13d7b6ad1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 17:18:17 2016 +0200 Fixed some typos --- web/htdocs/wato.py | 2 +- web/plugins/wato/check_parameters.py | 4 ++-- web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 957a59b..41a601c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1623,7 +1623,7 @@ def HostnameRenaming(**kwargs): _("Drop Domain Suffix") ), ( "reverse_dns", - _("Convert IP address hosts into host their DNS name") + _("Convert IP addresses of hosts into host their DNS names") ), ( "regex", _("Regular expression substitution"), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ba7704e..ce6a5fc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4069,8 +4069,8 @@ register_check_parameters( title = _("Provisioning Levels"), help = _("A provisioning of over 100% means over provisioning."), elements = [ - Percentage(title = _("Warning at provisioning of"), default_value = 110.0, maxvalue = None), - Percentage(title = _("Critical at provisioning of"), default_value = 120.0, maxvalue = None), + Percentage(title = _("Warning at a provisioning of"), default_value = 110.0, maxvalue = None), + Percentage(title = _("Critical at a provisioning of"), default_value = 120.0, maxvalue = None), ] )), ], diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 9df85a7..6ed8890 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2742,7 +2742,7 @@ register_rule( title = _("Host specification"), elements = [ ListChoice( - title = _("Check with the hosts"), + title = _("Match the hosts with..."), choices = [ ( '$HOSTNAME$', _("Hostname") ), ( '$HOSTADDRESS$', _("IP address" ) ),

8 years, 2 months

3437 FIX Improved performance of "activate changes", especially in distributed environments

by Lars Michelsen

Module: check_mk Branch: master Commit: 08d43d82dbca2042b2d7840713c236266ba9e22d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08d43d82dbca20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 26 17:12:01 2016 +0200 3437 FIX Improved performance of "activate changes", especially in distributed environments --- .werks/3437 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 50 +++++++++++++++++++++++++++++++------------------- 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/.werks/3437 b/.werks/3437 new file mode 100644 index 0000000..b970c53 --- /dev/null +++ b/.werks/3437 @@ -0,0 +1,10 @@ +Title: Improved performance of "activate changes", especially in distributed environments +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461683485 + + diff --git a/ChangeLog b/ChangeLog index 1c1fb4d..fcaeffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 3123 FIX: fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration * 3385 FIX: Fixed not updated discovery service after grouped auto discovery... * 3416 FIX: Avoid warning in cmc.log when rescheduling non-existing discovery check... + * 3437 FIX: Improved performance of "activate changes", especially in distributed environments Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index 11d51be..26a4b10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -716,7 +716,7 @@ def parents_of(hostname): g_converted_host_rulesets_cache = {} g_global_caches.append('g_converted_host_rulesets_cache') -def convert_host_ruleset(ruleset): +def convert_host_ruleset(ruleset, with_foreign_hosts): new_rules = [] if len(ruleset) == 1 and ruleset[0] == "": sys.stderr.write('WARNING: deprecated entry [ "" ] in host configuration list\n') @@ -728,17 +728,21 @@ def convert_host_ruleset(ruleset): # Directly compute set of all matching hosts here, this # will avoid recomputation later - new_rules.append((item, all_matching_hosts(tags, hostlist, with_foreign_hosts=True))) + new_rules.append((item, all_matching_hosts(tags, hostlist, with_foreign_hosts))) - g_converted_host_rulesets_cache[id(ruleset)] = new_rules return new_rules def host_extra_conf(hostname, ruleset): + # When the requested host is part of the local sites configuration, + # then use only the sites hosts for processing the rules + with_foreign_hosts = hostname not in all_active_hosts() + cache_id = id(ruleset), with_foreign_hosts try: - ruleset = g_converted_host_rulesets_cache[id(ruleset)] + ruleset = g_converted_host_rulesets_cache[cache_id] except KeyError: - ruleset = convert_host_ruleset(ruleset) + ruleset = convert_host_ruleset(ruleset, with_foreign_hosts) + g_converted_host_rulesets_cache[cache_id] = ruleset entries = [] for item, hostname_list in ruleset: @@ -898,8 +902,8 @@ def convert_pattern_list(patterns): g_hostlist_match_cache = {} g_global_caches.append('g_hostlist_match_cache') -def all_matching_hosts(tags, hostlist, with_foreign_hosts=False): - cache_id = tuple(tags), tuple(hostlist) +def all_matching_hosts(tags, hostlist, with_foreign_hosts): + cache_id = tuple(tags), tuple(hostlist), with_foreign_hosts try: return g_hostlist_match_cache[cache_id] except KeyError: @@ -914,8 +918,8 @@ def all_matching_hosts(tags, hostlist, with_foreign_hosts=False): for hostname in valid_hosts: # When no tag matching is requested, do not filter by tags. Accept all hosts # and filter only by hostlist - if (not tags or hosttags_match_taglist(tags_of_host(hostname), tags)) and \ - in_extraconf_hostlist(hostlist, hostname): + if in_extraconf_hostlist(hostlist, hostname) and \ + (not tags or hosttags_match_taglist(tags_of_host(hostname), tags)): matching.add(hostname) g_hostlist_match_cache[cache_id] = matching @@ -925,7 +929,7 @@ def all_matching_hosts(tags, hostlist, with_foreign_hosts=False): g_converted_service_rulesets_cache = {} g_global_caches.append('g_converted_service_rulesets_cache') -def convert_service_ruleset(ruleset): +def convert_service_ruleset(ruleset, with_foreign_hosts): new_rules = [] for rule in ruleset: rule, rule_options = get_rule_options(rule) @@ -944,12 +948,11 @@ def convert_service_ruleset(ruleset): # Directly compute set of all matching hosts here, this # will avoid recomputation later - hosts = all_matching_hosts(tags, hostlist) + hosts = all_matching_hosts(tags, hostlist, with_foreign_hosts) # And now preprocess the configured patterns in the servlist new_rules.append((item, hosts, convert_pattern_list(servlist))) - g_converted_service_rulesets_cache[id(ruleset)] = new_rules return new_rules @@ -958,10 +961,15 @@ g_global_caches.append('g_extraconf_servicelist_cache') # Compute outcome of a service rule set that has an item def service_extra_conf(hostname, service, ruleset): + # When the requested host is part of the local sites configuration, + # then use only the sites hosts for processing the rules + with_foreign_hosts = hostname not in all_active_hosts() + cache_id = id(ruleset), with_foreign_hosts try: - ruleset = g_converted_service_rulesets_cache[id(ruleset)] + ruleset = g_converted_service_rulesets_cache[cache_id] except KeyError: - ruleset = convert_service_ruleset(ruleset) + ruleset = convert_service_ruleset(ruleset, with_foreign_hosts) + g_converted_service_rulesets_cache[cache_id] = ruleset entries = [] for item, hosts, service_matchers in ruleset: @@ -978,7 +986,7 @@ def service_extra_conf(hostname, service, ruleset): return entries -def convert_boolean_service_ruleset(ruleset): +def convert_boolean_service_ruleset(ruleset, with_foreign_hosts): new_rules = [] for rule in ruleset: entry, rule_options = get_rule_options(rule) @@ -1002,19 +1010,23 @@ def convert_boolean_service_ruleset(ruleset): # Directly compute set of all matching hosts here, this # will avoid recomputation later - hosts = all_matching_hosts(tags, hostlist) + hosts = all_matching_hosts(tags, hostlist, with_foreign_hosts) new_rules.append((negate, hosts, convert_pattern_list(servlist))) - g_converted_service_rulesets_cache[id(ruleset)] = new_rules return new_rules # Compute outcome of a service rule set that just say yes/no def in_boolean_serviceconf_list(hostname, service_description, ruleset): + # When the requested host is part of the local sites configuration, + # then use only the sites hosts for processing the rules + with_foreign_hosts = hostname not in all_active_hosts() + cache_id = id(ruleset), with_foreign_hosts try: - ruleset = g_converted_service_rulesets_cache[id(ruleset)] + ruleset = g_converted_service_rulesets_cache[cache_id] except KeyError: - ruleset = convert_boolean_service_ruleset(ruleset) + ruleset = convert_boolean_service_ruleset(ruleset, with_foreign_hosts) + g_converted_service_rulesets_cache[cache_id] = ruleset for negate, hosts, service_matchers in ruleset: if hostname in hosts:

8 years, 2 months

Fixed spelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8ada9709ea371eb708c54e904e3db7f551e668ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ada9709ea371e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Apr 26 16:43:28 2016 +0200 Fixed spelling --- web/htdocs/prediction.py | 4 ++-- web/plugins/wato/mkeventd.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 00490d7..d0e1d11 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -52,8 +52,8 @@ def page_graph(): defaults.var_dir, host, pnp_cleanup(service), pnp_cleanup(dsname)) if not os.path.exists(dir): - raise MKGeneralException(_("There is currently no predition information " - "available for this for this service.")) + raise MKGeneralException(_("There is currently no prediction information " + "available for this service.")) # Load all prediction information, sort by time of generation tg_name = html.var("timegroup") diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 2481eae..9df85a7 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -699,8 +699,8 @@ vs_mkeventd_rule = Dictionary( "groups in the text to match, then you can use the placeholders " "<tt>\\1</tt>, <tt>\\2</tt>, etc. for inserting the first, second " "etc matching group.") + - _("The placeholder <tt>\\0</tt> will be replaced by the original Text " - "to Match. Note that as an alternative, you may also use the rule " + _("The placeholder <tt>\\0</tt> will be replaced by the original text " + "to match. Note that as an alternative, you may also use the rule " "Hostname translation for Incoming Messages in the Global Settings " "of the EC to accomplish your task."), allow_empty = False,

8 years, 2 months

Fixed some typos

by Mathias Kettner

Module: check_mk Branch: master Commit: ff69992b4d4037f67c7407a49a0b7b9f91eb4748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff69992b4d4037… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 15:58:35 2016 +0200 Fixed some typos --- web/plugins/metrics/check_mk.py | 2 +- web/plugins/wato/mkeventd.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 32e71e1..5e31cab 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2765,7 +2765,7 @@ metric_info["harddrive_uncorrectable_erros"] = { } metric_info["harddrive_udma_crc_errors"] = { - "title" : _("Harddrive udma crc errors"), + "title" : _("Harddrive UDMA CRC errors"), "unit" : "count", "color" : "46/a", } diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 41df8d3..2481eae 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2642,7 +2642,7 @@ if mkeventd_enabled: ( "host", _("Host's contact groups have precedence") ), ( "rule", _("Contact groups in rule have precedence") ), ], - help = _("Here you can specify whether which contact groups shall have " + help = _("Here you can specify which contact groups shall have " "precedence when both the host of an event can be found in the " "monitoring and the event rule has defined contact groups for the event."), ),

8 years, 2 months

Fixed some typos

by Mathias Kettner

Module: check_mk Branch: master Commit: b1e1f6af7946f8d1420810fb546fd8c2fa58ffac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e1f6af7946f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 15:23:20 2016 +0200 Fixed some typos --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 51d33f5..ba7704e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1556,7 +1556,7 @@ register_check_parameters( ( "remaining_life", Tuple( title = _("Remaining Life"), - help = _("Estimatede remaining health of the disk based on other readings."), + help = _("Estimated remaining health of the disk based on other readings."), elements = [ Percentage(title = _("Warning below"), default_value = 30), Percentage(title = _("Critical below"), default_value = 10),

8 years, 2 months

Fixed some help texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 340dd268a568b4e411db30caf2d453d7748dfb37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=340dd268a568b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 15:08:19 2016 +0200 Fixed some help texts --- web/plugins/metrics/check_mk.py | 1 - web/plugins/wato/datasource_programs.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 9f92b9d..32e71e1 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2440,7 +2440,6 @@ metric_info["buffered_io"] = { metric_info["write_cache_usage"] = { "title" : _("Write cache usage"), - "help" : _("A write cache is a cache that uses an allocate on write miss, write-back, no allocate on read miss strategy"), "unit" : "%", "color" : "#030303", } diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 2713832..730cda7 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -585,7 +585,7 @@ def validate_siemens_plc_values(value, varprefix): _siemens_plc_value = [ Transform( CascadingDropdown( - title = _("Area"), + title = _("The Area"), choices = [ ("db", _("Datenbaustein"), Integer( @@ -608,8 +608,8 @@ _siemens_plc_value = [ Float( title = _("Address"), display_format = "%.1f", - help = _("Addresses are specified as float values, while the numbers " - "the dot specify the byte to fetch and the number after the " + help = _("Addresses are specified with a dot notation, where number " + "before the dot specify the byte to fetch and the number after the " "dot specifies the bit to fetch. The number of the bit is always " "between 0 and 7."), ),

8 years, 2 months

Removed bogus translation

by Mathias Kettner

Module: check_mk Branch: master Commit: b03654ccf7369f42c60b6140cfe52c4e911361c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b03654ccf7369f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:54:48 2016 +0200 Removed bogus translation --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c6729f4..957a59b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14708,8 +14708,8 @@ def get_check_plugin_stats(subnode): text = "" if num_cats > 1: - text += _("%d %s<br>") % (num_cats, _("sub categories")) - text += _("%d %s") % (num_plugins, _("check plugins")) + text += "%d %s<br>" % (num_cats, _("sub categories")) + text += "%d %s" % (num_plugins, _("check plugins")) return text

8 years, 2 months

Fixed some titles

by Mathias Kettner

Module: check_mk Branch: master Commit: dde104a14f3576482e911111e91a2eb510783918 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dde104a14f3576… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 26 14:29:37 2016 +0200 Fixed some titles --- web/htdocs/wato.py | 4 ++-- web/plugins/metrics/check_mk.py | 22 +++++++++++----------- web/plugins/wato/check_parameters.py | 2 +- web/plugins/wato/datasource_programs.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d6eb611..c6729f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2832,7 +2832,7 @@ def show_service_table(host, firsttime): err = e paramtext = _("Invalid check parameter: %s!") % err paramtext += _(" The parameter is: %r") % (params,) - paramtext += _(" The varname is: %s") % varname + paramtext += _(" The variable name is: %s") % varname html.write(paramtext) @@ -14990,7 +14990,7 @@ def mode_download_agents(phase): elif phase == "buttons": global_buttons() if 'agents' in modes: - html.context_button(_("Baked Agents"), folder_preserving_link([("mode", "agents")]), "download_agents") + html.context_button(_("Baked agents"), folder_preserving_link([("mode", "agents")]), "download_agents") html.context_button(_("Release Notes"), "version.py", "mk") return diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 88d7f24..9f92b9d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2633,61 +2633,61 @@ metric_info["qos_outbound_bytes_rate"] = { } metric_info["apache_state_startingup"] = { - "title" : _("Apache starting up"), + "title" : _("Starting up"), "unit" : "count", "color" : "11/a", } metric_info["apache_state_waiting"] = { - "title" : _("Apache writing"), + "title" : _("Writing"), "unit" : "count", "color" : "14/a", } metric_info["apache_state_logging"] = { - "title" : _("Apache logging"), + "title" : _("Logging"), "unit" : "count", "color" : "21/a", } metric_info["apache_state_dns"] = { - "title" : _("Apache DNS"), + "title" : _("DNS"), "unit" : "count", "color" : "24/a", } metric_info["apache_state_sending_reply"] = { - "title" : _("Apache sending reply"), + "title" : _("Sending reply"), "unit" : "count", "color" : "31/a", } metric_info["apache_state_reading_request"] = { - "title" : _("Apache reading request"), + "title" : _("Reading request"), "unit" : "count", "color" : "34/a", } metric_info["apache_state_closing"] = { - "title" : _("Apache closing"), + "title" : _("Closing"), "unit" : "count", "color" : "41/a", } metric_info["apache_state_idle_cleanup"] = { - "title" : _("Apache idle clean up"), + "title" : _("Idle clean up"), "unit" : "count", "color" : "44/a", } metric_info["apache_state_finishing"] = { - "title" : _("Apache finishing"), + "title" : _("Finishing"), "unit" : "count", "color" : "46/b", } metric_info["apache_state_keep_alive"] = { - "title" : _("Apache keep alive"), + "title" : _("Keep alive"), "unit" : "count", "color" : "53/b", } @@ -6027,7 +6027,7 @@ graph_info.append({ }) graph_info.append({ - "title" : _("Seconds serving"), + "title" : _("Time spent for various page types"), "metrics" : [ ("secs_cmk_views", "stack"), ("secs_cmk_wato", "stack"), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 050ee54..51d33f5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7893,7 +7893,7 @@ register_check_parameters( register_check_parameters( subgroup_storage, "hpux_multipath", - _("HPUX Multipath Count"), + _("HP-UX Multipath Count"), Tuple( title = _("Expected path situation"), help = _("This rules sets the expected number of various paths for a multipath LUN " diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 4ef456b..2713832 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -771,7 +771,7 @@ register_rule(group, ], optional_keys = False ), - title = _("Agent Ruckus Spot"), + title = _("Agent for Ruckus Spot"), help = _("This rule selects the Agent Ruckus Spot agent instead of the normal Check_MK Agent " "which collects the data through the Ruckus Spot web interface"), match = 'first')

8 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016