Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: #2189 FIX Allow changing graph number from 1 to " all" when editing PNP graph in report

by Mathias Kettner

Module: check_mk Branch: master Commit: 5bb6d8d3ae72adcb5ecbe4486ba4c14b10f945aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bb6d8d3ae72ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 6 18:51:27 2015 +0200 #2189 FIX Allow changing graph number from 1 to "all" when editing PNP graph in report The problem was that when you edited a report element of type PNP graph and wanted to change from one specific graph to the list of all graphs of that service you wouldn't be able to save your change. Creating new elements worked, nevertheless. --- .werks/2189 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/forms.py | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2189 b/.werks/2189 new file mode 100644 index 0000000..7584909 --- /dev/null +++ b/.werks/2189 @@ -0,0 +1,12 @@ +Title: Allow changing graph number from 1 to "all" when editing PNP graph in report +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428338979 + +The problem was that when you edited a report element of type PNP graph and wanted +to change from one specific graph to the list of all graphs of that service you +wouldn't be able to save your change. Creating new elements worked, nevertheless. diff --git a/ChangeLog b/ChangeLog index c1c697b..cfbbf3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -442,6 +442,7 @@ Reporting & Availability: * 1990 FIX: Fix two exceptions in PDF exports of host group views + * 2189 FIX: Allow changing graph number from 1 to "all" when editing PNP graph in report... Event Console: * 1845 Keep record of original source IP address of a syslog message or SNMP trap... diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 28119c6..62f8312 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -70,8 +70,8 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, messages = [] new_value = {} for keyname, section_title, entries in sections: - new_value[keyname] = value.get(keyname, {}).copy() if type(entries) == list: + new_value[keyname] = value.get(keyname, {}).copy() for name, vs in entries: if len(sections) == 1: vp = varprefix @@ -86,6 +86,7 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, html.add_user_error(e.varname, e.message) else: + new_value[keyname] = {} try: edited_value = entries.from_html_vars(keyname) entries.validate_value(edited_value, keyname)

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2309

by Mathias Kettner

Module: check_mk Branch: master Commit: ddbce4cbaeec3837b232803ab88fd2b89da9dd10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddbce4cbaeec38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 6 07:01:52 2015 +0200 Updated bug entries #2309 --- .bugs/2309 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.bugs/2309 b/.bugs/2309 new file mode 100644 index 0000000..2cb7e5f --- /dev/null +++ b/.bugs/2309 @@ -0,0 +1,15 @@ +Title: Livestatus column headers missing table prefix +Component: livestatus +State: open +Date: 2015-04-06 07:00:17 +Targetversion: future +Class: bug + +If you query a livestatus table with columns prefixed with the table name (like +service_...) then the resulting column headers should also include this prefix: + +> lq "GET services\nColumns: service_metrics\nFilter: service_description = Check_MK\nOutputFormat: python\nColumnHeaders: on" +[[u"metrics"], +[[u"execution_time",u"system_time",u"children_system_time",u"children_user_time",u"user_time"]]] + +But they don't. Here instead of "metrics" we would expect "service_metrics".

9 years, 5 months

Check_MK Git: check_mk: mem.linux: fix missing stack bug in new graph

by Mathias Kettner

