Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3354 FIX Added missing option to exclude IP addresses by regex

by Lars Michelsen

Module: check_mk Branch: master Commit: 9958411596970016e79b98f69866c0632a1f7c14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99584115969700… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 17:11:01 2016 +0200 3354 FIX Added missing option to exclude IP addresses by regex --- .werks/3354 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 24 ++++++++++++++++++++++++ web/plugins/wato/builtin_attributes.py | 6 ++++++ 4 files changed, 41 insertions(+) diff --git a/.werks/3354 b/.werks/3354 new file mode 100644 index 0000000..cca92fe --- /dev/null +++ b/.werks/3354 @@ -0,0 +1,10 @@ +Title: Added missing option to exclude IP addresses by regex +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459437039 + + diff --git a/ChangeLog b/ChangeLog index 45b87ba..ecdcba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 3351 FIX: Network scan: Fixed number in hosts not being updated during network scan * 3352 FIX: Network scan: Added hostname translation to translate detected DNS names of scanned hosts * 3353 FIX: Displaying disabled/offline host state in WATO host list now + * 3354 FIX: Added missing option to exclude IP addresses by regex Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ebc075a..1c443e5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15234,6 +15234,9 @@ def ip_addresses_to_scan(folder): # FIXME/TODO: Shouldn't this filtering be done on the central site? to_scan.difference_update(known_ip_addresses()) + # And now apply the IP regex patterns to exclude even more addresses + to_scan.difference_update(excludes_by_regexes(to_scan, exclude_specs)) + return to_scan @@ -15263,6 +15266,27 @@ def ip_addresses_of_ranges(ip_ranges): return addresses +def excludes_by_regexes(addresses, exclude_specs): + patterns = [] + for ty, spec in exclude_specs: + if ty == "ip_regex_list": + for p in spec: + patterns.append(re.compile(p)) + + if not patterns: + return addresses + + excludes = [] + for address in addresses: + for p in patterns: + if p.match(address): + excludes.append(address) + break # one match is enough, exclude this. + + return excludes + + + FULL_IPV4 = (2 ** 32) - 1 diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index b6d9f87..c838488 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -226,6 +226,12 @@ class NetworkScanAttribute(ValueSpecAttribute): valuespec = IPv4Address(), orientation = "horizontal", )), + ("ip_regex_list", _("List of patterns to exclude"), ListOfStrings( + valuespec = RegExp(), + orientation = "horizontal", + help = _("A list of regular expressions which are matched against the found " + "IP addresses to exclude them. The matched addresses are excluded."), + )), ] )

8 years, 3 months

3015 FIX Dump host (cmk -D): fixed exception with service descriptions containing umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: 9a45dace27e9dc8de5dbbf77d1dfd9a6775626cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a45dace27e9dc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 31 16:43:43 2016 +0200 3015 FIX Dump host (cmk -D): fixed exception with service descriptions containing umlauts --- .werks/3015 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3015 b/.werks/3015 new file mode 100644 index 0000000..22603ba --- /dev/null +++ b/.werks/3015 @@ -0,0 +1,9 @@ +Title: Dump host (cmk -D): fixed exception with service descriptions containing umlauts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459435354 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4490af2..45b87ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 3307 FIX: dell_poweredge_netdev: does not discover disconnected network devices any more * 3309 FIX: zpool_status: fixed wrong error handling... * 3014 FIX: windows_tasks.ps1: fixed incorrect text encoding for tasks with umlauts + * 3015 FIX: Dump host (cmk -D): fixed exception with service descriptions containing umlauts Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk.py b/modules/check_mk.py index 6670e68..012c22f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3823,7 +3823,7 @@ def dump_host(hostname): def print_table(headers, colors, rows, indent = ""): lengths = [ len(h) for h in headers ] for row in rows: - lengths = [ max(len(str(c)), l) for c, l in zip(row, lengths) ] + lengths = [ max(len(str(make_utf8(c))), l) for c, l in zip(row, lengths) ] sumlen = sum(lengths) + len(headers) format = indent sep = ""

8 years, 3 months

