Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6226 Allow to match against the monitoring site in rules

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9ef0193af36dd1e0e0b8a6a5fc5e985b995851f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ef0193af36dd1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 10 13:09:37 2018 +0200 6226 Allow to match against the monitoring site in rules This allows to apply rules only on specific sites. This is required to make the feature expect regular messages work in a distibuted environment with config replication. Example: If you have three centrally configured event consoles, and you want a device to regularily report to one of them, you previously had no way to configure that only the one site reports missing messages. Instead, all sites the device doesn't send messages to would repeatedly open events. This limitation can now be worked around by specifying to which site expect rules should apply. Change-Id: Ie9557ee96d3e62169823593c3f41a70f03a853c9 --- .werks/6226 | 22 ++++++++++++++++++++++ cmk/ec/main.py | 8 ++++++++ web/plugins/wato/mkeventd.py | 16 +++++++++++++--- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/.werks/6226 b/.werks/6226 new file mode 100644 index 0000000..5bc2da3 --- /dev/null +++ b/.werks/6226 @@ -0,0 +1,22 @@ +Title: Allow to match against the monitoring site in rules +Level: 2 +Component: ec +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531314180 + +This allows to apply rules only on specific sites. Restricting +rules to sites can yield performance benefits in environments with +many sites. Beyond that, this is required to make the feature expect +regular messages work in a distributed environment with +config replication. + +Example: If you have three centrally configured event consoles, +and you want a device to regularily report to one of them, you +previously had no way to configure that only the one site reports +missing messages. Instead, all sites the device doesn't send messages +to would repeatedly open events. This limitation can now be +worked around by specifying to which site expect rules should apply. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 01a34ca..93a0386 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1199,6 +1199,10 @@ class EventServer(ECServerThread): # in that case. for rule in self._rules: if "expect" in rule: + + if not self.event_rule_matches_site(rule, event=None): + continue + # Interval is either a number of seconds, or pair of a number of seconds # (e.g. 86400, meaning one day) and a timezone offset relative to UTC in hours. interval = rule["expect"]["interval"] @@ -1659,6 +1663,7 @@ class EventServer(ECServerThread): def event_rule_matches_generic(self, rule, event): generic_match_functions = [ + self.event_rule_matches_site, self.event_rule_matches_host, self.event_rule_matches_ip, self.event_rule_matches_facility, @@ -1671,6 +1676,9 @@ class EventServer(ECServerThread): return False return True + def event_rule_matches_site(self, rule, event): + return "match_site" not in rule or cmk.omd_site() in rule["match_site"] + def event_rule_matches_host(self, rule, event): if match(rule.get("match_host"), event["host"], complete=True) is False: if self._config["debug_rules"]: diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 8b5b2be..9633c9c 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -576,7 +576,10 @@ def vs_mkeventd_rule(customer=None): "The options week, two days and day refer to " "periodic intervals aligned at 00:00:00 on the 1st of January 1970. " "You can specify a relative offset in hours in order to re-align this " - "to any other point of time."), + "to any other point of time. In a distributed environment, make " + "sure to specify which site should expect the messages in the match " + "criteria above, else all sites with config replication will warn if " + "messages fail to arrive."), optional_keys = False, columns = 2, elements = [ @@ -704,6 +707,13 @@ def vs_mkeventd_rule(customer=None): case_sensitive = False, ) ), + ( "match_site", + DualListChoice( + title = _("Match site"), + help = _("Apply this rule only on the following sites"), + choices = config.get_event_console_site_choices(), + ) + ), ( "match_host", RegExpUnicode( title = _("Match host"), @@ -903,12 +913,12 @@ def vs_mkeventd_rule(customer=None): title = _("Rule Properties"), elements = elements, optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "match_host", "match_ipaddress", "match_application", "match_timeperiod", + "match_facility", "match_sl", "match_host", "match_site", "match_ipaddress", "match_application", "match_timeperiod", "set_text", "set_host", "set_application", "set_comment", "set_contact", "cancel_priority", "cancel_application", "match_ok", "contact_groups", ], headers = [ ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled", "customer" ] ), - ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", + ( _("Matching Criteria"), [ "match", "match_site", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", "match_sl", "match_ok", "cancel_priority", "cancel_application", "match_timeperiod", "invert_matching" ]), ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "actions_in_downtime", "cancel_actions", "cancel_action_phases", "drop", "autodelete", "event_limit" ]),

