Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: winperf_if: Fix status of Teaming interface

by Mathias Kettner

Module: check_mk Branch: master Commit: 42ef56077b2453182626dac365d0c073bce07042 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42ef56077b2453… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 11:21:48 2015 +0200 winperf_if: Fix status of Teaming interface --- checks/if.include | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/checks/if.include b/checks/if.include index 1a2f694..518635f 100644 --- a/checks/if.include +++ b/checks/if.include @@ -396,9 +396,9 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou this_time = time.time() group_info = { - "ifSpeed" : 0, "ifInOctets" : 0, "inucast" : 0, "inmcast" : 0 , "inbcast" : 0, - "ifInDiscards" : 0, "ifInErrors" : 0, "ifOutOctets" : 0, "outucast" : 0, "outmcast" : 0, - "outbcast" : 0, "ifOutDiscards" : 0, "ifOutErrors" : 0, "ifOutQLen" : 0 + "ifSpeed" : 0, "ifInOctets" : 0, "inucast" : 0, "inmcast" : 0, "inbcast" : 0, + "ifInDiscards" : 0, "ifInErrors" : 0, "ifOutOctets" : 0, "outucast" : 0, "outmcast" : 0, + "outbcast" : 0, "ifOutDiscards" : 0, "ifOutErrors" : 0, "ifOutQLen" : 0 } for element in matching_interfaces: @@ -465,12 +465,15 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou # Append an additional entry to the info table containing the calculated group_info - group_portstates = set([element[4] for element in matching_interfaces]) - if "1" in group_portstates: - if len(group_portstates) == 1: - group_operStatus = "1" # up - else: - group_operStatus = "8" # degraded + num_up = 0 + for element in matching_interfaces: + if element[4] == '1' or ( + type(element[4]) == tuple and element[4][0] == '1'): + num_up += 1 + if num_up == len(matching_interfaces): + group_operStatus = "1" # up + elif num_up > 0: + group_operStatus = "8" # degraded else: group_operStatus = "2" # down

9 years, 5 months

