Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

JSON export of BI honors URL var expansion_level now

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ca2b6a32ad6f62f2fc50f85e97742cf37a3792a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca2b6a32ad6f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 21:25:38 2016 +0100 JSON export of BI honors URL var expansion_level now --- web/htdocs/bi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index eea8175..07bc9c3 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1551,7 +1551,9 @@ def render_tree_json(row): json_node = render_node_json(node, show_host) is_leaf = len(node) == 3 - if not is_leaf: + is_next_level_open = len(path) <= expansion_level + + if not is_leaf and is_next_level_open: json_node["nodes"] = [] for child_node in node[3]: if not child_node[2].get("hidden"):

8 years, 6 months

#3000 FIX Host check command: "Use a custom check plugin" was not working with CMC

by Andreas Boesl

Module: check_mk Branch: master Commit: d2131b9c22789f19ee828b377d10b9e34e21aed7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2131b9c22789f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 1 16:08:51 2016 +0100 #3000 FIX Host check command: "Use a custom check plugin" was not working with CMC The setting "Use a custom check plugin" in the "Host Check Command" rule caused an exception on activate changes, when using the CMC. --- .werks/3000 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 13 +++++++++++++ modules/nagios.py | 13 ------------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.werks/3000 b/.werks/3000 new file mode 100644 index 0000000..6d0eb8f --- /dev/null +++ b/.werks/3000 @@ -0,0 +1,10 @@ +Title: Host check command: "Use a custom check plugin" was not working with CMC +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1456844854 +Class: fix + +The setting "Use a custom check plugin" in the "Host Check Command" rule caused +an exception on activate changes, when using the CMC. diff --git a/ChangeLog b/ChangeLog index fcb7d6b..9eb63df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 3182 FIX: Fix bulk operations based on search result folder... * 2998 FIX: Fixed broken WATO rules where content is dynamically loaded... * 3246 FIX: Fix link for editing a BI aggregation after coming back from the details of another aggregation... + * 3000 FIX: Host check command: "Use a custom check plugin" was not working with CMC... Notifications: * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way diff --git a/modules/check_mk.py b/modules/check_mk.py index 07573fe..4a2ac8e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1107,6 +1107,19 @@ def extra_conf_of(confdict, hostname, service): result += format % (key, values[0]) return result +def autodetect_plugin(command_line): + plugin_name = command_line.split()[0] + if command_line[0] not in [ '$', '/' ]: + try: + for dir in [ "/local", "" ]: + path = omd_root + dir + "/lib/nagios/plugins/" + if os.path.exists(path + plugin_name): + command_line = path + command_line + break + except: + pass + return command_line + def host_check_command(hostname, ip, is_clust): # Check dedicated host check command values = host_extra_conf(hostname, host_check_commands) diff --git a/modules/nagios.py b/modules/nagios.py index 0769a2a..1bad72d 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -664,19 +664,6 @@ define service { """ % (pingonly_template, descr, ping_command, arguments, extra_service_conf_of(hostname, descr), hostname)) -def autodetect_plugin(command_line): - plugin_name = command_line.split()[0] - if command_line[0] not in [ '$', '/' ]: - try: - for dir in [ "/local", "" ]: - path = omd_root + dir + "/lib/nagios/plugins/" - if os.path.exists(path + plugin_name): - command_line = path + command_line - break - except: - pass - return command_line - def simulate_command(command): if simulation_mode: custom_commands_to_define.add("check-mk-simulation")

8 years, 6 months

Cleaned up json/ json_export view webservice to use the json module for producing json output

by Lars Michelsen

