Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5944 FIX Fixed broken HTTP header auth for not yet existing users

by Lars Michelsen

Module: check_mk Branch: master Commit: 6958613bf7925c623d64f0f72762cf45a5ac1ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6958613bf7925c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 22:15:46 2018 +0200 5944 FIX Fixed broken HTTP header auth for not yet existing users This was broken since ~1.5.0i3. When a user which has not been created in Check_MK before is being authenticated using the optional HTTP header authentication and logged in using the "default user profile", some host- and service views were not working as expected. They were showing some exception like "KeyError: u'<USER>'". A workaround in the affected versions is to create the user accounts before the user try to access the GUI. Change-Id: I950453b8de15b2d5cc628169f84420e85591b1e3 --- .werks/5944 | 17 +++++++++++++++++ web/htdocs/userdb.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/5944 b/.werks/5944 new file mode 100644 index 0000000..c8a3b2a --- /dev/null +++ b/.werks/5944 @@ -0,0 +1,17 @@ +Title: Fixed broken HTTP header auth for not yet existing users +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522872782 +Class: fix + +This was broken since ~1.5.0i3. When a user which has not been created +in Check_MK before is being authenticated using the optional HTTP header +authentication and logged in using the "default user profile", some +host- and service views were not working as expected. They were showing +some exception like "KeyError: u'<USER>'". + +A workaround in the affected versions is to create the user accounts +before the user try to access the GUI. diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index ce3fca9..be52ffa 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -906,7 +906,7 @@ def contactgroups_of_user(user_id): user = load_cached_profile() if user == None: # No cached profile present. Load all users to get the users data - user = load_users(lock=False)[user_id] + user = load_users(lock=False).get(user_id, {}) return user.get("contactgroups", [])

6 years, 5 months

Cleaned up more json imports

by Lars Michelsen

Module: check_mk Branch: master Commit: 9aec4a50b760256ab913ab82d1a45708c1f14a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aec4a50b76025… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 22:22:26 2018 +0200 Cleaned up more json imports htdocs/htmllib.py patches the default JSON encoder to make it able to serialize the special type HTML(). The commit 8d23fd1fcbb changed the htmllib.py to only use the python builtin json module. To get the correct overriden json.JSONEncoder, all other parts of the GUI also need to use the builtin json over the simplejson module. Change-Id: I8dcfafa738c2fc2f7c9b1c487389bdf2c56ad8b8 --- web/htdocs/backup.py | 6 +----- web/htdocs/crash_reporting.py | 5 +---- web/htdocs/dashboard.py | 5 +---- web/htdocs/help.py | 6 +----- web/htdocs/inventory.py | 6 +----- web/htdocs/metrics.py | 5 +---- web/htdocs/prediction.py | 6 +----- web/htdocs/sidebar.py | 6 +----- web/htdocs/wato.py | 6 +----- web/htdocs/webapi.py | 5 +---- web/plugins/dashboard/dashlets.py | 5 +---- web/plugins/views/webservice.py | 5 +---- 12 files changed, 12 insertions(+), 54 deletions(-) diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py index 5276533..556b099 100644 --- a/web/htdocs/backup.py +++ b/web/htdocs/backup.py @@ -37,11 +37,7 @@ import signal import socket import subprocess import time - -try: - import simplejson as json -except ImportError: - import json +import json import table import key_mgmt diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 30fa8a5..39cbe59 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -32,10 +32,7 @@ from valuespec import * import table, config, forms import cmk.crash_reporting -try: - import simplejson as json -except ImportError: - import json +import json def page_crashed(what): if what == "check": diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index dc5fc19..29a0184 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -29,10 +29,7 @@ from valuespec import * from lib import * import wato -try: - import simplejson as json -except ImportError: - import json +import json loaded_with_language = False builtin_dashboards = {} diff --git a/web/htdocs/help.py b/web/htdocs/help.py index 3f225a9..d9e7cbd 100644 --- a/web/htdocs/help.py +++ b/web/htdocs/help.py @@ -25,11 +25,7 @@ # Boston, MA 02110-1301 USA. import config - -try: - import simplejson as json -except ImportError: - import json +import json def ajax_switch_help(): state = html.var("enabled", "") != "" diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index f52894f..5fe8547 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -27,11 +27,7 @@ import re import os - -try: - import simplejson as json -except ImportError: - import json +import json import ast import config diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 74269dc..c57d8b7 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -45,10 +45,7 @@ from valuespec import * import livestatus from cmk.regex import regex -try: - import simplejson as json -except ImportError: - import json +import json # .--Plugins-------------------------------------------------------------. # | ____ _ _ | diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index e37f1d0..56a1b4e 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -26,6 +26,7 @@ import os import time +import json import cmk.paths import config @@ -33,11 +34,6 @@ import sites from lib import * import cmk.store as store -try: - import simplejson as json -except ImportError: - import json - graph_size = 2000, 700 diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b1028fb..9aa52a0 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -37,11 +37,7 @@ from log import logger import cmk.paths import cmk.store as store - -try: - import simplejson as json -except ImportError: - import json +import json # Constants to be used in snapins snapin_width = 230 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7e88e98..5bb420a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -114,11 +114,7 @@ if cmk.is_managed_edition(): else: managed = None - -try: - import simplejson as json -except ImportError: - import json +import json g_html_head_open = False display_options = None diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index e222c40..3b63cb1 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -38,10 +38,7 @@ if cmk.is_managed_edition(): else: managed = None -try: - import simplejson as json -except ImportError: - import json +import json api_actions = {} loaded_with_language = False diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 3a23c7a..0801068 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -24,10 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -try: - import simplejson as json -except ImportError: - import json +import json import sites, notify, table import livestatus diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index cfb35f5..7bf0100 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -24,10 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -try: - import simplejson as json -except ImportError: - import json +import json def render_python_raw(data, view, group_cells, cells, num_columns, show_checkboxes): html.write(repr(data))