6 years, 2 months

Fixed a few misplaced-comparison-constant warnings.

by Sven Panne

Module: check_mk Branch: master Commit: b6ac001baf182b145ab8d0dd634af36444763bd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6ac001baf182b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 11 16:12:01 2018 +0200 Fixed a few misplaced-comparison-constant warnings. Unless you're Yoda, putting the constant last feels more natural... Change-Id: I9c1c504e16ea6e82f57982a05f1a07b4284a58dd --- checks/esx_vsphere_vm | 2 +- checks/saprouter_cert | 6 +++--- cmk/man_pages.py | 2 +- cmk_base/localize.py | 2 +- omd/packages/omd/omd | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 5af5707..6d4a1ee 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -412,7 +412,7 @@ def check_esx_vsphere_vm_snapshots(_no_item, params, info): elif oldest_time == snapshot[1]: oldest_snapshot = snapshot - if "poweredOn" == snapshot[2]: + if snapshot[2] == "poweredOn": powered_on_snapshot = snapshot yield 0, "Powered On: %s" % (powered_on_snapshot and powered_on_snapshot[3] or "None") diff --git a/checks/saprouter_cert b/checks/saprouter_cert index f2dac8a..60358b1 100644 --- a/checks/saprouter_cert +++ b/checks/saprouter_cert @@ -59,7 +59,7 @@ def parse_saprouter_cert(info): parsed = {} validity = None for line in info: - if "Validity" == line[0]: + if line[0] == "Validity": validity = "valid" parsed.setdefault(validity, {}) @@ -69,10 +69,10 @@ def parse_saprouter_cert(info): elif validity and ("NotAfter:" in line or "NotAfter" in line): parsed[validity].setdefault("not_after", parse_date(line[-5:-1])) - elif "sso for user" == " ".join(line[:3]).lower(): + elif " ".join(line[:3]).lower() == "sso for user": parsed.setdefault("sso_user", line[-1].replace('"', "")) - elif "with pse file" == " ".join(line[:3]).lower(): + elif " ".join(line[:3]).lower() == "with pse file": parsed.setdefault("pse_file", line[-1].replace('"', "")) elif not validity: diff --git a/cmk/man_pages.py b/cmk/man_pages.py index 2d75424..412b195 100644 --- a/cmk/man_pages.py +++ b/cmk/man_pages.py @@ -413,7 +413,7 @@ def _run_dialog(args): p = subprocess.Popen(["dialog", "--shadow"] + args, env = env, stderr = subprocess.PIPE) response = p.stderr.read() - return 0 == os.waitpid(p.pid, 0)[1], response + return os.waitpid(p.pid, 0)[1] == 0, response def _create_fallback_man_page(name, path, error_message): diff --git a/cmk_base/localize.py b/cmk_base/localize.py index 64a5c1a..0f61cb7 100644 --- a/cmk_base/localize.py +++ b/cmk_base/localize.py @@ -232,7 +232,7 @@ def localize_edit(lang): if not os.path.exists(editor): editor = 'vi' - if 0 == subprocess.call([editor, po_file]): + if subprocess.call([editor, po_file]) == 0: localize_compile(lang) else: logger.error("Aborted.") diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index e98b329..e2319bf 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -214,7 +214,7 @@ def patch_has_merge(): # check wether our version of patch supports the option '--merge' global patch_supports_merge if patch_supports_merge == None: - patch_supports_merge = (0 == os.system("true | PATH=/omd/versions/default/bin:$PATH patch --merge >/dev/null 2>&1")) + patch_supports_merge = (os.system("true | PATH=/omd/versions/default/bin:$PATH patch --merge >/dev/null 2>&1") == 0) if not patch_supports_merge: sys.stdout.write("Your version of patch does not support --merge.\n") return patch_supports_merge @@ -227,7 +227,7 @@ def run_dialog(args): } p = Popen(["dialog", "--shadow"] + args, env = env, stderr = PIPE) response = p.stderr.read() - return 0 == os.waitpid(p.pid, 0)[1], response + return os.waitpid(p.pid, 0)[1] == 0, response def dialog_menu(title, text, choices, defvalue, oktext, canceltext): @@ -420,7 +420,7 @@ def groupadd(groupname, gid = None): cmd += "-g %d " % int(gid) cmd += groupname - if 0 != os.system(cmd): + if os.system(cmd) != 0: bail_out("Cannot create group for site user.") def useradd(sitename, uid = None, gid = None): @@ -429,8 +429,8 @@ def useradd(sitename, uid = None, gid = None): useradd_options = g_info["USERADD_OPTIONS"] if uid != None: useradd_options += " -u %d" % int(uid) - if 0 != os.system("useradd %s -r -d '%s' -c 'OMD site %s' -g %s -G omd %s -s /bin/bash" % \ - (useradd_options, site_dir(sitename), sitename, sitename, sitename)): + if os.system("useradd %s -r -d '%s' -c 'OMD site %s' -g %s -G omd %s -s /bin/bash" % \ + (useradd_options, site_dir(sitename), sitename, sitename, sitename)) != 0: groupdel(sitename) bail_out("Error creating site user.") @@ -1163,7 +1163,7 @@ def merge_update_file(relpath, old_version, new_version): elif choice == "try again": os.rename(user_path + ".orig", user_path) os.system("%s '%s'" % (editor, user_path)) - if 0 == try_merge(): + if try_merge() == 0: sys.stdout.write("Successfully merged changes from %s -> %s into %s\n" % (old_version, new_version, fn)) return @@ -1629,7 +1629,7 @@ def unmount_tmpfs(sitename, output = True, kill = False): sys.stdout.write("Unmounting temporary filesystem...") for t in range(0, 10): - if 0 == os.system("umount '%s'" % tmp_dir(sitename)): + if os.system("umount '%s'" % tmp_dir(sitename)) == 0: if output: ok() return True @@ -3142,7 +3142,7 @@ def print_diff(rel_path, source_path, target_path, source_version, source_perms) arrow = tty_magenta + '->' + tty_normal if 'c' in status: source_content = instantiate_skel(source_file) - if 0 == os.system("which colordiff > /dev/null 2>&1"): + if os.system("which colordiff > /dev/null 2>&1") == 0: diff = "colordiff" else: diff = "diff"