Module: check_mk Branch: master Commit: 9544b48bd5101ebfef10612b0300483d4da6ccfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9544b48bd5101e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:19:09 2016 +0100 Cleaned up json/json_export view webservice to use the json module for producing json output --- web/plugins/views/webservice.py | 64 +++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 36285d9..e086b1f 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -24,6 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +try: + import simplejson as json +except ImportError: + import json + def render_python_raw(data, view, group_painters, painters, num_columns, show_checkboxes): html.write(repr(data)) @@ -55,16 +60,7 @@ multisite_layouts["python"] = { "hide" : True, } - -json_escape = re.compile(r'[\\"\r\n\t\b\f\x00-\x1f]') -json_encoding_table = dict([(chr(i), '\\u%04x' % i) for i in range(32)]) -json_encoding_table.update({'\b': '\\b', '\f': '\\f', '\n': '\\n', '\r': '\\r', '\t': '\\t', '\\': '\\\\', '"': '\\"' }) - -def encode_string_json(s): - return '"' + json_escape.sub(lambda m: json_encoding_table[m.group(0)], s) + '"' - - -def render_json(rows, view, group_painters, painters, num_columns, show_checkboxes, export = False): +def render_json(rows, view, group_painters, painters, num_columns, show_checkboxes, export=False): if export: html.req.content_type = "appliation/json; charset=UTF-8" filename = '%s-%s.json' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) @@ -72,41 +68,35 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox filename = filename.encode("utf-8") html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename - html.write("[\n") + painted_rows = [] - first = True - html.write("[") + header_row = [] for p in painters: - if first: - first = False - else: - html.write(",") - content = p[0]["name"] - stripped = html.strip_tags(content) - utf8 = stripped.encode("utf-8") - html.write(encode_string_json(utf8)) - html.write("]") + header_row.append(html.strip_tags(p[0]["name"])) + painted_rows.append(header_row) for row in rows: - html.write(",\n[") - first = True + painted_row = [] for p in painters: - if first: - first = False - else: - html.write(",") joined_row = join_row(row, p) - tdclass, content = paint_painter(p[0], joined_row) - if type(content) == unicode: - content = content.encode("utf-8") + content = paint_painter(p[0], joined_row)[1] + if type(content) in [ list, dict ]: + # Allow painters to return lists and dicts, then json encode them + # as such data structures without wrapping them into strings + pass + else: - content = str(content) - content = content.replace("<br>","\n") - stripped = html.strip_tags(content) - html.write(encode_string_json(stripped)) - html.write("]") + if type(content) == unicode: + content = content.encode("utf-8") + else: + content = str(content) + content = html.strip_tags(content.replace("<br>","\n")) - html.write("\n]\n") + painted_row.append(content) + + painted_rows.append(painted_row) + + html.write(json.dumps(painted_rows, indent=True)) multisite_layouts["json_export"] = {

8 years, 6 months

#3228 The BI Treestate painter now exports the aggregation tree as real json structure

by Lars Michelsen