6 years, 5 months

Removed global variable g_status_server, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: 93535e869cc2f6b598bb19451aeed9569e7da473 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93535e869cc2f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 09:25:23 2018 +0200 Removed global variable g_status_server, part 2. Change-Id: I33770bc8d0370bb8e647d3c326f606fa6e3f2150 --- cmk/ec/main.py | 60 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=93535e869c…

6 years, 5 months

Removed global variable g_status_server, part 1.

by Sven Panne

Module: check_mk Branch: master Commit: 1bd2e86e1712ffdceb80685387b90f27970b225b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bd2e86e1712ff… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 09:11:27 2018 +0200 Removed global variable g_status_server, part 1. Change-Id: Ida7dfeaa13fc77d4326c71b0bb1bbf3568e0f909 --- cmk/ec/main.py | 80 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bd2e86e17…

6 years, 5 months

Replaced a few global variables with self.

by Sven Panne

Module: check_mk Branch: master Commit: 44b6f83bf2e97ababb993f6b8357726591b5cfce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44b6f83bf2e97a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 5 09:05:32 2018 +0200 Replaced a few global variables with self. Change-Id: I54239c71aad3b04b37f8583987c4e7337f57186d --- cmk/ec/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a5a385a..10a79dc 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1860,7 +1860,7 @@ class EventServer(ECServerThread): event["phase"] = "open" log_event_history(self.settings, event, "DELAYOVER") if rule: - event_has_opened(self.settings, g_event_server, rule, event) + event_has_opened(self.settings, self, rule, event) if rule.get("autodelete"): event["phase"] = "closed" log_event_history(self.settings, event, "AUTODELETE") @@ -2000,7 +2000,7 @@ class EventServer(ECServerThread): self.rewrite_event(rule, event, ()) self._event_status.new_event(event) log_event_history(self.settings, event, "COUNTFAILED") - event_has_opened(self.settings, g_event_server, rule, event) + event_has_opened(self.settings, self, rule, event) if rule.get("autodelete"): event["phase"] = "closed" log_event_history(self.settings, event, "AUTODELETE") @@ -2251,7 +2251,7 @@ class EventServer(ECServerThread): existing_event["delay_until"] = time.time() + rule["delay"] existing_event["phase"] = "delayed" else: - event_has_opened(self.settings, g_event_server, rule, existing_event) + event_has_opened(self.settings, self, rule, existing_event) log_event_history(self.settings, existing_event, "COUNTREACHED") @@ -2273,7 +2273,7 @@ class EventServer(ECServerThread): if self.new_event_respecting_limits(event): if event["phase"] == "open": - event_has_opened(self.settings, g_event_server, rule, event) + event_has_opened(self.settings, self, rule, event) if rule.get("autodelete"): event["phase"] = "closed" log_event_history(self.settings, event, "AUTODELETE") @@ -3000,7 +3000,7 @@ class EventServer(ECServerThread): if "notify" in action: self.logger.info(" Creating overflow notification") - do_notify(g_event_server, overflow_event) + do_notify(self, overflow_event) return False @@ -3014,7 +3014,7 @@ class EventServer(ECServerThread): # Prefer the host individual limit for by_host limit (in case there is some) if ty == "by_host": - host_config = g_event_server.host_config.get(event["core_host"], {}) + host_config = self.host_config.get(event["core_host"], {}) host_limit = host_config.get("custom_variables", {}).get("EC_EVENT_LIMIT") if host_limit: limit, action = host_limit.split(":", 1)