6 years, 2 months

Fixed a few consider-merging-isinstance warnings.

by Sven Panne

Module: check_mk Branch: master Commit: d1b117f2c1ea076a8ca98e944cb816041b280f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1b117f2c1ea07… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 11 15:19:22 2018 +0200 Fixed a few consider-merging-isinstance warnings. The unbelievable power of the distributive law in action... Change-Id: I9bf7b9d59d2015e841b88630880dd3c305995f26 --- cmk/structured_data.py | 2 +- cmk_base/config.py | 2 +- cmk_base/data_sources/abstract.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index b6cfde5..6fb678a 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -112,7 +112,7 @@ class StructuredDataTree(object): def _validate_tree_path(self, tree_path): if not tree_path: raise MKGeneralException("Empty tree path or zero.") - if not (isinstance(tree_path, str) or isinstance(tree_path, unicode)): + if not (isinstance(tree_path, (str, unicode))): raise MKGeneralException("Wrong tree path format. Must be of type string.") if not (tree_path.endswith(":") or tree_path.endswith(".")): raise MKGeneralException("No valid tree path.") diff --git a/cmk_base/config.py b/cmk_base/config.py index a3f3b37..e14688f 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -67,7 +67,7 @@ def get_default_config(): for key in get_variable_names(): value = getattr(default_config, key) - if isinstance(value, dict) or isinstance(value, list): + if isinstance(value, (dict, list)): value = copy.deepcopy(value) cfg[key] = value diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index cbc1f0a..c63551b 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -415,9 +415,7 @@ class DataSource(object): if isinstance(self._exception, MKEmptyAgentData): status = self._exit_code_spec.get("empty_output", 2) - elif isinstance(self._exception, MKAgentError) \ - or isinstance(self._exception, MKIPAddressLookupError) \ - or isinstance(self._exception, MKSNMPError): + elif isinstance(self._exception, (MKAgentError, MKIPAddressLookupError, MKSNMPError)): status = self._exit_code_spec.get("connection", 2) elif isinstance(self._exception, MKTimeout):

6 years, 2 months

Fix OpenHardwareMonitorCLI.exe binary executable

by Jukka Aro

Module: check_mk Branch: master Commit: c7992751fba8cada2268288405efbe412fc1342b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7992751fba8ca… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jul 11 15:26:41 2018 +0200 Fix OpenHardwareMonitorCLI.exe binary executable Change-Id: If3e7dc23d1abd81647e8100855c48d942171b8d6 --- .../Bin/Release/OpenHardwareMonitorCLI.exe | Bin 11264 -> 11264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe index efffc2c..ea3de49 100755 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe differ

