Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Code cleanup: prefix non-public functions with _ in sites.py

by Mathias Kettner

Module: check_mk Branch: master Commit: 5405469a2a78c867b810868a7460a4009d219975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5405469a2a78c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 13:51:14 2016 +0200 Code cleanup: prefix non-public functions with _ in sites.py --- web/htdocs/sites.py | 119 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 45 deletions(-) diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 9537de1..9381ca0 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -28,53 +28,88 @@ import config import defaults import livestatus -# The global livestatus object. This is initialized automatically upon first access -# to the accessor function live() -_live = None - -# _site_status keeps a dictionary for each site with the following keys: -# "state" --> "online", "disabled", "down", "unreach", "dead" or "waiting" -# "exception" --> An error exception in case of down, unreach, dead or waiting -# "status_host_state" --> host state of status host (0, 1, 2 or None) -# "livestatus_version" --> Version of sites livestatus if "online" -# "program_version" --> Version of Nagios if "online" -_site_status = None +# .--API-----------------------------------------------------------------. +# | _ ____ ___ | +# | / \ | _ \_ _| | +# | / _ \ | |_) | | | +# | / ___ \| __/| | | +# | /_/ \_\_| |___| | +# | | +# +----------------------------------------------------------------------+ +# | Functions und names for the public | +# '----------------------------------------------------------------------' -# Accessor and initializer to the global livestatus connection object def live(): + """Get Livestatus connection object matching the current site configuration + and user settings. On the first call the actual connection is being made.""" if _live == None: - connect() + _connect() return _live # Accessor for the status of a single site def state(site_id, deflt=None): + """Get the status of a certain site. Returns a dictionary with various + entries. deflt is being returned in case the specified site doe not + exist or has no state.""" if _live == None: - connect() + _connect() return _site_status.get(site_id, deflt) -# Returns dictionary of all known site states def states(): + """Returns dictionary of all known site states.""" if _live == None: - connect() + _connect() return _site_status -# Build up a connection to livestatus to either a single site or multiple sites. -def connect(): - init_site_status() - connect_multiple_sites() - set_livestatus_auth() +def disconnect(): + """Actively closes all Livestatus connections.""" + global _live, _site_status + _live = None + _site_status = None + -def connect_multiple_sites(): - global _live - enabled_sites, disabled_sites = get_enabled_and_disabled_sites() - set_initial_site_states(enabled_sites, disabled_sites) +#. +# .--Internal------------------------------------------------------------. +# | ___ _ _ | +# | |_ _|_ __ | |_ ___ _ __ _ __ __ _| | | +# | | || '_ \| __/ _ \ '__| '_ \ / _` | | | +# | | || | | | || __/ | | | | | (_| | | | +# | |___|_| |_|\__\___|_| |_| |_|\__,_|_| | +# | | +# +----------------------------------------------------------------------+ +# | Internal functiions and variables | +# '----------------------------------------------------------------------' +# The global livestatus object. This is initialized automatically upon first access +# to the accessor function live() +_live = None + +# _site_status keeps a dictionary for each site with the following keys: +# "state" --> "online", "disabled", "down", "unreach", "dead" or "waiting" +# "exception" --> An error exception in case of down, unreach, dead or waiting +# "status_host_state" --> host state of status host (0, 1, 2 or None) +# "livestatus_version" --> Version of sites livestatus if "online" +# "program_version" --> Version of Nagios if "online" +_site_status = None + + +# Build up a connection to livestatus to either a single site or multiple sites. +def _connect(): + _init_site_status() + _connect_multiple_sites() + _set_livestatus_auth() + + +def _connect_multiple_sites(): + global _live + enabled_sites, disabled_sites = _get_enabled_and_disabled_sites() + _set_initial_site_states(enabled_sites, disabled_sites) _live = livestatus.MultiSiteConnection(enabled_sites, disabled_sites) # Fetch status of sites by querying the version of Nagios and livestatus @@ -84,7 +119,7 @@ def connect_multiple_sites(): "GET status\n" "Cache: reload\n" "Columns: livestatus_version program_version program_start num_hosts num_services"): - update_site_status(site_id, { + _update_site_status(site_id, { "state" : "online", "livestatus_version" : v1, "program_version" : v2, @@ -98,14 +133,14 @@ def connect_multiple_sites(): # Get exceptions in case of dead sites for site_id, deadinfo in _live.dead_sites().items(): shs = deadinfo.get("status_host_state") - update_site_status(site_id, { + _update_site_status(site_id, { "exception" : deadinfo["exception"], "status_host_state" : shs, - "state" : status_host_state_name(shs), + "state" : _status_host_state_name(shs), }) -def get_enabled_and_disabled_sites(): +def _get_enabled_and_disabled_sites(): enabled_sites, disabled_sites = {}, {} for site_id, site in config.allsites().items(): @@ -129,8 +164,8 @@ def get_enabled_and_disabled_sites(): # If Multisite is retricted to data the user is a contact for, we need to set an # AuthUser: header for livestatus. -def set_livestatus_auth(): - user_id = livestatus_auth_user() +def _set_livestatus_auth(): + user_id = _livestatus_auth_user() if user_id != None: _live.set_auth_user('read', user_id) _live.set_auth_user('action', user_id) @@ -149,7 +184,7 @@ def set_livestatus_auth(): # Returns either None when no auth user shal be set or the name of the user # to be used as livestatus auth user -def livestatus_auth_user(): +def _livestatus_auth_user(): if not config.may("general.see_all"): return config.user_id @@ -171,41 +206,35 @@ def livestatus_auth_user(): return None -def disconnect(): - global _live, _site_status - _live = None - _site_status = None - - -def status_host_state_name(shs): +def _status_host_state_name(shs): if shs == None: return "dead" else: return { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") -def init_site_status(): +def _init_site_status(): global _site_status _site_status = {} -def set_initial_site_states(enabled_sites, disabled_sites): +def _set_initial_site_states(enabled_sites, disabled_sites): for site_id, site in enabled_sites.items(): - set_site_status(site_id, { + _set_site_status(site_id, { "state" : "dead", "site" : site }) for site_id, site in disabled_sites.items(): - set_site_status(site_id, { + _set_site_status(site_id, { "state" : "disabled", "site" : site }) -def set_site_status(site_id, status): +def _set_site_status(site_id, status): _site_status[site_id] = status -def update_site_status(site_id, status): +def _update_site_status(site_id, status): _site_status[site_id].update(status)