Module: check_mk Branch: master Commit: dcece475b73aa96d94a5fc1a7e5005d771b7a271 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcece475b73aa9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:31:14 2016 +0100 #3228 The BI Treestate painter now exports the aggregation tree as real json structure --- .werks/3228 | 7 +++++ ChangeLog | 1 + web/htdocs/bi.py | 65 +++++++++++++++++++++++++++++++++++++++++++++-- web/plugins/views/bi.py | 10 ++++++-- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/.werks/3228 b/.werks/3228 new file mode 100644 index 0000000..cde3b7d --- /dev/null +++ b/.werks/3228 @@ -0,0 +1,7 @@ +Title: The BI Treestate painter now exports the aggregation tree as real json structure +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1456842643 +Class: feature diff --git a/ChangeLog b/ChangeLog index 2a84e11..fcb7d6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ Multisite: * 3187 notification view: new filter for log command via regex + * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c4d32c1..eea8175 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1502,6 +1502,69 @@ def ajax_render_tree(): raise MKGeneralException(_("Unknown BI Aggregation %s") % aggr_title) +def render_tree_json(row): + expansion_level = int(html.var("expansion_level", 999)) + + saved_expansion_level = load_ex_level() + treestate = html.get_tree_states('bi') + if expansion_level != saved_expansion_level: + treestate = {} + html.set_tree_states('bi', treestate) + html.save_tree_states() + + + def render_node_json(tree, show_host): + is_leaf = len(tree) == 3 + if is_leaf: + service = tree[2].get("service") + if not service: + title = _("Host status") + else: + title = service + else: + title = tree[2]["title"] + + json_node = { + "title" : title, + # 2 -> This element is currently in a scheduled downtime + # 1 -> One of the subelements is in a scheduled downtime + "in_downtime" : tree[0]["in_downtime"], + "acknowledged" : tree[0]["acknowledged"], + "in_service_period" : tree[0]["in_service_period"], + } + + # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) + if tree[1] and tree[0] != tree[1]: + json_node["assumed"] = True + effective_state = tree[1] + else: + json_node["assumed"] = False + effective_state = tree[0] + + json_node["state"] = effective_state["state"] + json_node["output"] = effective_state["output"] + + return json_node + + + def render_subtree_json(node, path, show_host): + json_node = render_node_json(node, show_host) + + is_leaf = len(node) == 3 + if not is_leaf: + json_node["nodes"] = [] + for child_node in node[3]: + if not child_node[2].get("hidden"): + new_path = path + [child_node[2]["title"]] + json_node["nodes"].append(render_subtree_json(child_node, new_path, show_host)) + + return json_node + + root_node = row["aggr_treestate"] + affected_hosts = row["aggr_hosts"] + + return "", render_subtree_json(root_node, [root_node[2]["title"]], len(affected_hosts) > 1) + def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, lazy): saved_expansion_level = load_ex_level() @@ -1585,8 +1648,6 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, h += '<ul id="%d:%s" %sclass="subtree">' % (expansion_level or 0, path_id, style) if not omit_content: for node in tree[3]: - estate = node[1] != None and node[1] or node[0] - if not node[2].get("hidden"): new_path = path + [node[2]["title"]] h += '<li>' + render_subtree(node, new_path, show_host) + '</li>\n' diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 1531213..f0a743a 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -299,10 +299,15 @@ def paint_aggr_tree_ltr(row, mirror): h += '</table>' return "aggrtree", h + def paint_aggregated_tree_state(row): - treetype = get_painter_option("aggr_treetype") + if html.is_api_call(): + return bi.render_tree_json(row) + + treetype = get_painter_option("aggr_treetype") expansion_level = int(get_painter_option("aggr_expand")) - only_problems = get_painter_option("aggr_onlyproblems") == "1" + only_problems = get_painter_option("aggr_onlyproblems") == "1" + if treetype == "foldable": return bi.render_tree_foldable(row, False, False, expansion_level, only_problems, lazy=True) elif treetype == "boxes": @@ -314,6 +319,7 @@ def paint_aggregated_tree_state(row): elif treetype == "top-down": return paint_aggr_tree_ltr(row, True) + multisite_painters["aggr_treestate"] = { "title" : _("Aggregation: complete tree"), "short" : _("Tree"),

8 years, 6 months

Added helper function to tell caller that this the current request is an API call , not rendering output to HTML

by Lars Michelsen

Module: check_mk Branch: master Commit: 3184bf209725c5826df810db86bc6119d84f330b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3184bf209725c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:19:51 2016 +0100 Added helper function to tell caller that this the current request is an API call, not rendering output to HTML --- web/htdocs/htmllib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4644683..a24fa4f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -135,6 +135,9 @@ class html(GUITester): def is_mobile(self): return self.mobile + def is_api_call(self): + return self.output_format != "html" + def get_user_agent(self): raise MKGeneralException("get_user_agent not implemented")

8 years, 6 months

#3255 FIX apc_inrow_temp: fixed wrong discovery handling of available sensors

by Simon Betz