6 years, 5 months

5938 FIX Fixed search of event console packs and rules

by Simon Betz

Module: check_mk Branch: master Commit: 554495b0e8bd4424980c91490ad2bc85e3cb5a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554495b0e8bd44… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 5 09:12:38 2018 +0200 5938 FIX Fixed search of event console packs and rules Change-Id: Ic960b2215158bd1914d5e42d5246e6d52789469c --- .werks/5938 | 10 ++++++++++ web/plugins/wato/mkeventd.py | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/5938 b/.werks/5938 new file mode 100644 index 0000000..82c1476 --- /dev/null +++ b/.werks/5938 @@ -0,0 +1,10 @@ +Title: Fixed search of event console packs and rules +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522912277 +Class: fix + + diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index c5e5b3b..b751c95 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1351,12 +1351,12 @@ def rule_pack_with_id(rule_packs, rule_pack_id): def filter_mkeventd_rule_packs(search_expression, rule_packs): found_packs = {} for rule_pack in rule_packs: - if search_expression in rule_pack["id"] \ - or search_expression in rule_pack["title"]: + if search_expression in rule_pack["id"].lower() \ + or search_expression in rule_pack["title"].lower(): found_packs.setdefault(rule_pack["id"], []) for rule in rule_pack.get("rules", []): - if search_expression in rule["id"] \ - or search_expression in rule.get("description"): + if search_expression in rule["id"].lower() \ + or search_expression in rule.get("description").lower(): found_rules = found_packs.setdefault(rule_pack["id"], []) found_rules.append(rule) return found_packs @@ -1617,8 +1617,8 @@ def copy_rules_from_master(): def filter_mkeventd_rules(search_expression, rule_pack): found_rules = [] for rule in rule_pack.get("rules", []): - if search_expression in rule["id"] \ - or search_expression in rule.get("description"): + if search_expression in rule["id"].lower() \ + or search_expression in rule.get("description").lower(): found_rules.append(rule) return found_rules

6 years, 5 months

Improved rendering of "Authenticate users by incoming HTTP requests" default value

by Lars Michelsen

Module: check_mk Branch: master Commit: b10cfb1c2d52a38acf25aaceb01f9456b06cb569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b10cfb1c2d52a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 16:14:51 2018 +0200 Improved rendering of "Authenticate users by incoming HTTP requests" default value Change-Id: I0688610405ed49fdf0740b4aad1a4bfdac8d0894 --- web/plugins/wato/check_mk_configuration.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2881937..75e4d90 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -578,7 +578,10 @@ register_configvar(group, "(Apache <tt>Allow from</tt>), like proxy " "servers, to this webpage. A user with access to this page could simply fake " "the authentication information. This option can be useful to " - " realize authentication in reverse proxy environments.") + " realize authentication in reverse proxy environments."), + none_value = False, + none_label = _("Don't use HTTP header authentication"), + indent = False, ), domain = "multisite")

6 years, 5 months

Added todo note

by Lars Michelsen