8 years

3805 WATO WebAPI: The configuration of cluster nodes is now officially supported

by Andreas Boesl

Module: check_mk Branch: master Commit: 7ad8f78f1040915e63b433b3e616b10943c9295e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ad8f78f104091… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 16 13:45:54 2016 +0200 3805 WATO WebAPI: The configuration of cluster nodes is now officially supported You can now set the new key <tt>nodes</tt> in the add_host and edit_host operations. The value is a list of cluster node names. A host is treated as normal host if the key is entirely missing or if the node list is empty. --- .werks/3805 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 23 +++++++++++------------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.werks/3805 b/.werks/3805 new file mode 100644 index 0000000..10c0344 --- /dev/null +++ b/.werks/3805 @@ -0,0 +1,12 @@ +Title: WATO WebAPI: The configuration of cluster nodes is now officially supported +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1474026075 +Class: feature + +You can now set the new key <tt>nodes</tt> in the add_host and edit_host operations. +The value is a list of cluster node names. A host is treated as normal host if the key +is entirely missing or if the node list is empty. + diff --git a/ChangeLog b/ChangeLog index da65413..4fb009b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -528,6 +528,7 @@ * 3851 Host edit dialog: Checkbox hosttags are now checked by default... * 3800 WATO rule overview: Adjusted wording of condition texts * 3855 SEC: Fixed possible command injection by privileged WATO users... + * 3805 WATO WebAPI: The configuration of cluster nodes is now officially supported... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index a3de28c..2b4488a 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -76,16 +76,17 @@ def validate_host_attributes(attributes): def action_add_host(request): - validate_request_keys(request, ["hostname", "folder", "attributes"]) + validate_request_keys(request, ["hostname", "folder", "attributes", "nodes"]) if html.var("create_folders"): create_folders = bool(int(html.var("create_folders"))) else: create_folders = True - hostname = request.get("hostname") - folder_path = request.get("folder") - attributes = request.get("attributes", {}) + hostname = request.get("hostname") + folder_path = request.get("folder") + attributes = request.get("attributes", {}) + cluster_nodes = request.get("nodes") # Validate hostname if not hostname: @@ -106,9 +107,8 @@ def action_add_host(request): folder_path = "" folders = [""] - # Validate and cleanup given attributes - # CLEANUP: modify WebAPI .nodes argument - cluster_nodes = None + # Deprecated, but still supported + # Nodes are now specified in an extra key if ".nodes" in attributes: cluster_nodes = attributes[".nodes"] del attributes[".nodes"] @@ -131,11 +131,12 @@ api_actions["add_host"] = { ############### def action_edit_host(request): - validate_request_keys(request, ["hostname", "unset_attributes", "attributes"]) + validate_request_keys(request, ["hostname", "unset_attributes", "attributes", "nodes"]) hostname = request.get("hostname") attributes = request.get("attributes", {}) unset_attribute_names = request.get("unset_attributes", []) + cluster_nodes = request.get("nodes") # Validate host if not hostname: @@ -145,10 +146,8 @@ def action_edit_host(request): if not host: raise MKUserError(None, _("No such host")) - # Only validate the new attributes - attributes = request.get("attributes", {}) - # CLEANUP: modify WebAPI .nodes argument - cluster_nodes = None + # Deprecated, but still supported + # Nodes are now specified in an extra key if ".nodes" in attributes: cluster_nodes = attributes[".nodes"] del attributes[".nodes"]