Check_MK Git: check_mk: #2196 winperf_if: for Windows interfaces show original Windows state names

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ae412651883466c80c1772784144f654970bdcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ae41265188346… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 11:10:29 2015 +0200 #2196 winperf_if: for Windows interfaces show original Windows state names --- .werks/2196 | 9 +++++++ ChangeLog | 1 + checks/if.include | 29 ++++++++++++++++++----- checks/winperf_if | 68 +++++++++++++++++++++++------------------------------ 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/.werks/2196 b/.werks/2196 new file mode 100644 index 0000000..05c2ce2 --- /dev/null +++ b/.werks/2196 @@ -0,0 +1,9 @@ +Title: winperf_if: for Windows interfaces show original Windows state names +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1428657010 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 55b998a..2c789bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 2185 canon_pages: added support for b/w A4 and color A4/A3 counters * 2186 check_mk_agent.aix: use GNU df in order to exclude NFS for filesystem monitoring... * 2112 hitachi_hnas_bossock: new check to monitor number of running Bossock Fibers + * 2196 winperf_if: for Windows interfaces show original Windows state names * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/if.include b/checks/if.include index 4bc7a38..1a2f694 100644 --- a/checks/if.include +++ b/checks/if.include @@ -247,6 +247,11 @@ def inventory_if_common(info, has_nodeinfo = False): outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ ifOutQLen, ifAlias, ifPhysAddress = line + # Windows NICs sends pairs of ifOperStatus and its Windows-Name instead + # of just the ifOperStatus + if type(ifOperStatus) == tuple: + ifOperStatus = ifOperStatus[0] + ifGroup = None if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex @@ -403,12 +408,19 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ ifOutQLen, ifAlias, ifPhysAddress = line + # Windows NICs sends pairs of ifOperStatus and its Windows-Name instead + # of just the ifOperStatus + if type(ifOperStatus) == tuple: + ifOperStatus, ifOperStatusName = ifOperStatus + else: + ifOperStatusName = if_statename(ifOperStatus) + ifGroup = None if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex if_item = get_interface_item(element) - group_members.append({"name": if_item, "state": ifOperStatus}) + group_members.append({"name": if_item, "state": ifOperStatus, "state_name" : ifOperStatusName}) perfdata = [] # Only these values are packed into counters @@ -535,6 +547,13 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ ifOutQLen, ifAlias, ifPhysAddress = line + # Windows NICs sends pairs of ifOperStatus and its Windows-Name instead + # of just the ifOperStatus + if type(ifOperStatus) == tuple: + ifOperStatus, ifOperStatusName = ifOperStatus + else: + ifOperStatusName = if_statename(ifOperStatus) + ifGroup = None if type(ifIndex) == tuple: ifGroup, ifIndex = ifIndex @@ -567,22 +586,20 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, state = 0 - operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate and not (type(targetstate) in [ list, tuple ] and ifOperStatus in targetstate)): state = 2 - infotext += "(%s)(!!) " % operstatus + infotext += "(%s)(!!) " % ifOperStatusName else: - infotext += "(%s) " % operstatus + infotext += "(%s) " % ifOperStatusName if group_members: infotext = infotext[:-1] # remove last space extra_info = ", Members: " member_info = [] for member in group_members: - member_operstatus = if_statename(str(member["state"])) - member_info.append("%s (%s)" % (member["name"], member_operstatus)) + member_info.append("%s (%s)" % (member["name"], member["state_name"])) infotext += extra_info + "[%s] " % ", ".join(member_info) # prepare reference speed for computing relative bandwidth usage diff --git a/checks/winperf_if b/checks/winperf_if index a25fcee..105fad8 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -208,19 +208,21 @@ def convert_winperf_if(info): connection_status = nic.get('NetConnectionStatus', '2') # Windows NetConnectionStatus Table - # 0 Disconnected - # 1 Connecting - # 2 Connected - # 3 Disconnecting - # 4 Hardware not present - # 5 Hardware disabled - # 6 Hardware malfunction - # 7 Media disconnected - # 8 Authenticating - # 9 Authentication succeeded - # 10 Authentication failed - # 11 Invalid address - # 12 Credentials required + connection_states = { + '0': ('2', 'Disconnected'), + '1': ('2', 'Connecting'), + '2': ('1', 'Connected'), + '3': ('2', 'Disconnecting'), + '4': ('2', 'Hardware not present'), + '5': ('2', 'Hardware disabled'), + '6': ('2', 'Hardware malfunction'), + '7': ('7', 'Media disconnected'), + '8': ('2', 'Authenticating'), + '9': ('2', 'Authentication succeeded'), + '10': ('2', 'Authentication failed'), + '11': ('2', 'Invalid address'), + '12': ('2', 'Credentials required'), + } # ifOperStatus Table # 1 up @@ -231,37 +233,27 @@ def convert_winperf_if(info): # 6 notPresent # 7 lowerLayerDown - # NetConnectionStatus : ifOperStatus - # 2 (Connected) : 1 (up) - # 7 (Media disconnected) : 7 (lowerLayerDown) - # * : 2 (down) - - if connection_status == '2': - ifoperstatus = '1' - elif connection_status == '7': - ifoperstatus = '7' - else: - ifoperstatus = '2' + ifoperstatus_annotated = connection_states[connection_status] converted.append(( index_info, nic_name, "loopback" in nic_name.lower() and '24' or '6', - bandwidth or nic[10], # Bandwidth - ifoperstatus, # ifOperStatus - nic[-246], # ifInOctets, - nic[14], # inucast - 0, # inmcast - nic[16], # non-unicast empfangen - nic[18], # ifInDiscards - nic[20], # ifInErrors - nic[-4], # ifOutOctets (Bytes gesendet) - nic[26], # outucast + bandwidth or nic[10], # Bandwidth + ifoperstatus_annotated, # ifOperStatus + nic[-246], # ifInOctets, + nic[14], # inucast + 0, # inmcast + nic[16], # non-unicast empfangen + nic[18], # ifInDiscards + nic[20], # ifInErrors + nic[-4], # ifOutOctets (Bytes gesendet) + nic[26], # outucast 0, - nic[28], # outnonucast - nic[30], # ifOutDiscards - nic[32], # ifOutErrors - nic[34], # ifOutQLen + nic[28], # outnonucast + nic[30], # ifOutDiscards + nic[32], # ifOutErrors + nic[34], # ifOutQLen nic.get('NetConnectionID', nic_name), mac, ))

9 years, 5 months