Module: check_mk Branch: master Commit: e7dd9aec1e85d8d653f7786a5199e8dea3a43a2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7dd9aec1e85d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 6 18:40:28 2015 +0200 mem.linux: fix missing stack bug in new graph --- web/plugins/metrics/check_mk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ee7726d..47e440d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1822,10 +1822,10 @@ graph_info.append({ graph_info.append({ "title" : _("Active and Inactive Memory"), "metrics" : [ - ("mem_lnx_active_anon", "area"), - ("mem_lnx_active_file", "stack"), - ("mem_lnx_inactive_anon", "area"), + ("mem_lnx_inactive_anon", "stack"), ("mem_lnx_inactive_file", "stack"), + ("mem_lnx_active_anon", "stack"), + ("mem_lnx_active_file", "stack"), ], })

9 years, 5 months

Check_MK Git: check_mk: metrics: fix function for lightening of colors

by Mathias Kettner

Module: check_mk Branch: master Commit: b2259fa52496058e717f3bda95d8913c65309ab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2259fa5249605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 6 18:40:59 2015 +0200 metrics: fix function for lightening of colors --- web/htdocs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index c27b758..ac48d1f 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -916,7 +916,7 @@ def darken_color(rgb, v): # Make a color lighter. v ranges from 0 (not lighter) to 1 (white) def lighten_color(rgb, v): def lighten(x, v): - return x + ((1.0 - x) * (1.0 - v)) + return x + ((1.0 - x) * v) return tuple([ lighten(x, v) for x in rgb ]) def mix_colors(a, b):

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2299

by Goetz Golla

Module: check_mk Branch: master Commit: 9f4c50ee05e095e5e6c769fe7b683b747004118e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f4c50ee05e095… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Apr 6 00:39:53 2015 +0200 Updated bug entries #2299 --- .bugs/2299 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2299 b/.bugs/2299 new file mode 100644 index 0000000..43f1f74 --- /dev/null +++ b/.bugs/2299 @@ -0,0 +1,10 @@ +Title: check_mks active events: match on original IP-address from mkeventd +Component: ec +State: open +Date: 2015-04-06 00:35:52 +Targetversion: 1.2.7 +Class: feature + +The active events check should have the feature to match on the original +IP-address where the syslog or snmptraps where coming from. This is known +to mkeventd in newer versions.

9 years, 5 months

Check_MK Git: check_mk: Fix exception during discovery for empty sections when a check has extra_sections

by Mathias Kettner

Module: check_mk Branch: master Commit: bf879e93ee738f5ff1703e661bba79c979c86a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf879e93ee738f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 2 16:41:13 2015 +0200 Fix exception during discovery for empty sections when a check has extra_sections --- modules/discovery.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/discovery.py b/modules/discovery.py index 9e70635..222756f 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -221,8 +221,12 @@ def get_info_for_discovery(hostname, ipaddress, section_name, use_caches): return info max_cachefile_age = use_caches and inventory_max_cachefile_age or 0 - info = apply_parse_function(add_nodeinfo(get_realhost_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval=True), section_name), section_name) - if section_name in check_info and check_info[section_name]["extra_sections"]: + rh_info = get_realhost_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval=True) + if rh_info != None: + info = apply_parse_function(add_nodeinfo(rh_info, section_name), section_name) + else: + info = None + if info != None and section_name in check_info and check_info[section_name]["extra_sections"]: info = [ info ] for es in check_info[section_name]["extra_sections"]: try:

9 years, 5 months

Check_MK Git: check_mk: and removed a print statement

by Goetz Golla

Module: check_mk Branch: master Commit: e94a92f766249e78202caae9290b314a223077be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e94a92f766249e… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Apr 2 16:17:54 2015 +0200 and removed a print statement --- checks/aix_if | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/aix_if b/checks/aix_if index e7fbf11..a387227 100644 --- a/checks/aix_if +++ b/checks/aix_if @@ -114,7 +114,6 @@ def parse_aix_if(info): "ifOutDiscards", "ifOutErrors", "ifOutQLen", "ifAlias", "ifPhysAddress" ]: nic_list.append(nic_info[nic].get(attr,0)) if_table.append(map(str, nic_list)) - print if_table return if_table

9 years, 5 months

Check_MK Git: check_mk: aix_if: make check more robust if extended parameters are missing in agent output

by Goetz Golla