6 years, 2 months

kernel: don't change info argument

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5575b1b69bf42e8100e13ba7b61f8f5fa994ac98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5575b1b69bf42e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jul 6 15:39:46 2018 +0200 kernel: don't change info argument Change-Id: Icdecaa35f15e224a303bd7e0f1a1248b3ba45490 --- checks/kernel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/kernel b/checks/kernel index f4f5e9c..4a32e54 100644 --- a/checks/kernel +++ b/checks/kernel @@ -114,10 +114,10 @@ def inventory_cpu_utilization(info): def transform_cpu_info(element): - if len(element) < 8: - element += ['0', '0', '0', '0'] # needed for Linux 2.4 - - return [element[0]] + [int(x) for x in element[1:]] + transele = [element[0]] + map(int, element[1:]) + if len(transele) < 8: + transele += [0] * 4 # needed for Linux 2.4 + return transele # Columns of cpu usage /proc/stat: # - cpuX: number of CPU or only 'cpu' for aggregation

6 years, 2 months

Use default mechanism

by Moritz Kiemer

Module: check_mk Branch: master Commit: 037250280794ff85ba05ea3233c3389eccc11632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=037250280794ff… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 5 13:31:39 2018 +0200 Use default mechanism The default value to get_item_state should be a valid item state tuple, or simply None. Change-Id: Icf0f6c8054870117a1f74f429010c8e263ac93e0 --- checks/esx_vsphere_counters | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index c5743b6..c854a92 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -319,8 +319,9 @@ def convert_esx_counters_if(parsed): if ctr_name.startswith("bytes"): ctr_value *= 1024 countername = "vmnic." + name + "." + ctr_name - last_time, last_value = get_item_state(countername, (None, None)) - if last_time or last_value: + last_state = get_item_state(countername) + if last_state: + last_time, last_value = last_state new_value = last_value + ((this_time - last_time) * ctr_value) else: last_time = this_time - 60

6 years, 2 months

Some minor perfdata fixes for more rigorous testing

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5329dc3a9b0f39a313e646a8519e6344c42ec111 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5329dc3a9b0f39… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 5 07:57:29 2018 +0200 Some minor perfdata fixes for more rigorous testing wmi.include: Fix default values for perfdata skype: Avoid casting perfvalue to list Change-Id: I5fa56fba3230d747012f9ed3d6bd1bef6c2b2df5 --- checks/skype | 9 +++------ checks/wmi.include | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/checks/skype b/checks/skype index bd08607..b7fc9c2 100644 --- a/checks/skype +++ b/checks/skype @@ -557,16 +557,13 @@ def check_skype_mobile(item, params, parsed): label=" active", perfvar="ucwa_active_sessions") if status != 3: - if perfdata: - perfdata = list(perfdata[0]) - perfdata[0] += "_" + name.lower() - perfdata = [perfdata] - + perfdata = [('%s_%s' % (p[0], name.lower()),) + p[1:] for p in perfdata] yield status, "%s: %s" % (name, infotext), perfdata + else: # add a perfcounter with 0 sessions for all missing devices so we can # still properly build a combined graph for active sessions - yield 0, None, [("active_sessions_%s" % name.lower(), 0)] + yield 0, None, [("active_sessions_%s" % name.lower(), 0, None, None, None, None)] yield wmi_yield_raw_counter(parsed["LS:WEB - Throttling and Authentication"], item, "WEB - Total Requests In Processing", diff --git a/checks/wmi.include b/checks/wmi.include index 16036bf..00f35e6 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -298,12 +298,12 @@ def get_wmi_time(table, row): return float(timestamp) / float(frequency) -def wmi_make_perfvar(varname, value, perfscale, levels, min_value="", max_value=""): +def wmi_make_perfvar(varname, value, perfscale, levels, min_value=None, max_value=None): value = value * perfscale if levels is not None: - upper_levels = levels.get('upper', ("", "")) + upper_levels = levels.get('upper', (None, None)) else: - upper_levels = ("", "") + upper_levels = (None, None) res = (varname, value, upper_levels[0], upper_levels[1], min_value, max_value) return res

6 years, 2 months