3014 FIX windows_tasks.ps1: fixed incorrect text encoding for tasks with umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: 80595489c887187c0e15b6411ff5e5902f13e7ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80595489c88718… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 31 16:38:51 2016 +0200 3014 FIX windows_tasks.ps1: fixed incorrect text encoding for tasks with umlauts --- .werks/3014 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/windows_tasks.ps1 | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3014 b/.werks/3014 new file mode 100644 index 0000000..943acb4 --- /dev/null +++ b/.werks/3014 @@ -0,0 +1,9 @@ +Title: windows_tasks.ps1: fixed incorrect text encoding for tasks with umlauts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1459435089 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7ac1877..4490af2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 3306 FIX: docsis_channels_upstream: fixed missing channel handling * 3307 FIX: dell_poweredge_netdev: does not discover disconnected network devices any more * 3309 FIX: zpool_status: fixed wrong error handling... + * 3014 FIX: windows_tasks.ps1: fixed incorrect text encoding for tasks with umlauts Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/plugins/windows_tasks.ps1 b/agents/windows/plugins/windows_tasks.ps1 index c552f66..f77c1a1 100644 --- a/agents/windows/plugins/windows_tasks.ps1 +++ b/agents/windows/plugins/windows_tasks.ps1 @@ -2,7 +2,7 @@ # Monitor Windows Tasks # -Write-Host "<<<windows_tasks:sep(58)>>>" +Write-Host "<<<windows_tasks:sep(58):encoding(cp437)>>>" $lang = Get-UICulture | select -expand LCID if ($lang -eq 1031){ $tasks = schtasks /query /fo csv -v | ConvertFrom-Csv

8 years, 3 months

3353 FIX Displaying disabled/offline host state in WATO host list now

by Lars Michelsen

Module: check_mk Branch: master Commit: 8be8d01e254d53573445728dc0b47b89ea286f28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8be8d01e254d53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 16:13:15 2016 +0200 3353 FIX Displaying disabled/offline host state in WATO host list now --- .werks/3353 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++-- web/htdocs/watolib.py | 5 ++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/3353 b/.werks/3353 new file mode 100644 index 0000000..67e30c5 --- /dev/null +++ b/.werks/3353 @@ -0,0 +1,10 @@ +Title: Displaying disabled/offline host state in WATO host list now +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459433588 + + diff --git a/ChangeLog b/ChangeLog index 3b19951..7ac1877 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,7 @@ * 3318 FIX: CSV bulk import of hosts: fix handling of CSV column headers... * 3351 FIX: Network scan: Fixed number in hosts not being updated during network scan * 3352 FIX: Network scan: Added hostname translation to translate detected DNS names of scanned hosts + * 3353 FIX: Displaying disabled/offline host state in WATO host list now Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index adcadce..ebc075a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -757,11 +757,15 @@ def show_hosts(folder): html.icon(msg, "validation_error") html.write(" ") - html.write('<a href="%s">%s</a>\n' % (host.edit_url(), hostname)) + if host.is_offline(): + html.icon(_("This host is disabled"), "disabled") + html.write(" ") if host.is_cluster(): - html.write(" ") html.icon(_("This host is a cluster of %s") % ", ".join(host.cluster_nodes()), "cluster") + html.write(" ") + + html.write('<a href="%s">%s</a>\n' % (host.edit_url(), hostname)) # Show attributes for attr, topic in all_host_attributes(): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3e2b283..277a1a3 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1970,11 +1970,14 @@ class Host(WithPermissionsAndAttributes): def is_cluster(self): return self._cluster_nodes != None - def cluster_nodes(self): return self._cluster_nodes + def is_offline(self): + return self.tag("criticality") == "offline" + + def site_id(self): return self._attributes.get("site") or self.folder().site_id()

8 years, 3 months

3352 FIX Network scan: Added hostname translation to translate detected DNS names of scanned hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 87bd23e3a4e123ec56334f51993a24e785983fe6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87bd23e3a4e123… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 15:58:00 2016 +0200 3352 FIX Network scan: Added hostname translation to translate detected DNS names of scanned hosts --- .werks/3352 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3352 b/.werks/3352 new file mode 100644 index 0000000..64e6799 --- /dev/null +++ b/.werks/3352 @@ -0,0 +1,10 @@ +Title: Network scan: Added hostname translation to translate detected DNS names of scanned hosts +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459432656 + + diff --git a/ChangeLog b/ChangeLog index b95220f..3b19951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -188,6 +188,7 @@ * 3338 FIX: Improved error handling when host to be edited does not exist * 3318 FIX: CSV bulk import of hosts: fix handling of CSV column headers... * 3351 FIX: Network scan: Fixed number in hosts not being updated during network scan + * 3352 FIX: Network scan: Added hostname translation to translate detected DNS names of scanned hosts Notifications: * 3263 Notifications: allow users to restrict by their contact groups...