Check_MK Git: check_mk: #2173 FIX mk-job: Fixed quoting of command line arguments

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c5d6f9422e92dd546c5bccf3629953ad3d14d3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5d6f9422e92d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 10 09:41:11 2015 +0200 #2173 FIX mk-job: Fixed quoting of command line arguments --- .werks/2173 | 10 ++++++++++ ChangeLog | 1 + agents/mk-job | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2173 b/.werks/2173 new file mode 100644 index 0000000..5dc9cfa --- /dev/null +++ b/.werks/2173 @@ -0,0 +1,10 @@ +Title: mk-job: Fixed quoting of command line arguments +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428651655 + + diff --git a/ChangeLog b/ChangeLog index 55b998a..bbf0cc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -314,6 +314,7 @@ * 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined * 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit email addresses... * 2172 FIX: Allowing OIDs in checks not starting with a dot again... + * 2173 FIX: mk-job: Fixed quoting of command line arguments Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/mk-job b/agents/mk-job index 20a1fdf..1a4ae8b 100755 --- a/agents/mk-job +++ b/agents/mk-job @@ -63,7 +63,7 @@ fi date +"start_time %s" > "$OUTPUT_PATH/$IDENT.running" /usr/bin/time -o "$OUTPUT_PATH/$IDENT.running" --append \ - -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads %I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches %c\nvol_context_switches %w" $@ + -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads %I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches %c\nvol_context_switches %w" "$@" RC=$? mv "$OUTPUT_PATH/$IDENT.running" "$OUTPUT_PATH/$IDENT" exit $RC

9 years, 5 months

Check_MK Git: check_mk: Remove trailing white spaces from ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a271071afd015840ba41c557d423d687586908b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a271071afd015… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 16:53:14 2015 +0200 Remove trailing white spaces from ChangeLog --- ChangeLog | 308 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 154 insertions(+), 154 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6a271071af…

9 years, 5 months

Check_MK Git: check_mk: Fix exception in TimeRange ValueSpec for old PNP timeranges

by Mathias Kettner

Module: check_mk Branch: master Commit: 36293d8bd4225b4512df8a4d61f68d567623ab45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36293d8bd4225b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 16:32:54 2015 +0200 Fix exception in TimeRange ValueSpec for old PNP timeranges --- web/htdocs/valuespec.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d12bd44..ba7e31e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2200,6 +2200,16 @@ class Timerange(CascadingDropdown): if rangespec == None: rangespec = "4h" + # Compatibility with previous versions + elif rangespec[0] == "pnp_view": + rangespec = { + 1: "4h", + 2: "25h", + 3: "7d", + 4: "31d", + 5: "365d" + }.get(rangespec[1], "4h") + now = time.time() if rangespec[0] == 'age': from_time = now - rangespec[1] @@ -2260,6 +2270,7 @@ class Timerange(CascadingDropdown): return (from_time, now), titles[0] else: # last (previous) + html.debug("HIRN", rangespec) if rangespec[0] == 'd': return (from_time - 86400, from_time), titles[1] elif rangespec[0] == 'w':

9 years, 5 months