Module: check_mk Branch: master Commit: 41e4e70c466e183214110ecd5226583f83bdf4a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41e4e70c466e18… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Apr 2 16:16:28 2015 +0200 aix_if: make check more robust if extended parameters are missing in agent output --- checks/aix_if | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/aix_if b/checks/aix_if index c4f66c7..e7fbf11 100644 --- a/checks/aix_if +++ b/checks/aix_if @@ -112,8 +112,9 @@ def parse_aix_if(info): "ifInOctets", "inucast", "inmcast", "inbcast", "ifInDiscards", "ifInErrors", "ifOutOctets", "outucast", "outmcast", "outbcast", "ifOutDiscards", "ifOutErrors", "ifOutQLen", "ifAlias", "ifPhysAddress" ]: - nic_list.append(nic_info[nic][attr]) + nic_list.append(nic_info[nic].get(attr,0)) if_table.append(map(str, nic_list)) + print if_table return if_table

9 years, 5 months

Check_MK Git: check_mk: winperf_if: output "Teaming Status", not " Group Status"

by Mathias Kettner

Module: check_mk Branch: master Commit: a30f41a768c0a01fa6704d3c027d32c4830ce92f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a30f41a768c0a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 2 15:53:25 2015 +0200 winperf_if: output "Teaming Status", not "Group Status" --- checks/if.include | 28 ++++++++++++++++++---------- checks/winperf_if | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/checks/if.include b/checks/if.include index d2e81bd..4bc7a38 100644 --- a/checks/if.include +++ b/checks/if.include @@ -76,10 +76,16 @@ check_config_variables.append("nagios_illegal_chars") # Name of state (lookup SNMP enum) def if_statename(st): - names = { '1': 'up', '2': 'down', - '3': 'testing', '4': 'unknown', - '5': 'dormant', '6': 'notPresent', - '7': 'lowerLayerDown', '8': 'degraded' } + names = { + '1': 'up', + '2': 'down', + '3': 'testing', + '4': 'unknown', + '5': 'dormant', + '6': 'not present', + '7': 'lower layer down', + '8': 'degraded', + } return names.get(st, st) def if_extract_node(line, has_nodeinfo): @@ -337,7 +343,7 @@ def inventory_if_common(info, has_nodeinfo = False): return inventory -def check_if_common(item, params, info, has_nodeinfo = False): +def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Group"): # If this item is in an ifgroup create a pseudo interface and pass its data to the common instance # This is done by simply adding the additional group_info data to the already existing info table if params.get("aggregate"): @@ -489,11 +495,13 @@ def check_if_common(item, params, info, has_nodeinfo = False): # If applicable, signal the check_if_common_single if the counter of the # given interface has wrapped. Actually a wrap of the if group itself is unlikely, # however any counter wrap of one of its members causes the accumulation being invalid - return check_if_common_single(item, params, [group_entry], wrapped, has_nodeinfo = has_nodeinfo, group_members = group_members) + return check_if_common_single(item, params, [group_entry], wrapped, + has_nodeinfo = has_nodeinfo, group_members = group_members, group_name = group_name) - return check_if_common_single(item, params, info, has_nodeinfo=has_nodeinfo) + return check_if_common_single(item, params, info, has_nodeinfo=has_nodeinfo, group_name = group_name) -def check_if_common_single(item, params, info, force_counter_wrap = False, has_nodeinfo = False, group_members = None): +def check_if_common_single(item, params, info, force_counter_wrap = False, + has_nodeinfo = False, group_members = None, group_name = "Group"): # Params now must be a dict. Some keys might # be set to None targetspeed = params.get("speed") @@ -537,7 +545,7 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n if if_item_matches(item, ifIndex, ifAlias, ifDescr): if group_members: # The detailed group info is added later on - infotext = "Group Status " + infotext = group_name + " Status " else: # Display port number or alias in infotext if that is not part # of the service description anyway @@ -622,7 +630,7 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n # but we spotted devices, which do report error packes even for down interfaces. # To deal with it, we simply skip over all performance counter checks for down # interfaces. - if operstatus == "down": + if str(ifOperStatus) == "2": return state, infotext # Performance counters diff --git a/checks/winperf_if b/checks/winperf_if index 2ee7edc..a25fcee 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -272,7 +272,7 @@ def inventory_winperf_if(info): return inventory_if_common(convert_winperf_if(info)) def check_winperf_if(item, params, info): - return check_if_common(item, params, convert_winperf_if(info)) + return check_if_common(item, params, convert_winperf_if(info), group_name = "Teaming") check_info["winperf_if"] = {