Make sure PerfValue is float or int (not string)

by Moritz Kiemer

Module: check_mk Branch: master Commit: b5f271c4834d4bab2546e157e7433710ee890733 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5f271c4834d4b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jul 5 14:18:39 2018 +0200 Make sure PerfValue is float or int (not string) Change-Id: Id01a98b34159f6eb3ec7848cfd23930d220d6417 --- checks/arcserve_backup | 2 +- checks/drbd | 2 +- checks/esx_vsphere_datastores | 4 ++-- checks/fileinfo | 2 +- checks/lparstat_aix | 15 ++++++++------- checks/mem.include | 16 ++++++++-------- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/checks/arcserve_backup b/checks/arcserve_backup index 3236e0c..8b8b4d9 100644 --- a/checks/arcserve_backup +++ b/checks/arcserve_backup @@ -141,7 +141,7 @@ def check_arcserve_backup(item, _no_params, info): message += "Size: %s" % get_bytes_human_readable(parsed[item]["size"]) else: size=0 - perfdata.append(("size", str(size) + "Bytes")) + perfdata.append(("size", size)) # result if message != "": diff --git a/checks/drbd b/checks/drbd index 16ebfe3..d3376c5 100644 --- a/checks/drbd +++ b/checks/drbd @@ -410,7 +410,7 @@ def check_drbd_stats(item, params, info): else: parsed[key] = '0' # perfdata must always have same number of entries if parsed[key].isdigit(): - perfdata.append(('%s' % label.replace(" ", "_"), parsed[key])) + perfdata.append(('%s' % label.replace(" ", "_"), int(parsed[key]))) return (0, output.rstrip(', '), perfdata) return (3, "Undefined state") diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index bbfb9bf..f730dd8 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -104,8 +104,8 @@ def check_esx_vsphere_datastores(item, params, info): prov_warn_mb = None prov_crit_mb = None perfdata += [ - ('uncommitted', str(uncommitted_mb) + 'MB'), - ('overprovisioned', str(prov_mb) + 'MB', prov_warn_mb, prov_crit_mb), + ('uncommitted', uncommitted_mb), + ('overprovisioned', prov_mb, prov_warn_mb, prov_crit_mb), ] if not store["accessible"]: diff --git a/checks/fileinfo b/checks/fileinfo index fe991f0..6b28477 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -331,7 +331,7 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): for what_title, what, val, verbfunc in check_definition: infos.append("%s: %s" % (what_title, verbfunc(val))) if type(val) in [long, int]: # because strings go into infos but not into perfdata - warn, crit = "", "" + warn, crit = None, None for how, comp, cfunc in [ ("min", "<", lambda a, b: a < b), ("max", ">", lambda a, b: a > b), diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 9fd7a8d..4ae565a 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -81,12 +81,12 @@ def check_lparstat(item, params, info): else: # The new agent provides three lines, the title line, spacer line and the values cols = [ c.replace('%', '') for c in info[-3] ] - uom = [ '%' in c and '%' or '' for c in info[-3] ] + uom = [ '%' * ('%' in c) for c in info[-3] ] values = info[-1] - perfdata = [ (cols[i], val+uom[i]) for i, val in enumerate(values) ] - output = ', '.join([ cols[i].title()+': '+val+uom[i] for i, val in enumerate(values) ]) - + perfdata = zip(cols, map(float, values)) + output = ', '.join("%s: %s%s" % (c.title(), v, u) + for c, v, u in zip(cols, values, uom)) return 0, output, perfdata check_info["lparstat_aix"] = { @@ -110,9 +110,10 @@ def check_lparstat_aix_cpu(_no_item, params, info): line = info[-1] user, system, wait, idle = map(float, line[:4]) perfdata = [ - ( "user", "%.3f" % user ), - ( "system", "%.3f" % system ), - ( "wait", "%.3f" % wait ) ] + ("user", user), + ("system", system), + ("wait", wait), + ] util = user + system + wait diff --git a/checks/mem.include b/checks/mem.include index 051020a..97777b9 100644 --- a/checks/mem.include +++ b/checks/mem.include @@ -118,13 +118,13 @@ def check_memory(params, meminfo): # Prepare performance data perfdata = [ - ('ramused', str( (memused_kb - caches_kb) / 1024) + 'MB', '', '', 0, totalmem_mb), - ('swapused', str(swapused_kb / 1024) + 'MB', '', '', 0, meminfo['SwapTotal']/1024), - ('memused', str(totalused_mb) + 'MB', warn_mb, crit_mb, 0, totalvirt_mb), + ('ramused', (memused_kb - caches_kb) / 1024, None, None, 0, totalmem_mb), + ('swapused', swapused_kb / 1024, None, None, 0, meminfo['SwapTotal']/1024), + ('memused', totalused_mb, warn_mb, crit_mb, 0, totalvirt_mb), ] if average_min: - perfdata.append(('memusedavg', str(totalused_mb_avg)+'MB')) + perfdata.append(('memusedavg', totalused_mb_avg)) # Check levels state = 0 @@ -153,10 +153,10 @@ def check_memory(params, meminfo): shared_mb = int(meminfo.get('Shmem', 0)) / 1024 perfdata += [ - ('mapped', str(mapped_mb) + 'MB'), - ('committed_as', str(committed_as_mb) + 'MB'), - ('pagetables', str(pagetables_mb) + 'MB'), - ('shared', str(shared_mb) + 'MB'), + ('mapped', mapped_mb), + ('committed_as', committed_as_mb), + ('pagetables', pagetables_mb), + ('shared', shared_mb), ] infotext += ", %.1f mapped, %.1f committed, %.1f shared" % \ (mapped_mb / 1024.0, committed_as_mb / 1024.0, shared_mb / 1024.0)