8 years

Removed duplicate livestatus.py

by Mathias Kettner

Module: check_mk Branch: master Commit: e8ae7166ed8af6567a1ee1a8c6e5bfe8f9f31ce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8ae7166ed8af6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 13:29:22 2016 +0200 Removed duplicate livestatus.py Now we always use livestatus.py from livestatus/api/python/. It is not longer duplicated in web/htdocs/ --- livestatus/api/python/livestatus.py | 29 +- web/htdocs/livestatus.py | 683 ------------------------------------ 2 files changed, 16 insertions(+), 696 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e8ae7166ed…

8 years

Removed unused code from sites.py module

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c4e79aa45d55bdab24b6f54bb35ec261aefff50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c4e79aa45d55b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 13:12:54 2016 +0200 Removed unused code from sites.py module --- web/htdocs/sites.py | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index fae3964..9537de1 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -32,7 +32,7 @@ import livestatus # to the accessor function live() _live = None -# site_status keeps a dictionary for each site with the following keys: +# _site_status keeps a dictionary for each site with the following keys: # "state" --> "online", "disabled", "down", "unreach", "dead" or "waiting" # "exception" --> An error exception in case of down, unreach, dead or waiting # "status_host_state" --> host state of status host (0, 1, 2 or None) @@ -65,13 +65,7 @@ def states(): # Build up a connection to livestatus to either a single site or multiple sites. def connect(): init_site_status() - - # If there is only one site (non-multisite), then user cannot enable/disable. - if config.is_multisite(): - connect_multiple_sites() - else: - connect_single_site() - + connect_multiple_sites() set_livestatus_auth() @@ -132,21 +126,6 @@ def get_enabled_and_disabled_sites(): return enabled_sites, disabled_sites -def connect_single_site(): - global _live - _live = livestatus.SingleSiteConnection("unix:" + defaults.livestatus_unix_socket) - _live.set_timeout(3) # default timeout is 3 seconds - - set_initial_site_states({"": config.site("")}, {}) - - v1, v2, ps = _live.query_row("GET status\nColumns: livestatus_version program_version program_start") - update_local_site_status({ - "state" : "online", - "livestatus_version" : v1, - "program_version" : v2, - "program_start" : ps, - }) - # If Multisite is retricted to data the user is a contact for, we need to set an # AuthUser: header for livestatus. @@ -224,17 +203,9 @@ def set_initial_site_states(enabled_sites, disabled_sites): }) -def set_local_site_status(status): - set_site_status("", status) - - def set_site_status(site_id, status): _site_status[site_id] = status -def update_local_site_status(status): - update_site_status("", status) - - def update_site_status(site_id, status): _site_status[site_id].update(status)

8 years