Module: check_mk Branch: master Commit: bc3b3dd21bfd61085e3111b1a9aa7e76f89985e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc3b3dd21bfd61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 16:37:50 2018 +0200 Added todo note Change-Id: Ia05ce96da44e8832a97d82fac9dab864097a3627 --- web/htdocs/login.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 6e895ca..6e281a5 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -257,6 +257,14 @@ def auth_cookie_is_valid(cookie_name): return False +# TODO: Needs to be cleaned up. When using HTTP header auth or web server auth it is not +# ensured that a user exists after letting the user in. This is a problem for the following +# code! We need to define a point where the following code can rely on an existing user +# object. userdb.hook_login() is doing some similar stuff +# - It also checks the type() of the user_id (Not in the same way :-/) +# - It also calls userdb.is_customer_user_allowed_to_login() +# - It calls userdb.create_non_existing_user() but we don't +# - It calls connection.is_locked() but we don't def check_auth(mod_python_req): user_id = check_auth_web_server(mod_python_req)

6 years, 5 months

5937 apc_system_events: New check which monitors active system events on an InRow Cooling device

by Simon Betz

Module: check_mk Branch: master Commit: 1299c6d3820407c48db353c9e62195ec66c1dab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1299c6d3820407… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 4 15:35:39 2018 +0200 5937 apc_system_events: New check which monitors active system events on an InRow Cooling device Change-Id: Ideeb22fb8800bf2a6d25728a67adb0492162e7c7 --- .werks/5937 | 10 ++++++ checkman/apc_inrow_system_events | 12 ++++++++ checks/apc_inrow_system_events | 59 ++++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 17 +++++++++++ 4 files changed, 98 insertions(+) diff --git a/.werks/5937 b/.werks/5937 new file mode 100644 index 0000000..c39a089 --- /dev/null +++ b/.werks/5937 @@ -0,0 +1,10 @@ +Title: apc_system_events: New check which monitors active system events on an InRow Cooling device +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522848872 +Class: feature + + diff --git a/checkman/apc_inrow_system_events b/checkman/apc_inrow_system_events new file mode 100644 index 0000000..caface8 --- /dev/null +++ b/checkman/apc_inrow_system_events @@ -0,0 +1,12 @@ +title: APC InRow Cooling Devices: System events +agents: snmp +catalog: hw/environment/apc +license: GPL +distribution: check_mk +description: + This check monitors active system events on an InRow Cooling device. + In case of open events, the check takes a configurable state. + +inventory: + One check will be created for each host + diff --git a/checks/apc_inrow_system_events b/checks/apc_inrow_system_events new file mode 100644 index 0000000..1362f80 --- /dev/null +++ b/checks/apc_inrow_system_events @@ -0,0 +1,59 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +#.1.3.6.1.4.1.318.1.1.13.3.1.2.1.3.1 Power Source B Failure +#.1.3.6.1.4.1.318.1.1.13.3.1.2.1.3.2 Fan Power Supply Right Fault + +def parse_apc_inrow_system_events(info): + parsed = {} + events = [] + for line in info: + events.append(line[0]) + parsed.update({"events":events}) + return parsed + + +def inventory_apc_inrow_system_events(parsed): + yield (None, {}) + + +def check_apc_inrow_system_events(_no_item, params, parsed): + if parsed["events"]: + state = params.get("state", 2) + return state, ", ".join(parsed["events"]) + else: + return 0, "No service events" + + +check_info["apc_inrow_system_events"] = { + "parse_function" : parse_apc_inrow_system_events, + "inventory_function" : inventory_apc_inrow_system_events, + "check_function" : check_apc_inrow_system_events, + "service_description" : "System events", + "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.1.2.1", ["3"]), #airIRAlarmDescription + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), + "group" : "apc_system_events", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b3db19b..2062898 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5807,6 +5807,23 @@ register_check_parameters( "dict", ) +register_check_parameters( + subgroup_environment, + "apc_system_events", + _("APC Inrow System Events"), + Dictionary( + title = _("System Events on APX Inrow Devices"), + elements = [ + ( "state", + MonitoringState( + title = _("State during active system events"), + default_value = 2, + )), + ]), + None, + "dict" +) + #. # .--Printing------------------------------------------------------------. # | ____ _ _ _ |