Module: check_mk Branch: master Commit: c34f0476b3425972c2d2f6cd7f897ee9568c4773 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c34f0476b34259… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 1 15:25:40 2016 +0100 #3255 FIX apc_inrow_temp: fixed wrong discovery handling of available sensors --- .werks/3255 | 10 ++++++ ChangeLog | 1 + checks/apc_inrow_temp | 93 +++++++++++++++++++------------------------------ 3 files changed, 46 insertions(+), 58 deletions(-) diff --git a/.werks/3255 b/.werks/3255 new file mode 100644 index 0000000..3cd1295 --- /dev/null +++ b/.werks/3255 @@ -0,0 +1,10 @@ +Title: apc_inrow_temp: fixed wrong discovery handling of available sensors +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456842114 + + diff --git a/ChangeLog b/ChangeLog index 34e38aa..2a84e11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 3084 FIX: windows agent: fixed crash when specifying an invalid performance counter * 3252 FIX: ntp.time: better handling of temporary synchronization loss... * 3254 FIX: haproxy: fixed wrong type handling + * 3255 FIX: apc_inrow_temp: fixed wrong discovery handling of available sensors Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/apc_inrow_temp b/checks/apc_inrow_temp index 4e86aa1..4ed7bb7 100644 --- a/checks/apc_inrow_temp +++ b/checks/apc_inrow_temp @@ -24,79 +24,56 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Structure of relevant MIB part (all are integers): -# airIRRCUnitStatusOperateMode 1.3.6.1.4.1.318.1.1.13.3.2.2.2.1.0 -# airIRRCUnitStatusCoolOutput 1.3.6.1.4.1.318.1.1.13.3.2.2.2.2.0 -# airIRRCUnitStatusCoolDemand 1.3.6.1.4.1.318.1.1.13.3.2.2.2.3.0 -# airIRRCUnitStatusAirFlowUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.4.0 -# airIRRCUnitStatusAirFlowMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.5.0 -# airIRRCUnitStatusRackInletTempUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.6.0 -# airIRRCUnitStatusRackInletTempMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.7.0 -# airIRRCUnitStatusSupplyAirTempUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.8.0 -# airIRRCUnitStatusSupplyAirTempMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.9.0 -# airIRRCUnitStatusReturnAirTempUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.10.0 -# airIRRCUnitStatusReturnAirTempMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.11.0 -# airIRRCUnitStatusContainmtDPUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.12.0 -# airIRRCUnitStatusContainmtDPMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.13.0 -# airIRRCUnitStatusFilterDPUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.14.0 -# airIRRCUnitStatusFilterDPMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.15.0 -# airIRRCUnitStatusFanSpeed 1.3.6.1.4.1.318.1.1.13.3.2.2.2.16.0 -# airIRRCUnitStatusInputState 1.3.6.1.4.1.318.1.1.13.3.2.2.2.17.0 -# airIRRCUnitStatusOutputState 1.3.6.1.4.1.318.1.1.13.3.2.2.2.18.0 -# airIRRCUnitStatusActivePowerSource 1.3.6.1.4.1.318.1.1.13.3.2.2.2.19.0 -# airIRRCUnitStatusFluidValvePosition 1.3.6.1.4.1.318.1.1.13.3.2.2.2.20.0 -# airIRRCUnitStatusFluidFlowUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.21.0 -# airIRRCUnitStatusFluidFlowMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.22.0 -# airIRRCUnitStatusEnteringFluidTemperatureUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.23.0 -# airIRRCUnitStatusEnteringFluidTemperatureMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.24.0 -# airIRRCUnitStatusLeavingFluidTemperatureUS 1.3.6.1.4.1.318.1.1.13.3.2.2.2.25.0 -# airIRRCUnitStatusLeavingFluidTemperatureMetric 1.3.6.1.4.1.318.1.1.13.3.2.2.2.26.0 + +# .1.3.6.1.4.1.318.1.1.13.3.2.2.2.7.0 197 --> PowerNet-MIB::airIRRCUnitStatusRackInletTempMetric.0 +# .1.3.6.1.4.1.318.1.1.13.3.2.2.2.9.0 202 --> PowerNet-MIB::airIRRCUnitStatusSupplyAirTempMetric.0 +# .1.3.6.1.4.1.318.1.1.13.3.2.2.2.11.0 219 --> PowerNet-MIB::airIRRCUnitStatusReturnAirTempMetric.0 +# .1.3.6.1.4.1.318.1.1.13.3.2.2.2.24.0 131 --> PowerNet-MIB::airIRRCUnitStatusEnteringFluidTemperatureMetric.0 +# .1.3.6.1.4.1.318.1.1.13.3.2.2.2.26.0 154 --> PowerNet-MIB::airIRRCUnitStatusLeavingFluidTemperatureMetric.0 + factory_settings["apc_inrow_temp_default_levels"] = { "levels": ( 30, 35 ) } -def apc_inrow_temp_convert(info): - vars = [ - "Rack Inlet", - "Supply Air", - "Return Air", - "Entering Fluid", - "Leaving Fluid", - ] - count = 0 - data = {} - for name in vars: - if len(info) > count and info[count] != "-1": - value = int(info[count][0]) - data[name] = value / 10.0 - count += 1 - return data +def parse_apc_inrow_temp(info): + parsed = {} + for what, what_item in zip(info[0], + ["Rack Inlet", "Supply Air", "Return Air", + "Entering Fluid", "Leaving Fluid" + ]): + if what != "" or what != "-1": + parsed[what_item] = float(what) / 10 + + return parsed -def inventory_apc_inrow_temp(info): - if info: - info = apc_inrow_temp_convert(info) - for key in info.keys(): - yield key, {} +def inventory_apc_inrow_temp(parsed): + for key in parsed: + yield key, {} -def check_apc_inrow_temp(item, params, info): - info = apc_inrow_temp_convert(info) - for sensor, value in info.items(): - if sensor == item: - return check_temperature(value, params, "apc_inrow_temp_%s" % item) + +def check_apc_inrow_temp(item, params, parsed): + if item in parsed: + return check_temperature(parsed[item], params, "apc_inrow_temp_%s" % item) check_info["apc_inrow_temp"] = { - "check_function" : check_apc_inrow_temp, + "parse_function" : parse_apc_inrow_temp, "inventory_function" : inventory_apc_inrow_temp, + "check_function" : check_apc_inrow_temp, "service_description" : "Temperature %s", - "group" : "temperature", - "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ 7, 9, 11, 24, 26 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.318.1.1.13.3.2.2.2", [ + "7", # airIRRCUnitStatusRackInletTempMetric + "9", # airIRRCUnitStatusSupplyAirTempMetric + "11", # airIRRCUnitStatusReturnAirTempMetric + "24", # airIRRCUnitStatusEnteringFluidTemperatureMetric + "26", # airIRRCUnitStatusLeavingFluidTemperatureMetric + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), + "group" : "temperature", "includes" : [ "temperature.include" ], "default_levels_variable" : "apc_inrow_temp_default_levels" } -