6 years, 2 months

Use pipe separator in all lines of mssql_counters sections

by Simon Betz

Module: check_mk Branch: master Commit: c15e7b859b26570d420b12b3bd388faa821e86a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c15e7b859b2657… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 11 14:20:45 2018 +0200 Use pipe separator in all lines of mssql_counters sections Change-Id: I3b82fc6884aff449d76475cbcfa5cf69565d999a --- agents/windows/plugins/mssql.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index c4f2c5a..ac9c5bc 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -273,7 +273,7 @@ For Each instance_id In instances.Keys: Do ' Continue trick ' Get counter data for the whole instance addOutput(sections("counters")) RS.Open "SELECT GETUTCDATE() as utc_date", CONN - addOutput( "None utc_time None " & RS("utc_date") ) + addOutput("None|utc_time|None|" & RS("utc_date")) RS.Close RS.Open "SELECT counter_name, object_name, instance_name, cntr_value " & _

6 years, 2 months

6342 FIX Fixed degraded SNMP check performance when using SNMP sub checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c825e2d5d6cc6eb74e7384120c22090bc98bf1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c825e2d5d6cc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 10 17:17:25 2018 +0200 6342 FIX Fixed degraded SNMP check performance when using SNMP sub checks When checking a host with SNMP sub checks which normally all get the same data, the data was fetched multiple times. One time for each subcheck used for monitoring a host. This resulted in significantly increased check times and time outs. All 1.5 versions are affected by this issue. We experienced this issue with a CMCiii device which is normally monitored by a set of sub checks (cmciii.*). Change-Id: I83494499ac31fa354b463388068e6551aea36a54 --- .werks/6342 | 18 ++++++++++++++++++ cmk_base/data_sources/snmp.py | 5 +++++ 2 files changed, 23 insertions(+) diff --git a/.werks/6342 b/.werks/6342 new file mode 100644 index 0000000..82c4ec3 --- /dev/null +++ b/.werks/6342 @@ -0,0 +1,18 @@ +Title: Fixed degraded SNMP check performance when using SNMP sub checks +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531235656 + +When checking a host with SNMP sub checks which normally all get the same data, the +data was fetched multiple times. One time for each subcheck used for monitoring a host. + +This resulted in significantly increased check times and time outs. All 1.5 versions +are affected by this issue. + +We experienced this issue with a CMCiii device which is normally monitored by a set of +sub checks (cmciii.*). diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index dbff296..23bcc0c 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -219,6 +219,11 @@ class SNMPDataSource(DataSource): self._logger.debug("%s: Skip fetching data (persisted info exists)" % (check_plugin_name)) continue + # Prevent duplicate data fetching of identical section in case of SNMP sub checks + if section_name in info: + self._logger.debug("%s: Skip fetching data (section already fetched)" % (check_plugin_name)) + continue + self._logger.debug("%s: Fetching data" % (check_plugin_name)) # oid_info can now be a list: Each element of that list is interpreted as one real oid_info

6 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018