6 years, 5 months

Remove unnecessary else in netapp_api_vf_stats

by Tom Baerwinkel

Module: check_mk Branch: master Commit: bcf9401469bc2e805befa8d07e5dd3bc4f019129 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcf9401469bc2e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 4 13:29:32 2018 +0200 Remove unnecessary else in netapp_api_vf_stats Change-Id: I8d2a3f9de5d82f0b86ab61df7d9296e33dbe429c --- checks/netapp_api_vf_stats | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/checks/netapp_api_vf_stats b/checks/netapp_api_vf_stats index 7dc86fe..cab4717 100644 --- a/checks/netapp_api_vf_stats +++ b/checks/netapp_api_vf_stats @@ -29,41 +29,43 @@ netapp_api_vf_stats_cpu_util_default_levels = (90.0, 95.0) # <<<netapp_api_vf_stats:sep(9)>>> # vfiler vfiler0 instance_uuid node_uuid vfiler_cpu_busy 663312444303217 vfiler_net_data_sent 8204762 vfiler_read_ops 14334581 ... + def inventory_netapp_api_vf_stats(parsed): for key in parsed.keys(): yield key, 'netapp_api_vf_stats_cpu_util_default_levels' + def check_netapp_api_vf_stats(item, params, parsed): vf = parsed.get(item) if not vf: return - else: - now = time.time() - cpu_busy = int(vf["vfiler_cpu_busy"]) - ticks_per_sec = get_rate("netapp_api_vf_stats.cpu_busy", now, cpu_busy, onwrap=RAISE) + now = time.time() - cpu_busy_base = int(vf["vfiler_cpu_busy_base"]) - ticks_per_sec_base = get_rate("netapp_api_vf_stats.cpu_busy_base", now, cpu_busy_base, onwrap=RAISE) + cpu_busy = int(vf["vfiler_cpu_busy"]) + ticks_per_sec = get_rate("netapp_api_vf_stats.cpu_busy", now, cpu_busy, onwrap=RAISE) - if ticks_per_sec == 0: - raise MKCounterWrapped("Counter wrapped") + cpu_busy_base = int(vf["vfiler_cpu_busy_base"]) + ticks_per_sec_base = get_rate("netapp_api_vf_stats.cpu_busy_base", now, cpu_busy_base, onwrap=RAISE) - num_processors = float(vf.get("num_processors", 1)) + if ticks_per_sec == 0: + raise MKCounterWrapped("Counter wrapped") - used_perc = ticks_per_sec / num_processors / ticks_per_sec_base * 100 + num_processors = float(vf.get("num_processors", 1)) - # Due to timeing invariancies the measured level can become > 100%. - # This makes users unhappy, so cut it off. - if used_perc < 0: - used_perc = 0 - elif used_perc > 100: - used_perc = 100 + used_perc = ticks_per_sec / num_processors / ticks_per_sec_base * 100 - state, infotext, perfdata = check_cpu_util(used_perc, params, now).next() - perfdata[0] = perfdata[0][:5] - infotext += ", Num Processors: %d" % num_processors - return state, infotext, perfdata + # Due to timeing invariancies the measured level can become > 100%. + # This makes users unhappy, so cut it off. + if used_perc < 0: + used_perc = 0 + elif used_perc > 100: + used_perc = 100 + + state, infotext, perfdata = check_cpu_util(used_perc, params, now).next() + perfdata[0] = perfdata[0][:5] + infotext += ", Num Processors: %d" % num_processors + return state, infotext, perfdata check_info["netapp_api_vf_stats"] = { @@ -81,6 +83,7 @@ def inventory_netapp_api_vf_stats_traffic(parsed): for key in parsed.keys(): yield key, None + def check_netapp_api_vf_stats_traffic(item, params, parsed): vf = parsed.get(item) if not vf: @@ -104,5 +107,3 @@ check_info["netapp_api_vf_stats.traffic"] = { 'has_perfdata' : True, 'service_description' : 'Traffic vFiler %s', } - -

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018