3860 FIX EC condition: Fixed default value of rule id selection

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ac4d94098d0b3057c90400f9ae71ae8320c1b69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ac4d94098d0b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 16 11:16:01 2016 +0200 3860 FIX EC condition: Fixed default value of rule id selection --- .werks/3860 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3860 b/.werks/3860 new file mode 100644 index 0000000..abe8daf --- /dev/null +++ b/.werks/3860 @@ -0,0 +1,10 @@ +Title: EC condition: Fixed default value of rule id selection +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1474017331 + + diff --git a/ChangeLog b/ChangeLog index d6e037c..da65413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -629,6 +629,7 @@ * 3426 FIX: sms: fixed wrong message handling after message was quoted and therefore too long * 3139 FIX: fixed a couple of minor issues in call to notification scripts... * 3146 FIX: notification scripts will now also timeout when sending a bulk notification... + * 3860 FIX: EC condition: Fixed default value of rule id selection BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c425720..e4cfb42 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7459,6 +7459,12 @@ def event_rule_match_conditions(flavour): def notification_rule_match_conditions(): + def transform_ec_rule_id_match(val): + if isinstance(val, list): + return val + else: + return [val] + return [ ( "match_escalation", Tuple( @@ -7538,7 +7544,7 @@ def notification_rule_match_conditions(): add_label = _("Add Rule ID"), title = _("Rule IDs") ), - forth = lambda x: isinstance(x, list) and x or [x] + forth = transform_ec_rule_id_match, ) ), ( "match_priority",

8 years

update for WK3796

by Andreas Boesl

Module: check_mk Branch: master Commit: 0484845ad3ca3ba5a1e1b4e49c60a639fb5cb9cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0484845ad3ca3b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 16 10:10:09 2016 +0200 update for WK3796 --- agents/special/agent_vsphere | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index b190837..0552951 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -854,6 +854,7 @@ opt_vm_piggyname = "alias" opt_spaces = "underscore" opt_no_cert = False +win_agent_output = None error = None error_exit = 1 @@ -975,6 +976,10 @@ def get_agent_info_tcp(hostname): return response +if opt_agent: + win_agent_output = get_agent_info_tcp(host_address) + error_exit = 0 + # Globals of ESX System. These settings are available after the first "systeminfo" query systemfields = [ ("apiVersion", float), @@ -1470,7 +1475,14 @@ if not error: output("<<<<%s>>>>" % convert_hostname(properties["name"][0])) output("<<<esx_vsphere_hostsystem>>>") + # Special handling. If the windows agent reports winperf_processor skip + # summary.quickStats.overallCpuUsage in output. This would lead to a + # duplicate "CPU utlization" service + skip_cpu_util = opt_agent and "<<<winperf_processor>>>" in win_agent_output + for key in sorted(properties.keys()): + if skip_cpu_util and key == "summary.quickStats.overallCpuUsage": + continue output("%s %s" % (key, " ".join(properties[key]))) output("<<<esx_vsphere_sensors:sep(59)>>>") @@ -1686,9 +1698,8 @@ def make_utf8(line): print "\n".join(map(make_utf8, vsphere_output)) if opt_agent: - sys.stdout.write(get_agent_info_tcp(host_address)) + sys.stdout.write(win_agent_output) sys.stdout.flush() - error_exit = 0 if tracefile: tracefile.close()

8 years

3859 check_mail_loop.vbs: New MRPE script to perform a mail loop check via Outlook MAPI

by Lars Michelsen

Module: check_mk Branch: master Commit: 25b01e1c7a734b21698d1fb71a6368e5f35fe275 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25b01e1c7a734b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 16 09:15:35 2016 +0200 3859 check_mail_loop.vbs: New MRPE script to perform a mail loop check via Outlook MAPI The check is similar to the default check_mail_loop active check (which can be configured via WATO), but it works using Outlook and the MAPI protocol to send and receive mails. So you can construct a mail loop checking your Exchange mail infrastrucure without involving other protocols like IMAP, POP3 or SMTP. Take a look at the file header of the script. It describes how to setup the script. --- .werks/3859 | 14 + ChangeLog | 1 + agents/windows/mrpe/check_mail_loop.vbs | 608 ++++++++++++++++++++++++++++++++ 3 files changed, 623 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25b01e1c7a…

8 years

Added hostname to bulk discovery WATO log entry

by Lars Michelsen

Module: check_mk Branch: master Commit: dbaf244dbdd6eeaf5a86867428b3e05f57f1adb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbaf244dbdd6ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 15 13:45:30 2016 +0200 Added hostname to bulk discovery WATO log entry --- 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 d90a640..c425720 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3467,8 +3467,8 @@ def mode_bulk_discovery(phase): result_txt += _("%s: discovery successful<br>\n") % hostname folder.mark_hosts_dirty(need_sync=False) log_pending(AFFECTED, hostname, "bulk-inventory", - _("Did service discovery on host: %d added, %d removed, %d kept, %d total services") % - tuple(counts[hostname])) + _("Did service discovery on host %s: %d added, %d removed, %d kept, %d total services") % + tuple([hostname] + counts[hostname])) if not host.locked(): host.clear_discovery_failed()

8 years

Fixed crash reporting modifying data strcutures it reported a crash for

by Lars Michelsen