8 years, 3 months

3351 FIX Network scan: Fixed number in hosts not being updated during network scan

by Lars Michelsen

Module: check_mk Branch: master Commit: d705f4b80441505c425f0616049aec0746cf451c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d705f4b8044150… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 15:56:55 2016 +0200 3351 FIX Network scan: Fixed number in hosts not being updated during network scan --- .werks/3351 | 10 +++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- modules/check_mk_base.py | 32 ++++++++++++-------- web/htdocs/wato.py | 51 ++++++++++++++++++++++++++++++++ web/plugins/wato/builtin_attributes.py | 5 +++- 6 files changed, 87 insertions(+), 14 deletions(-) diff --git a/.werks/3351 b/.werks/3351 new file mode 100644 index 0000000..cc51b21 --- /dev/null +++ b/.werks/3351 @@ -0,0 +1,10 @@ +Title: Network scan: Fixed number in hosts not being updated during network scan +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459432586 + + diff --git a/ChangeLog b/ChangeLog index 7d9085c..b95220f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -187,6 +187,7 @@ * 3302 FIX: Improved error handling when trying to edit a not existing rule * 3338 FIX: Improved error handling when host to be edited does not exist * 3318 FIX: CSV bulk import of hosts: fix handling of CSV column headers... + * 3351 FIX: Network scan: Fixed number in hosts not being updated during network scan Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/modules/check_mk.py b/modules/check_mk.py index f203315..6670e68 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2298,7 +2298,7 @@ def service_description(hostname, check_type, item): return descr.strip() -# Get rules for piggyback translation for that hostname +# Get a dict that specifies the actions to be done during the hostname translation def get_piggyback_translation(hostname): rules = host_extra_conf(hostname, piggyback_translation) translations = {} diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 64a457d..b09d8dc 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -655,24 +655,32 @@ def remove_piggyback_info_from(sourcehost, keep=[]): pass return removed + def translate_piggyback_host(sourcehost, backedhost): translation = get_piggyback_translation(sourcehost) + return do_hostname_translation(translation, backedhost) + +# When changing this keep it in sync with +# a) check_mk_base.py: do_hostname_translation() +# b) wato.py: do_hostname_translation() +# FIXME TODO: Move the common do_hostname_translation() in a central Check_MK module +def do_hostname_translation(translation, hostname): # 1. Case conversion caseconf = translation.get("case") if caseconf == "upper": - backedhost = backedhost.upper() + hostname = hostname.upper() elif caseconf == "lower": - backedhost = backedhost.lower() + hostname = hostname.lower() # 2. Drop domain part (not applied to IP addresses!) - if translation.get("drop_domain") and not backedhost[0].isdigit(): - backedhost = backedhost.split(".", 1)[0] + if translation.get("drop_domain") and not hostname[0].isdigit(): + hostname = hostname.split(".", 1)[0] - # To make it possible to match umlauts we need to change the backendhost + # To make it possible to match umlauts we need to change the hostname # to a unicode string which can then be matched with regexes etc. # We assume the incoming name is correctly encoded in UTF-8 - backedhost = decode_incoming_string(backedhost) + hostname = decode_incoming_string(hostname) # 3. Regular expression conversion if "regex" in translation: @@ -680,19 +688,19 @@ def translate_piggyback_host(sourcehost, backedhost): if not expr.endswith('$'): expr += '$' rcomp = regex(expr) - mo = rcomp.match(backedhost) + mo = rcomp.match(hostname) if mo: - backedhost = subst + hostname = subst for nr, text in enumerate(mo.groups()): - backedhost = backedhost.replace("\\%d" % (nr+1), text) + hostname = hostname.replace("\\%d" % (nr+1), text) # 4. Explicity mapping for from_host, to_host in translation.get("mapping", []): - if from_host == backedhost: - backedhost = to_host + if from_host == hostname: + hostname = to_host break - return backedhost.encode('utf-8') # change back to UTF-8 encoded string + return hostname.encode('utf-8') # change back to UTF-8 encoded string def read_cache_file(relpath, max_cache_age): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e036031..adcadce 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13451,6 +13451,10 @@ def Levels(**kwargs): default_value = default_value, ) +# When changing this keep it in sync with +# a) check_mk_base.py: do_hostname_translation() +# b) wato.py: do_hostname_translation() +# FIXME TODO: Move the common do_hostname_translation() in a central Check_MK module def HostnameTranslation(**kwargs): help = kwargs.get("help") title = kwargs.get("title") @@ -13526,6 +13530,44 @@ def HostnameTranslation(**kwargs): )), ]) + +# When changing this keep it in sync with +# a) check_mk_base.py: do_hostname_translation() +# b) wato.py: do_hostname_translation() +# FIXME TODO: Move the common do_hostname_translation() in a central Check_MK module +def do_hostname_translation(translation, hostname): + # 1. Case conversion + caseconf = translation.get("case") + if caseconf == "upper": + hostname = hostname.upper() + elif caseconf == "lower": + hostname = hostname.lower() + + # 2. Drop domain part (not applied to IP addresses!) + if translation.get("drop_domain") and not hostname[0].isdigit(): + hostname = hostname.split(".", 1)[0] + + # 3. Regular expression conversion + if "regex" in translation: + expr, subst = translation.get("regex") + if not expr.endswith('$'): + expr += '$' + rcomp = regex(expr) + mo = rcomp.match(hostname) + if mo: + hostname = subst + for nr, text in enumerate(mo.groups()): + hostname = hostname.replace("\\%d" % (nr+1), text) + + # 4. Explicit mapping + for from_host, to_host in translation.get("mapping", []): + if from_host == hostname: + hostname = to_host + break + + return hostname + + #. # .--User Profile--------------------------------------------------------. # | _ _ ____ __ _ _ | @@ -15133,16 +15175,24 @@ def do_network_scan_automation(): automation_commands["network-scan"] = do_network_scan_automation +# FIXME/TODO: What happens in case of duplicate host names? def add_scanned_hosts_to_folder(folder, found): + translation = folder.attribute("network_scan").get("translate_names", {}) + entries = [] for host_name, ipaddress in found: + host_name = do_hostname_translation(translation, host_name) + attrs = { "ipaddress" : ipaddress, "tag_criticality" : "offline", } entries.append((host_name, attrs, None)) + lock_exclusive() folder.create_hosts(entries) + folder.save() + unlock_exclusive() def save_network_scan_result(folder, result): @@ -15177,6 +15227,7 @@ def ip_addresses_to_scan(folder): to_scan.difference_update(exclude) # Reduce by all known host addresses + # FIXME/TODO: Shouldn't this filtering be done on the central site? to_scan.difference_update(known_ip_addresses()) return to_scan diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index b58d653..b6d9f87 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -179,6 +179,9 @@ class NetworkScanAttribute(ValueSpecAttribute): choices = get_all_user_ids, default_value = lambda: config.user_id, )), + ("translate_names", HostnameTranslation( + title = _("Translate Hostnames"), + )), ], title = _("Network Scan"), help = _("For each folder an automatic network scan can be configured. It will " @@ -186,7 +189,7 @@ class NetworkScanAttribute(ValueSpecAttribute): "to each IP address to check whether or not a host is using this ip " "address. Each new found host will be added to the current folder by " "it's hostname, when resolvable via DNS, or by it's IP address."), - optional_keys = ["max_parallel_pings"], + optional_keys = ["max_parallel_pings", "translate_names"], default_text = _("Not configured."), ) )

