Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

6210 Separate Checkgroups for 3par_capacity, 3par_volume und 3par_cpgs

by Moritz Kiemer

Module: check_mk Branch: master Commit: 88d510dd7885afc2987ef134f505b63bd6a80244 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88d510dd7885af… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Aug 2 11:04:47 2018 +0200 6210 Separate Checkgroups for 3par_capacity, 3par_volume und 3par_cpgs Different rules for 3par_capacity, 3par_cpgs and 3par_volumes can now be created. The older more general rules will no longer match. CMK-732 Change-Id: Id2f0a7da3de37abbfa331b59501ca52e22d38c73 --- .werks/6210 | 19 ++ checkman/3par_capacity | 2 +- checks/3par.include | 2 +- checks/3par_capacity | 2 +- checks/3par_cpgs | 2 +- cmk/gui/plugins/wato/check_parameters.py | 390 +++++++++++++++++-------------- 6 files changed, 234 insertions(+), 183 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=88d510dd78…

6 years, 4 months

Pipfile: Add markers to avoid invalid markers in Pipfile.lock

by Moritz Kiemer

Module: check_mk Branch: master Commit: eb2567a6c50d6a3a8f6b180ebafdc805f9588691 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb2567a6c50d6a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Aug 3 09:13:55 2018 +0200 Pipfile: Add markers to avoid invalid markers in Pipfile.lock Change-Id: I441b2124c27b878e5e45ab5f153aa5d1d4a25130 --- Pipfile | 2 +- Pipfile.lock | 86 +++--------------------------------------------------------- 2 files changed, 5 insertions(+), 83 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eb2567a6c5…

6 years, 4 months

Pipfile: Add azure modules + dependencies

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8738a8ff3500d743d4d0ea22c35d33c97353a43b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8738a8ff3500d7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Aug 3 09:13:55 2018 +0200 Pipfile: Add azure modules + dependencies We have to upgrade requests from 2.13.0 to 2.19.1 and idna from 2.6 to 2.7 Change-Id: I2d241f5e0fe658ebca2415e112aa784553b252a5 --- Pipfile | 22 ++- Pipfile.lock | 206 ++++++++++++++++++--- omd/packages/python-modules/Makefile | 4 +- omd/packages/python-modules/src/idna-2.6.tar.gz | Bin 135992 -> 0 bytes omd/packages/python-modules/src/idna-2.7.tar.gz | Bin 0 -> 172698 bytes .../python-modules/src/requests-2.13.0.tar.gz | Bin 557508 -> 0 bytes .../python-modules/src/requests-2.19.1.tar.gz | Bin 0 -> 131068 bytes 7 files changed, 199 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8738a8ff35…

6 years, 4 months

6423 FIX Fixed possible XSS in views with some filters

by Lars Michelsen

Module: check_mk Branch: master Commit: 899433f24d299f8a2d92248c97e161d74d717ec6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=899433f24d299f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 12:19:14 2018 +0200 6423 FIX Fixed possible XSS in views with some filters It was possible to inject some specific HTML tags (like the a-tag) into the title of views which could be used to make users click on it to execute some arbitrary javascript code. Change-Id: I875f492607f7ebe2ac1583bdb7cea04e86957617 --- .werks/6423 | 13 +++++++++++++ cmk/gui/htmllib.py | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/.werks/6423 b/.werks/6423 new file mode 100644 index 0000000..5545fe8 --- /dev/null +++ b/.werks/6423 @@ -0,0 +1,13 @@ +Title: Fixed possible XSS in views with some filters +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533231517 + +It was possible to inject some specific HTML tags (like the a-tag) +into the title of views which could be used to make users click on +it to execute some arbitrary javascript code. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 67fd7f1..d52128c 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1900,6 +1900,10 @@ class html(HTMLGenerator): self.open_table(class_="header") self.open_tr() self.open_td(width="*", class_="heading") + # HTML() is needed here to prevent a double escape when we do self._escape_attribute + # here and self.a() escapes the content (with permissive escaping) again. We don't want + # to handle "title" permissive. + title = HTML(self.escaper.escape_attribute(title)) self.a(title, href="#", onfocus="if (this.blur) this.blur();", onclick="this.innerHTML=\'%s\'; document.location.reload();" % _("Reloading...")) self.close_td()