9 years, 5 months

Check_MK Git: check_mk: #2188 Rule based notification now allow match for notification comment

by Mathias Kettner

Module: check_mk Branch: master Commit: c4364765803862072f4fa7ef0c8d3b3024001e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4364765803862… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 2 12:25:12 2015 +0200 #2188 Rule based notification now allow match for notification comment A new condition allows a match on the notification comment. This comment is supplied in custom notifications - never in normal notifications. This allows to create custom commands that e.g. open tickets by creating custom notifications with a certain text in the comment. --- .werks/2188 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 9 +++++++++ web/htdocs/wato.py | 14 ++++++++++++-- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.werks/2188 b/.werks/2188 new file mode 100644 index 0000000..d687b0e --- /dev/null +++ b/.werks/2188 @@ -0,0 +1,12 @@ +Title: Rule based notification now allow match for notification comment +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i1 +Date: 1427970243 +Class: feature + +A new condition allows a match on the notification comment. This comment +is supplied in custom notifications - never in normal notifications. This +allows to create custom commands that e.g. open tickets by creating custom +notifications with a certain text in the comment. diff --git a/ChangeLog b/ChangeLog index 6f11239..c1c697b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -425,6 +425,7 @@ * 2041 Notification Spooler can now handle incoming and outgoing persistent TCP connections... * 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... * 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 1f91435..5ba3246 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -670,6 +670,7 @@ def rbn_match_rule(rule, context): rbn_match_servicelevel(rule, context) or \ rbn_match_host_event(rule, context) or \ rbn_match_service_event(rule, context) or \ + rbn_match_notification_comment(rule, context) or \ rbn_match_event_console(rule, context) @@ -971,6 +972,14 @@ def rbn_rule_contacts(rule, context): return all_enabled +def rbn_match_notification_comment(rule, context): + if "match_notification_comment" in rule: + r = regex(rule["match_notification_comment"]) + notification_comment = context.get("NOTIFICATIONCOMMENT", "") + if not r.match(notification_comment): + return "The beginning of the notification comment '%s' is not matched by the regex '%s'" % ( + notification_comment, rule["match_notification_comment"]) + def rbn_match_event_console(rule, context): if "match_ec" in rule: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b58f738..d9a0ffa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8539,6 +8539,16 @@ def vs_notification_rule(userid = None): default_value = [ 'rw', 'rc', 'ru', 'wc', 'wu', 'uc', 'f', 's', 'x' ], ) ), + ( "match_notification_comment", + RegExpUnicode( + title = _("Match notification comment"), + help = _("This match only makes sense for custom notifications. When a user creates " + "a custom notification then he/she can enter a comment. This comment is shipped " + "in the notification context variable <tt>NOTIFICATIONCOMMENT</tt>. Here you can " + "make a condition of that comment. It is a regular expression matching the beginning " + "of the comment."), + size = 60, + )), ( "match_ec", Alternative( title = _("Event Console alerts"), @@ -8667,7 +8677,7 @@ 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_timeperiod", "match_escalation", "match_escalation_throttle", - "match_sl", "match_host_event", "match_service_event", "match_ec", + "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" ], headers = [ ( _("Rule Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), @@ -8678,7 +8688,7 @@ def vs_notification_rule(userid = None): "match_services", "match_servicegroups", "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_sl", "match_host_event", "match_service_event", "match_ec", "match_notification_comment" ] ), ], render = "form", form_narrow = True,

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015