8 years, 3 months

Fixed exception in graph using RPN to compute vertical range with invalid perfdata

by Lars Michelsen

Module: check_mk Branch: master Commit: 28b68cd4cf2c3a5513b45189fc4564b6b0a34059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b68cd4cf2c3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 15:08:47 2016 +0200 Fixed exception in graph using RPN to compute vertical range with invalid perfdata --- web/htdocs/metrics.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index c6fd8a5..5bea619 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -962,7 +962,7 @@ def graph_possible(graph_template, translated_metrics): for metric_definition in graph_template["metrics"]: try: evaluate(metric_definition[0], translated_metrics) - except Exception, e: + except Exception: return False # Allow graphs to be disabled if certain (better) metrics @@ -1021,18 +1021,14 @@ def generic_graph_template(metric_name): def get_graph_range(graph_template, translated_metrics): - if "range" in graph_template: - min_value, max_value = [ - evaluate(r, translated_metrics)[0] - for r in graph_template["range"] - ] - - else: - # Compute range of displayed data points - max_value = None - min_value = None + if "range" not in graph_template: + return None, None # Compute range of displayed data points - return min_value, max_value + try: + return evaluate(graph_template["range"][0], translated_metrics)[0], \ + evaluate(graph_template["range"][1], translated_metrics)[0] + except: + return None, None #.

8 years, 3 months