Module: check_mk Branch: master Commit: 89e2408a1d54fe28bd5c2f66bd0a7d0068e181e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89e2408a1d54fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 15 13:22:51 2016 +0200 Fixed crash reporting modifying data strcutures it reported a crash for --- lib/crash_reporting.py | 2 ++ tests/lib/test_crash_reporting.py | 62 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/lib/crash_reporting.py b/lib/crash_reporting.py index 4a1a5af..d709a3c 100644 --- a/lib/crash_reporting.py +++ b/lib/crash_reporting.py @@ -126,10 +126,12 @@ def format_var_for_export(val, maxdepth=4, maxsize=1024*1024): return "Max recursion depth reached" if isinstance(val, dict): + val = val.copy() for item_key, item_val in val.items(): val[item_key] = format_var_for_export(item_val, maxdepth-1) elif isinstance(val, list): + val = val[:] for index, item in enumerate(val): val[index] = format_var_for_export(item, maxdepth-1) diff --git a/tests/lib/test_crash_reporting.py b/tests/lib/test_crash_reporting.py new file mode 100644 index 0000000..853feac --- /dev/null +++ b/tests/lib/test_crash_reporting.py @@ -0,0 +1,62 @@ +import copy +import cmk.crash_reporting as crash_reporting + +def test_format_var_for_export_strip_nested_dict(): + orig_var = { + "a": { + "b": { + "c": { + "d": { + + }, + }, + }, + }, + } + + var = copy.deepcopy(orig_var) + formated = crash_reporting.format_var_for_export(var) + + # Stripped? + assert formated["a"]["b"]["c"]["d"] == "Max recursion depth reached" + + # Not modified original data + assert orig_var == var + + +def test_format_var_for_export_strip_large_data(): + orig_var = { + "a": { + "y": ("a" * 1024 * 1024) + "a" + }, + } + + var = copy.deepcopy(orig_var) + formated = crash_reporting.format_var_for_export(var) + + # Stripped? + assert formated["a"]["y"].endswith("(1 bytes stripped)") + + # Not modified original data + assert orig_var == var + + +def test_format_var_for_export_strip_nested_dict_with_list(): + orig_var = { + "a": { + "b": { + "c": [ + {} + ], + }, + }, + } + + var = copy.deepcopy(orig_var) + formated = crash_reporting.format_var_for_export(var) + + # Stripped? + assert formated["a"]["b"]["c"][0] == "Max recursion depth reached" + + # Not modified original data + assert orig_var == var

8 years

3701 FIX FIX ps.perf graph title for Memory and CPU Usage

by Marcel Schulte

Module: check_mk Branch: master Commit: 8c04fc962c155aecad47f8153f772704a807f1c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c04fc962c155a… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Sep 15 10:27:52 2016 +0200 3701 FIX FIX ps.perf graph title for Memory and CPU Usage Fixed graph titles to show "Usage for all processes". --- .werks/3701 | 10 ++++++++++ ChangeLog | 1 + pnp-templates/check_mk-ps.perf.php | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3701 b/.werks/3701 new file mode 100644 index 0000000..d021a69 --- /dev/null +++ b/.werks/3701 @@ -0,0 +1,10 @@ +Title: FIX ps.perf graph title for Memory and CPU Usage +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473927852 +Class: fix + +Fixed graph titles to show "Usage for all processes". + diff --git a/ChangeLog b/ChangeLog index 6458b89..bd5abe1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -389,6 +389,7 @@ * 3854 FIX: juniper_bgp_state: Fixed service descriptions in some cases... * 3837 FIX: Fixed empty check if lnx_if info contains additional line... * 3802 FIX: Fixed excess Check Helper PIPEs when a datasource program runs into a timeout... + * 3701 FIX: FIX ps.perf graph title for Memory and CPU Usage... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index b59113a..3c409f4 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -57,7 +57,7 @@ $def[1] = "" # 2. Graph: Memory usage if (isset($RRD["vsz"])) { - $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage per process\" "; + $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage for all Processes\" "; $def[2] = "" . "DEF:count=$RRD[count] " . "DEF:vsz=$RRD[vsz] " @@ -76,7 +76,7 @@ if (isset($RRD["vsz"])) { } if (isset($RRD["pcpu"])) { - $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU Usage\" "; + $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU Usage for all Processes\" "; $def[3] = "" . "DEF:pcpu=$RRD[pcpu] " . "AREA:pcpu#30ff80:\"CPU usage (%) \" "

8 years

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016