6 years, 4 months

6425 FIX Improved validation of timeperiods before deletion

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aca27368c4672d4e2b0994c1cf5088989397103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aca27368c4672… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 11:50:12 2018 +0200 6425 FIX Improved validation of timeperiods before deletion When deleting a timeperiod via WATO some validations are made that this time period is not used anymore and can be deleted without issues. In previous versions this check was checking this places: <ul> <li>Host & service rules like service / host notification and check periods</li> <li>Notification period in user profiles</li> <li>Timeperiod exclusions in other timeperiods</li> </ul> These missing validations have been added now: <ul> <li>Timeperiod condition in notification and alerting rules</li> <li>Bulk operation in notification rules</li> <li>Timeperiod condition in Event Console rules</li> <li>Host & service rules: time specific parameters</li> </ul> CMK-669 Change-Id: Ic40b3c54bc71c738bf37977dde57be5b76a787ab --- .werks/6425 | 31 ++++++++ cmk/gui/plugins/wato/utils/__init__.py | 10 +-- cmk/gui/wato/__init__.py | 126 +++++++++++++++++++++++++++++++-- 3 files changed, 157 insertions(+), 10 deletions(-) diff --git a/.werks/6425 b/.werks/6425 new file mode 100644 index 0000000..81f5b57 --- /dev/null +++ b/.werks/6425 @@ -0,0 +1,31 @@ +Title: Improved validation of timeperiods before deletion +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533286445 + +When deleting a timeperiod via WATO some validations are made that this +time period is not used anymore and can be deleted without issues. + +In previous versions this check was checking this places: + +<ul> +<li>Host & service rules like service / host notification and check periods</li> +<li>Notification period in user profiles</li> +<li>Timeperiod exclusions in other timeperiods</li> +</ul> + +These missing validations have been added now: + +<ul> +<li>Timeperiod condition in notification and alerting rules</li> +<li>Bulk operation in notification rules</li> +<li>Timeperiod condition in Event Console rules</li> +<li>Host & service rules: time specific parameters</li> +</ul> + +CMK-669 diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 4724cc5..38b55a5 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -679,7 +679,7 @@ class TimeperiodValuespec(ValueSpec): if html.has_var(self.tp_toggle_var): is_active = self._is_switched_on() else: - is_active = self._is_active(value) + is_active = self.is_active(value) # Set the actual used mode html.hidden_field(self.tp_current_mode, "%d" % is_active) @@ -701,7 +701,7 @@ class TimeperiodValuespec(ValueSpec): def value_to_text(self, value): text = "" - if self._is_active(value): + if self.is_active(value): # TODO/Phantasm: highlight currently active timewindow text += self._get_timeperiod_valuespec().value_to_text(value) else: @@ -728,14 +728,14 @@ class TimeperiodValuespec(ValueSpec): def validate_datatype(self, value, varprefix): - if self._is_active(value): + if self.is_active(value): self._get_timeperiod_valuespec().validate_datatype(value, varprefix) else: self._enclosed_valuespec.validate_datatype(value, varprefix) def validate_value(self, value, varprefix): - if self._is_active(value): + if self.is_active(value): self._get_timeperiod_valuespec().validate_value(value, varprefix) else: self._enclosed_valuespec.validate_value(value, varprefix) @@ -777,7 +777,7 @@ class TimeperiodValuespec(ValueSpec): # Checks whether the value itself already uses the tp-mode - def _is_active(self, value): + def is_active(self, value): return isinstance(value, dict) and self.tp_default_value_key in value diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 8cabea3..2be4bcd 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -121,7 +121,9 @@ import cmk.gui.gui_background_job as gui_background_job import cmk.gui.i18n import cmk.gui.pages import cmk.gui.plugin_registry +import cmk.gui.plugins.wato.utils import cmk.gui.plugins.wato.utils.base_modes +import cmk.gui.plugins.wato.mkeventd from cmk.gui.i18n import _u, _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML @@ -8967,15 +8969,30 @@ class ModeTimeperiods(WatoMode): # Check if a timeperiod is currently in use and cannot be deleted - # Returns a list of occurrances. + # Returns a list of two element tuples (title, url) that refer to the single occurrances. + # # Possible usages: # - 1. rules: service/host-notification/check-period # - 2. user accounts (notification period) # - 3. excluded by other timeperiods + # - 4. timeperiod condition in notification and alerting rules + # - 5. bulk operation in notification rules + # - 6. timeperiod condition in EC rules + # - 7. rules: time specific parameters def _find_usages_of_timeperiod(self, tpname): - # Part 1: Rules used_in = [] + used_in += self._find_usages_in_host_and_service_rules(tpname) + used_in += self._find_usages_in_users(tpname) + used_in += self._find_usages_in_other_timeperiods(tpname) + used_in += self._find_usages_in_notification_rules(tpname) + used_in += self._find_usages_in_alert_handler_rules(tpname) + used_in += self._find_usages_in_ec_rules(tpname) + used_in += self._find_usages_in_time_specific_parameters(tpname) + return used_in + + def _find_usages_in_host_and_service_rules(self, tpname): + used_in = [] rulesets = watolib.AllRulesets() rulesets.load() @@ -8989,19 +9006,119 @@ class ModeTimeperiods(WatoMode): watolib.folder_preserving_link([("mode", "edit_ruleset"), ("varname", varname)]))) break - # Part 2: Users + return used_in + + + def _find_usages_in_users(self, tpname): + used_in = [] for userid, user in userdb.load_users().items(): tp = user.get("notification_period") if tp == tpname: used_in.append(("%s: %s" % (_("User"), userid), watolib.folder_preserving_link([("mode", "edit_user"), ("edit", userid)]))) - # Part 3: Other Timeperiods + for index, rule in enumerate(user.get("notification_rules", [])): + used_in += self._find_usages_in_notification_rule(tpname, index, rule, user_id=userid) + return used_in + + + def _find_usages_in_other_timeperiods(self, tpname): + used_in = [] for tpn, tp in watolib.load_timeperiods().items(): if tpname in tp.get("exclude", []): used_in.append(("%s: %s (%s)" % (_("Timeperiod"), tp.get("alias", tpn), _("excluded")), watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("edit", tpn)]))) + return used_in + + + def _find_usages_in_notification_rules(self, tpname): + used_in = [] + for index, rule in enumerate(watolib.load_notification_rules()): + used_in += self._find_usages_in_notification_rule(tpname, index, rule) + return used_in + + + def _find_usages_in_notification_rule(self, tpname, index, rule, user_id=None): + used_in = [] + + if self._used_in_tp_condition(rule, tpname) or self._used_in_bulking(rule, tpname): + url = watolib.folder_preserving_link([("mode", "notification_rule"), ("edit", index), ("user", user_id)]) + if user_id: + title = _("Notification rule of user '%s'") % user_id + else: + title = _("Notification rule") + + used_in.append((title, url)) + + return used_in + + + def _used_in_tp_condition(self, rule, tpname): + return rule.get("match_timeperiod") == tpname + + + def _used_in_bulking(self, rule, tpname): + bulk = rule.get("bulk") + if isinstance(bulk, tuple): + method, params = bulk + return method == "timeperiod" and params["timeperiod"] == tpname + return False + + + def _find_usages_in_alert_handler_rules(self, tpname): + used_in = [] + + if cmk.is_raw_edition(): + return used_in + + try: + import cmk.gui.cee.plugins.wato.alert_handling as alert_handling + except: + alert_handling = None + + for index, rule in enumerate(alert_handling.load_alert_handler_rules()): + if rule.get("match_timeperiod") == tpname: + url = watolib.folder_preserving_link([("mode", "alert_handler_rule"), ("edit", index)]) + used_in.append((_("Alert handler rule"), url)) + return used_in + + + def _find_usages_in_ec_rules(self, tpname): + used_in = [] + rule_packs = cmk.gui.plugins.wato.mkeventd.load_mkeventd_rules() + for rule_pack_index, rule_pack in enumerate(rule_packs): + for rule_index, rule in enumerate(rule_pack["rules"]): + if rule.get("match_timeperiod") == tpname: + url = watolib.folder_preserving_link([("mode", "mkeventd_edit_rule"), + ("edit", rule_index), + ("rule_pack", rule_pack["id"])]) + used_in.append((_("Event console rule"), url)) + return used_in + + + def _find_usages_in_time_specific_parameters(self, tpname): + used_in = [] + rulesets = watolib.AllRulesets() + rulesets.load() + for ruleset in rulesets.get_rulesets().values(): + vs = ruleset.valuespec() + if not isinstance(vs, cmk.gui.plugins.wato.utils.TimeperiodValuespec): + continue + + for rule_folder, rule_index, rule in ruleset.get_rules(): + if not vs.is_active(rule.value): + continue + + for rule_tp_name, _value in rule.value["tp_values"]: + edit_url = watolib.folder_preserving_link([ + ("mode", "edit_rule"), + ("back_mode", "timeperiods"), + ("varname", ruleset.name), + ("rulenr", rule_index), + ("rule_folder", rule_folder.path()), + ]) + used_in.append((_("Timespecific check parameter"), edit_url)) return used_in @@ -14451,7 +14568,6 @@ def create_sample_config(): import cmk.gui.werks as werks werks.acknowledge_all_werks(check_permission=False) - import cmk.gui.plugins.wato.mkeventd cmk.gui.plugins.wato.mkeventd.save_mkeventd_sample_config() userdb.create_cmk_automation_user()