3109 dotnet_clrmemory: levels are now configurable

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8b5b53142abbc57aeefb7ea7813faa54e81f5b3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b5b53142abbc5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Mar 31 13:27:49 2016 +0200 3109 dotnet_clrmemory: levels are now configurable --- .werks/3109 | 10 ++++++++++ ChangeLog | 2 +- checks/dotnet_clrmemory | 3 ++- web/plugins/wato/check_parameters.py | 26 ++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.werks/3109 b/.werks/3109 new file mode 100644 index 0000000..a63c67f --- /dev/null +++ b/.werks/3109 @@ -0,0 +1,10 @@ +Title: dotnet_clrmemory: levels are now configurable +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459423404 + + diff --git a/ChangeLog b/ChangeLog index 2c0f089..7d9085c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,6 @@ * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... - Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux @@ -44,6 +43,7 @@ * 3308 pvecm_status, pvecm_nodes: new checks which monitor a Proxmox Virtual Environment cluster setup * 3108 network interface and switch port discovery rules can now be combined to dicover multiple sets of interfaces... NOTE: Please refer to the migration notes! + * 3109 dotnet_clrmemory: levels are now configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/dotnet_clrmemory b/checks/dotnet_clrmemory index 32ccc29..26f9d13 100644 --- a/checks/dotnet_clrmemory +++ b/checks/dotnet_clrmemory @@ -47,5 +47,6 @@ check_info['dotnet_clrmemory'] = { 'parse_function' : parse_wmi_table, 'has_perfdata' : True, 'service_description' : "DotNet Memory Management", - 'includes' : ['wmi.include'] + 'includes' : ['wmi.include'], + 'group' : "clr_memory" } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1246083..09fe92e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1108,6 +1108,32 @@ register_check_parameters( "dict" ) +register_check_parameters( + subgroup_applications, + "clr_memory", + _(".Net runtime memory levels"), + Dictionary( + help = _("This rule allows to set the warn and crit levels of the memory " + "metrics of the .Net Runtime"), + elements = [ + ( "upper", + Tuple( + title = _("Percent time spent in garbage collection"), + elements = [ + Percentage(title = _("Warning at"), label = _("% time"), default_value = 10.0), + Percentage(title = _("Critical at"), label = _("% time"), default_value = 15.0), + ] + )), + ], + ), + TextAscii( + title = _("Name of the Application"), + help = _("The name of the .net application or _Global_"), + allow_empty = False, + ), + "dict" +) + #. # .--Environment---------------------------------------------------------. # | _____ _ _ |

8 years, 3 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 49f54989021d2f55575ef739ec06d2406f68dbf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49f54989021d2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 09:26:01 2016 +0200 Testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 9235679..2c0f089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... + Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux

8 years, 3 months

mk-livestatus: compile file seems to be optional

by Lars Michelsen

Module: check_mk Branch: master Commit: abc29f9acb6b4a47209ac19c96c5dffb35e3f9dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc29f9acb6b4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 31 09:18:08 2016 +0200 mk-livestatus: compile file seems to be optional --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8553fc7..e0e0a9e 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ BEAR := bear-fixed # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ - configure.ac ltmain.sh Makefile.{in,am} missing ar-lib compile \ + configure.ac ltmain.sh Makefile.{in,am} missing ar-lib \ nagios/README nagios/*.h nagios4/README nagios4/*.h \ src/*.{h,c,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/* @@ -109,7 +109,13 @@ dist: mk-livestatus tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) $(MAKE) minify-js tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins - tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) + + tar cf $(DISTNAME)/livestatus.tar $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) + if [ -f livestatus/compile ]; then \ + tar rf $(DISTNAME)/livestatus.tar $(TAROPTS) -C livestatus compile ; \ + fi + gzip $(DISTNAME)/livestatus.tar + tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls) tar rf $(DISTNAME)/doc.tar $(TAROPTS) COPYING AUTHORS ChangeLog @@ -162,6 +168,9 @@ mk-livestatus: rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) cd livestatus ; tar cf - $(LIVESTATUS_SOURCES) | tar xf - -C ../mk-livestatus-$(VERSION) + if [ -f livestatus/compile ]; then \ + cp -p livestatus/compile mk-livestatus-$(VERSION)/ ; \ + fi mkdir -p mk-livestatus-$(VERSION)/nagios cp livestatus/nagios/*.h mk-livestatus-$(VERSION)/nagios/ mkdir -p mk-livestatus-$(VERSION)/nagios4

8 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016