Check_MK Git: check_mk: siemens_plc.counters/siemens_plc.duration: Fixed problem with decreasing counter handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 9be809530ceaca4e47e42a698530628553bb1d52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9be809530ceaca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 15:46:59 2015 +0200 siemens_plc.counters/siemens_plc.duration: Fixed problem with decreasing counter handling --- checks/siemens_plc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/checks/siemens_plc b/checks/siemens_plc index 6f59479..56eb9d9 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -147,11 +147,13 @@ def check_siemens_plc_duration(item, params, info): perfdata = [(line[1], seconds)] key = 'siemens_plc.duration.%s' % item - if key in g_counters and g_counters[key] < seconds: - return 2, 'Reduced from %s to %s' % (get_age_human_readable(g_counters[key]), + if key in g_counters and g_counters[key] > seconds: + old_seconds = g_counters[key] + g_counters[key] = seconds + return 2, 'Reduced from %s to %s' % (get_age_human_readable(old_seconds), get_age_human_readable(seconds)), perfdata - - g_counters[key] = seconds + else: + g_counters[key] = seconds state = 0 warn, crit = params.get('duration', (None, None)) @@ -191,11 +193,13 @@ def check_siemens_plc_counter(item, params, info): for line in info: if line[1].startswith("counter") and line[0]+" "+line[2] == item: value = int(line[-1]) + perfdata = [(line[1], value)] key = 'siemens_plc.counter.%s' % item - if key in g_counters and g_counters[key] < value: + if key in g_counters and g_counters[key] > value: + old_value = g_counters[key] g_counters[key] = value - return 2, 'Reduced from %s to %s' % (g_counters[key], value) + return 2, 'Reduced from %s to %s' % (old_value, value), perfdata else: g_counters[key] = value @@ -206,7 +210,7 @@ def check_siemens_plc_counter(item, params, info): elif warn != None and value >= warn: state = 1 - return state, '%d' % value, [(line[1], value)] + return state, '%d' % value, perfdata check_info['siemens_plc.counter'] = {

9 years, 5 months

Check_MK Git: check_mk: #2195 New condition "Match Contacts" in rule based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: ad7587e4e504e87e35e43b0ce43a2830a29dde29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad7587e4e504e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 15:14:55 2015 +0200 #2195 New condition "Match Contacts" in rule based notifications You can now add a new condition in a notification rule in order to match for the contacts of a host or service. That way you can make rules like "If user adam is a contact of the host/service, then notify bernie." --- .werks/2195 | 11 +++++++++++ ChangeLog | 1 + modules/notify.py | 18 ++++++++++++++++++ web/htdocs/wato.py | 5 ++--- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/2195 b/.werks/2195 new file mode 100644 index 0000000..120f7b0 --- /dev/null +++ b/.werks/2195 @@ -0,0 +1,11 @@ +Title: New condition "Match Contacts" in rule based notifications +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.7i1 +Date: 1428585184 +Class: feature + +You can now add a new condition in a notification rule in order to match +for the contacts of a host or service. That way you can make rules +like "If user adam is a contact of the host/service, then notify bernie." diff --git a/ChangeLog b/ChangeLog index 14435e9..946e6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -433,6 +433,7 @@ * 2135 Allow to filter notification contacts based on values of custom macros... * 1235 Added notification plugin for Braintwoer SMS Gateways... * 2188 Rule based notification now allow match for notification comment... + * 2195 New condition "Match Contacts" in rule based notifications... * 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications * 1664 FIX: mknotifyd: further performance improvements for notification forwarding * 1205 FIX: RBN: Fixed match contactgroup condition... diff --git a/modules/notify.py b/modules/notify.py index 5ba3246..dcfd344 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -657,6 +657,7 @@ def rbn_match_rule(rule, context): rbn_match_hosttags(rule, context) or \ rbn_match_hostgroups(rule, context) or \ rbn_match_servicegroups(rule, context) or \ + rbn_match_contacts(rule, context) or \ rbn_match_contactgroups(rule, context) or \ rbn_match_hosts(rule, context) or \ rbn_match_exclude_hosts(rule, context) or \ @@ -727,6 +728,23 @@ def rbn_match_servicegroups(rule, context): return "The service is only in the groups %s, but %s is required" % ( sgn, " or ".join(required_groups)) +def rbn_match_contacts(rule, context): + if "match_contacts" in rule: + required_contacts = rule["match_contacts"] + contacts_text = context["CONTACTS"] + if not contacts_text: + return "The object has no contact, but %s is required" % ( + " or ".join(required_contacts)) + + contacts = contacts_text.split(",") + for contact in required_contacts: + if contact in contacts: + return + + return "The object has the contacts %s, but %s is required" % ( + contacts_text, " or ".join(required_contacts)) + + def rbn_match_contactgroups(rule, context): required_groups = rule.get("match_contactgroups") if context["WHAT"] == "SERVICE": diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ea83d37..fa5d715 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8397,9 +8397,8 @@ def vs_notification_rule(userid = None): ( "match_contacts", ListOf( UserSelection(only_contacts = True), - title = _("Match Contacts (CMC only)"), - help = _("The host/service must have one of the selected contacts. This only works with Check_MK Micro Core. " \ - "If you don't use the CMC that filter will not apply"), + title = _("Match Contacts"), + help = _("The host/service must have one of the selected contacts."), movable = False, allow_empty = False, add_label = _("Add contact"),

9 years, 5 months

Check_MK Git: check_mk: Fix exception in CPU load graph, if number of cores is None

by Mathias Kettner

Module: check_mk Branch: master Commit: 263836ecbdacd0bc8f0c20b6c4148e0d9a6e66ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=263836ecbdacd0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 14:34:47 2015 +0200 Fix exception in CPU load graph, if number of cores is None --- web/htdocs/metrics.py | 5 ++++- web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 29ac803..cc1e831 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -388,7 +388,10 @@ def replace_expressions(text, translated_metrics): value, unit, color = evaluate(expression, translated_metrics) if unit_name: unit = unit_info[unit_name] - return unit["render"](value) + if value != None: + return unit["render"](value) + else: + return _("n/a") r = regex(r"%$[^)]*$") return r.sub(eval_to_string, text) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 06205d7..6e2c984 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -48,7 +48,7 @@ unit_info[""] = { unit_info["count"] = { "title" : _("Count"), "symbol" : "", - "render" : lambda v : "%d" % v, + "render" : lambda v: "%d" % v, "stepping" : "integer", # for vertical graph labels }

9 years, 5 months

Check_MK Git: check_mk: #2194 FIX Avoid new discovered checks from being used without config reload

by Mathias Kettner

Module: check_mk Branch: master Commit: f65be6e5a851ef28bb46d7375e103496c09693cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f65be6e5a851ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 14:27:37 2015 +0200 #2194 FIX Avoid new discovered checks from being used without config reload --- .werks/2194 | 10 ++++++++++ ChangeLog | 1 + modules/discovery.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/2194 b/.werks/2194 new file mode 100644 index 0000000..5d2bc1a --- /dev/null +++ b/.werks/2194 @@ -0,0 +1,10 @@ +Title: Avoid new discovered checks from being used without config reload +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428582353 + + diff --git a/ChangeLog b/ChangeLog index ee65b76..14435e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 2089 FIX: Debug mode shows details about errors in autochecks as expected now * 2093 FIX: Fixed handling of check_mk commandline parameter "-c" * 2187 FIX: Avoid CLOSE_WAIT sockets for agent connection in case of timeouts... + * 2194 FIX: Avoid new discovered checks from being used without config reload Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/discovery.py b/modules/discovery.py index 222756f..64e0733 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -845,6 +845,8 @@ def save_autochecks_file(hostname, items): if not os.path.exists(autochecksdir): os.makedirs(autochecksdir) filepath = autochecksdir + "/" + hostname + ".mk" + if os.path.exists(filepath): + os.remove(filepath) out = file(filepath, "w") out.write("[\n") for entry in items:

9 years, 5 months

Check_MK Git: check_mk: WATO: add condition for contacts in RBN rules ( not yet active)

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ee3b46f82fa19d8865e6d754cf08bf1bc9f0bac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee3b46f82fa19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 14:25:32 2015 +0200 WATO: add condition for contacts in RBN rules (not yet active) --- web/htdocs/wato.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ac3f526..ea83d37 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8280,6 +8280,7 @@ def vs_notification_rule(userid = None): help = _("Enter a list of user IDs to be notified here. These users need to be members " "of at least one contact group in order to be notified."), movable = False, + add_label = _("Add user"), ) ), ( "contact_groups", @@ -8393,6 +8394,17 @@ def vs_notification_rule(userid = None): allow_empty = False, ) ), + ( "match_contacts", + ListOf( + UserSelection(only_contacts = True), + title = _("Match Contacts (CMC only)"), + help = _("The host/service must have one of the selected contacts. This only works with Check_MK Micro Core. " \ + "If you don't use the CMC that filter will not apply"), + movable = False, + allow_empty = False, + add_label = _("Add contact"), + ) + ), ( "match_contactgroups", GroupChoice("contact", title = _("Match Contact Groups (CMC only)"), @@ -8675,7 +8687,8 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_contactgroups", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_contacts", "match_contactgroups", + "match_exclude_services", "match_plugin_output", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_notification_comment", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails", "contact_match_macros" ], @@ -8685,7 +8698,8 @@ def vs_notification_rule(userid = None): + contact_headers + [ ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_contactgroups", "match_exclude_services", "match_plugin_output", + "match_services", "match_servicegroups", "match_contacts", "match_contactgroups", + "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_notification_comment" ] ),

9 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015