6 years, 4 months

Fix pylint errors from next commit to keep pylint happy

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a8feb42de8612c525a9d572e5250c6b52ea611fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8feb42de8612c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 2 17:45:03 2018 +0200 Fix pylint errors from next commit to keep pylint happy Due to the next commit more pylint warnings will be found. To keep pylint happy all the time the fixes are committed first. Change-Id: I0f0d96031dcf9ab8d2f4fa3b113a7e0744fd0627 --- cmk/gui/plugins/wato/check_mk_configuration.py | 2 +- cmk/gui/sidebar.py | 56 +++++++++++--------------- cmk/gui/userdb.py | 27 ++++++------- 3 files changed, 37 insertions(+), 48 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index e05d9a7..33d5636 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -776,7 +776,7 @@ register_configvar(group, def get_builtin_icons(): import cmk.gui.views as views - return [ (id, id) for id in views.get_multisite_icons().keys() ] + return [ (id, id) for id in views.get_multisite_icons() ] register_configvar(group, "builtin_icon_visibility", diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 2ea840c..7a11e81 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -112,37 +112,6 @@ def load_plugins(force): loaded_with_language = cmk.gui.i18n.get_current_language() -class GenericSnapin(cmk.gui.plugins.sidebar.SidebarSnapin): - """Generic wrapper class. Needed for compatiblity with old dict based snapins""" - - @classmethod - def type_name(cls): - return cls._type_name - - - @classmethod - def title(cls): - return cls._spec["title"] - - - @classmethod - def description(cls): - return cls._spec.get("description", "") - - - def show(self): - return self._spec["render"]() - - - @classmethod - def refresh_regularly(cls): - return cls._spec.get("refresh", False) - - - def styles(self): - return self._spec.get("styles") - - # Pre Check_MK 1.5 the snapins were declared with dictionaries like this: # # sidebar_snapins["about"] = { @@ -157,11 +126,34 @@ class GenericSnapin(cmk.gui.plugins.sidebar.SidebarSnapin): # TODO: Deprecate this one day. def transform_old_dict_based_snapins(): for snapin_id, snapin in sidebar_snapins.items(): + @snapin_registry.register - class LegacySnapin(GenericSnapin): + class LegacySnapin(cmk.gui.plugins.sidebar.SidebarSnapin): _type_name = snapin_id _spec = snapin + @classmethod + def type_name(cls): + return cls._type_name + + @classmethod + def title(cls): + return cls._spec["title"] + + @classmethod + def description(cls): + return cls._spec.get("description", "") + + def show(self): + return self._spec["render"]() + + @classmethod + def refresh_regularly(cls): + return cls._spec.get("refresh", False) + + def styles(self): + return self._spec.get("styles") + # TODO: Deprecate this one day. def transform_old_quicksearch_match_plugins(): diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index d0b6529..ceea0ae 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -501,21 +501,6 @@ class GenericUserAttribute(cmk.gui.plugins.userdb.UserAttribute): self._from_config = from_config - @classmethod - def name(cls): - return cls._name - - - @classmethod - def valuespec(cls): - return cls._valuespec - - - @classmethod - def topic(cls): - return cls._topic - - def from_config(self): return self._from_config @@ -551,6 +536,18 @@ def declare_user_attribute(name, vs, user_editable = True, permission = None, _valuespec = vs _topic = topic if topic else 'personal' + @classmethod + def name(cls): + return cls._name + + @classmethod + def valuespec(cls): + return cls._valuespec + + @classmethod + def topic(cls): + return cls._topic + def __init__(self): super(LegacyUserAttribute, self).__init__( user_editable=user_editable,

6 years, 4 months

Make pylint work for imports from utils.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4507f84ace1e773ee0a53d0609005a5ec3b8952b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4507f84ace1e77… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 2 17:21:39 2018 +0200 Make pylint work for imports from utils.py Due to the way the dependencies were imported in __init__.py files pylint was not able to check imports from utils.py. If e.g. a function in cmk/gui/plugins/config/utils.py was made available via cmk.gui.plugins.config in __init__.py pylint did not detect linting errors when it was imported via cmk.gui.plugins.config. Errors were only detected if the function were imported via cmk.gui.plugins.config.utils. This is fixed now by introducing a load_plugins utility function which is used instead. Change-Id: I0fc6ee290ef2a0f4885ef3d471f0cdab866be481 --- cmk/gui/plugins/config/__init__.py | 8 ++---- cmk/gui/plugins/cron/__init__.py | 10 +++---- cmk/gui/plugins/dashboard/__init__.py | 8 ++---- cmk/gui/plugins/metrics/__init__.py | 8 ++---- cmk/gui/plugins/sidebar/__init__.py | 8 ++---- cmk/gui/plugins/userdb/__init__.py | 7 ++--- cmk/gui/plugins/views/__init__.py | 8 ++---- cmk/gui/plugins/views/icons/__init__.py | 8 ++---- cmk/gui/plugins/views/perfometers/__init__.py | 7 ++--- cmk/gui/plugins/visuals/__init__.py | 8 ++---- cmk/gui/plugins/wato/__init__.py | 8 ++---- cmk/plugin_loader.py | 39 +++++++++++++++++++++++++++ cmk_base/automations/__init__.py | 9 ++----- cmk_base/modes/__init__.py | 8 ++---- 14 files changed, 67 insertions(+), 77 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4507f84ace…

6 years, 4 months

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 663921b5feb49169fd2552583d57966ccacea80a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=663921b5feb491… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 3 10:31:55 2018 +0200 Updated werk Change-Id: Idd2f637fcaf44df2d74f19c9065f1e307937c3c6 --- .werks/6394 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.werks/6394 b/.werks/6394 index 6f9d3a2..cc364d3 100644 --- a/.werks/6394 +++ b/.werks/6394 @@ -1,4 +1,4 @@ -Title: winperf_processor: Changed CPU util default levels from 101, 101 percent to 90, 95 percent +Title: winperf_processor: Changed CPU utilization default levels to 90, 95 percent Level: 1 Component: checks Compatible: incomp @@ -7,4 +7,9 @@ Version: 1.6.0i1 Date: 1533273978 Class: feature +Previously the default levels were set to 101, 101 percent +which is in most cases equivalent to 'no levels'. +These levels are configurable via the WATO rule +{{CPU utilization for simple devices}} and can be +disabled, too.

6 years, 4 months

6394 winperf_processor: Changed CPU util default levels from 101, 101 percent to 90, 95 percent

by Simon Betz

Module: check_mk Branch: master Commit: 578cbc6e8e46365d61cb9b1353ee7984b58774bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=578cbc6e8e4636… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 3 07:27:25 2018 +0200 6394 winperf_processor: Changed CPU util default levels from 101, 101 percent to 90, 95 percent Change-Id: I5e1d53b2ae6081627d8e49e5fa8f4d79f7a110f8 --- .werks/6394 | 10 ++++++++++ checks/winperf | 49 ++++++++++++++++++++++++------------------------ checks/winperf.include | 30 +++++++++++++++++++++++++++++ checks/winperf_processor | 20 +++++++++----------- 4 files changed, 73 insertions(+), 36 deletions(-) diff --git a/.werks/6394 b/.werks/6394 new file mode 100644 index 0000000..6f9d3a2 --- /dev/null +++ b/.werks/6394 @@ -0,0 +1,10 @@ +Title: winperf_processor: Changed CPU util default levels from 101, 101 percent to 90, 95 percent +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1533273978 +Class: feature + + diff --git a/checks/winperf b/checks/winperf index 585263a..c1756d7 100644 --- a/checks/winperf +++ b/checks/winperf @@ -29,22 +29,18 @@ def inventory_win_cpuusage(info): for line in info: try: if line[0] == '238:6': - return [(None, None, "winperf_cpu_default_levels")] + return [(None, {})] except: pass -winperf_cpu_default_levels = (90, 95) -# params: levels for warn / crit in percentage def check_win_cpuusage(item, params, info): - # get parameters. Be nice to older installations that still use 'None' - # as parameters - if params is None: - params = winperf_cpu_default_levels # for legacy reasons - elif type(params) == tuple: + if isinstance(params, tuple): warn, crit = params - else: + elif isinstance(params, dict): warn, crit = params['levels'] + else: # legacy: old params may be None + warn, crit = None, None for line in info: if line[0] == '238:6': @@ -61,28 +57,30 @@ def check_win_cpuusage(item, params, info): overall_perc += used_perc used_perc = overall_perc / num_cpus - if used_perc < 0: used_perc = 0 elif used_perc > 100: used_perc = 100 - perfdata = [ ("cpuusage", "%.2f" % used_perc, '', '', 0, 100) ] + if num_cpus == 1: num_txt = "" else: num_txt = " / %d CPUs" % num_cpus infotext = "%d%% used%s" % (int(used_perc), num_txt) - - if used_perc >= crit: - return (2, infotext, perfdata) - elif used_perc >= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) - + state = 0 + if crit is not None and used_perc >= crit: + state = 2 + elif warn is not None and used_perc >= warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s)" % ( + get_percent_human_readable(warn), + get_percent_human_readable(crit)) + return state, infotext, [("cpuusage", "%.2f" % used_perc, warn, crit, 0, 100)] return (3, "counter for cpu (238:6) not found") + def inventory_win_diskstat(info): for line in info: try: @@ -123,15 +121,16 @@ def check_win_diskstat(item, params, info): (read_per_sec / 1048576, write_per_sec / 1048576), perfdata) -check_config_variables.append("winperf_cpu_default_levels") - check_info["winperf.cpuusage"] = { - 'check_function': check_win_cpuusage, - 'inventory_function': inventory_win_cpuusage, - 'service_description': 'CPU Usage', - 'has_perfdata': True, + 'check_function' : check_win_cpuusage, + 'inventory_function' : inventory_win_cpuusage, + 'service_description' : 'CPU Usage', + 'has_perfdata' : True, + 'default_levels_variable' : 'winperf_cpu_default_levels', + 'includes' : ["winperf.include"], } + check_info["winperf.diskstat"] = { 'check_function': check_win_diskstat, 'inventory_function': inventory_win_diskstat, diff --git a/checks/winperf.include b/checks/winperf.include new file mode 100644 index 0000000..b5ee700 --- /dev/null +++ b/checks/winperf.include @@ -0,0 +1,30 @@ +#!/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. + + +factory_settings['winperf_cpu_default_levels'] = { + 'levels': (90, 95), +} diff --git a/checks/winperf_processor b/checks/winperf_processor index 3cffe38..2c92a2f 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -25,8 +25,6 @@ # Boston, MA 02110-1301 USA. -winperf_cpu_default_levels = { "levels": ( 101.0, 101.0 ) } - def inventory_winperf_util(info): if len(info) <= 1: return None @@ -34,12 +32,11 @@ def inventory_winperf_util(info): for line in info[1:]: try: if line[0] == '-232': - return [(None, "winperf_cpu_default_levels")] + return [(None, {})] except IndexError: pass -# params: levels for warn / crit in percentage def check_winperf_util(_no_item, params, info): if not info: return @@ -133,11 +130,12 @@ def check_winperf_util(_no_item, params, info): check_info["winperf_processor.util"] = { - 'check_function': check_winperf_util, - 'inventory_function': inventory_winperf_util, - 'service_description': 'CPU utilization', - 'has_perfdata': True, - 'handle_real_time_checks': True, - 'group': 'cpu_utilization_os', - 'includes': [ "cpu_util.include" ], + 'check_function' : check_winperf_util, + 'inventory_function' : inventory_winperf_util, + 'service_description' : 'CPU utilization', + 'has_perfdata' : True, + 'handle_real_time_checks' : True, + 'group' : 'cpu_utilization_os', + 'default_levels_variable' : 'winperf_cpu_default_levels', + 'includes' : ["cpu_util.include", "winperf.include"], }

6 years, 4 months

6421 FIX Fixed interpretation of script tags when displaying werk texts

by Lars Michelsen

Module: check_mk Branch: master Commit: b6af3a7547f6991e9fe2cf92c0e9749e145f8bec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6af3a7547f699… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 09:34:40 2018 +0200 6421 FIX Fixed interpretation of script tags when displaying werk texts When werks are displayed in the GUI using the "Release notes" page and a werk contained example "script" HTML tags, these tags were interpreted by the browser and the containing scripts were executed. Change-Id: I3ab965762920b6c78534a112fe7a169b04548405 --- .werks/6421 | 14 ++++++++++++++ cmk/gui/werks.py | 2 ++ 2 files changed, 16 insertions(+) diff --git a/.werks/6421 b/.werks/6421 new file mode 100644 index 0000000..a2722ec --- /dev/null +++ b/.werks/6421 @@ -0,0 +1,14 @@ +Title: Fixed interpretation of script tags when displaying werk texts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533220249 + +When werks are displayed in the GUI using the "Release notes" page and +a werk contained example "script" HTML tags, these tags were interpreted +by the browser and the containing scripts were executed in the context +of the browser. diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index 1a639cc..846e8af 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -517,6 +517,8 @@ def render_werk_description(werk): if in_list: html_code += "</ul>" + html_code = html_code.replace("<script>", "<script>").replace("</script>", "</script>") + html_code += "</p>" return html_code

6 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018