8 years, 6 months

#2999 The contact name is now included in Event Console notifications

by Andreas Boesl

Module: check_mk Branch: master Commit: 9272cfc1c6023f2c68b0e1f5a4ab528609bedace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9272cfc1c6023f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 1 11:48:13 2016 +0100 #2999 The contact name is now included in Event Console notifications The contact name is available in the environment variable NOTIFY_EC_CONTACT. --- mkeventd/bin/mkeventd | 1 + 1 file changed, 1 insertion(+) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 7e0f138..28a8812 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3362,6 +3362,7 @@ def do_notify(event, username, is_cancelling): "EC_PHASE": event["phase"], "EC_COMMENT": event.get("comment", ""), "EC_OWNER": event.get("owner", ""), + "EC_CONTACT": event.get("contact", ""), "EC_PID": str(event.get("pid", 0)), "EC_MATCH_GROUPS": "\t".join(event["match_groups"]), "EC_CONTACT_GROUPS": event["contact_groups"] and " ".join(event["contact_groups"]) or "",

8 years, 6 months

#2999 The contact name is now included in Event Console notifications

by Andreas Boesl

Module: check_mk Branch: master Commit: 0b199900f2f80503584ff46529009bdd348edafc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b199900f2f805… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 1 11:48:13 2016 +0100 #2999 The contact name is now included in Event Console notifications The contact name is available in the environment variable NOTIFY_EC_CONTACT. --- .werks/2999 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2999 b/.werks/2999 new file mode 100644 index 0000000..5a64ded --- /dev/null +++ b/.werks/2999 @@ -0,0 +1,9 @@ +Title: The contact name is now included in Event Console notifications +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.9i1 +Date: 1456829159 +Class: feature + +The contact name is available in the environment variable NOTIFY_EC_CONTACT. diff --git a/ChangeLog b/ChangeLog index 2074fb5..34e38aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * 3249 FIX: Fix missing filter for non-OK services when report is called via context button Event Console: + * 2999 The contact name is now included in Event Console notifications... * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... Livestatus:

8 years, 6 months

Updated bug entries #2460

by Lars Michelsen

Module: check_mk Branch: master Commit: 90da7e6d480557bec797233e860991fb23a1b96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90da7e6d480557… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 11:17:34 2016 +0100 Updated bug entries #2460 --- .bugs/2460 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2460 b/.bugs/2460 new file mode 100644 index 0000000..c8b9b7a --- /dev/null +++ b/.bugs/2460 @@ -0,0 +1,8 @@ +Title: BI Aggregation tree is not rendered in PDF reports +Component: multisite +State: open +Date: 2016-03-01 11:16:33 +Targetversion: 1.2.8 +Class: bug + +The content of the BI tree state is only shown as text. The HTML tags are stripped of the painter.

8 years, 6 months

Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: a449d3190f7c35bac7b51d2340ba8ed76831b90d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a449d3190f7c35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 11:16:05 2016 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1db299c..ee84bf6 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2460 +2480

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016