Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Users: Authorized sites attribute can now be locked

by Lars Michelsen

Module: check_mk Branch: master Commit: f9773030dbc7019d066e48ee34a4acfa80352634 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9773030dbc701… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 09:43:21 2017 +0200 Users: Authorized sites attribute can now be locked Change-Id: If82414dc4e3f8a2f98bdbca043c1385b8fd6d98e --- web/htdocs/wato.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08bdca7..2aee9eb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10776,8 +10776,11 @@ def mode_edit_user(phase): html.help(vs_customer.help()) forms.section(vs_sites.title()) - vs_sites.render_input("authorized_sites", - user.get("authorized_sites", vs_sites.default_value())) + authorized_sites = user.get("authorized_sites", vs_sites.default_value()) + if not is_locked("authorized_sites"): + vs_sites.render_input("authorized_sites", authorized_sites) + else: + html.write_html(vs_sites.value_to_text(authorized_sites)) html.help(vs_sites.help()) custom_user_attributes('ident')

6 years, 11 months

updated werk #5028

by Simon Betz

Module: check_mk Branch: master Commit: 0e70f8a3c90b9105831205d8b94edb093bc5330c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e70f8a3c90b91… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 24 09:10:00 2017 +0200 updated werk #5028 Change-Id: Ie192e4a0df51490b5ce58c59ea1338fea8e3e3e1 --- checks/fortigate_sensors | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/checks/fortigate_sensors b/checks/fortigate_sensors index bb0149e..94595d7 100644 --- a/checks/fortigate_sensors +++ b/checks/fortigate_sensors @@ -30,14 +30,19 @@ def inventory_fortigate_sensors(info): def check_fortigate_sensors(item, params, info): + amount_of_sensors = [] sensors_in_alarm = [] - infotexts = ["%s sensors" % len(info)] for name, value, dev_status in info: - if value != "0" and dev_status == "1": - sensors_in_alarm.append(name) + # We assume that sensors with value "0" are not connected. + # The related MIB includes no other hint for that. + if value != "0": + amount_of_sensors.append(name) + if dev_status == "1": + sensors_in_alarm.append(name) - count_ok_sensors = len(info) - len(sensors_in_alarm) + infotexts = ["%s sensors" % len(amount_of_sensors)] + count_ok_sensors = len(amount_of_sensors) - len(sensors_in_alarm) if count_ok_sensors: infotexts.append("%s OK" % count_ok_sensors)

6 years, 11 months

Fixed JS error when toggling hw/sw inventory trees

by Lars Michelsen

Module: check_mk Branch: master Commit: 42f4c07e0a32353c89b65adc99d908d5bdc1e1b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f4c07e0a3235… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 08:21:22 2017 +0200 Fixed JS error when toggling hw/sw inventory trees Change-Id: I291e18ea8cef10ecea781ed7704c79683813cefe --- web/htdocs/htmllib.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 5dd2275..482610e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2560,13 +2560,15 @@ class html(HTMLGenerator, RequestHandler): onclick = "toggle_foldable_container(\'%s\', \'%s\', \'%s\')"\ % (treename, id, fetch_url if fetch_url else '') + img_id = "treeimg.%s.%s" % (treename, id) + if indent == "nform": self.open_tr(class_="heading") self.open_td(id_="nform.%s.%s" % (treename, id), onclick=onclick, colspan="2") if icon: self.img(class_=["treeangle", "title"], src="images/icon_%s.png" % icon) else: - self.img(class_=["treeangle", "nform", "open" if isopen else "closed"], + self.img(id_=img_id, class_=["treeangle", "nform", "open" if isopen else "closed"], src="images/%s_closed.png" % tree_img, align="absbottom") self.write_text(title) self.close_td()

6 years, 11 months

Disabled forms in views can not be opened anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 03413d2915f63a734058e573ff16a7a3da467379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03413d2915f63a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 21 09:10:05 2017 +0200 Disabled forms in views can not be opened anymore Change-Id: Ia1c9337f60c143f2cb13edc008124f17961ab00f --- .bugs/2929 | 6 ++++-- web/htdocs/htmllib.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.bugs/2929 b/.bugs/2929 index beb1e0e..9540f1c 100644 --- a/.bugs/2929 +++ b/.bugs/2929 @@ -1,10 +1,12 @@ Title: Command box in views is openable even if the icon is disabled Component: multisite -State: open +Class: bug +State: done Date: 2017-07-18 11:29:49 Targetversion: 1.4.0 -Class: bug If you have a view with no services then the icon for the command box is diabled. But nevertheless you can open the box by clicking on it. This is not good. + +2017-07-21 09:10:18: changed state open -> done diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 735347c..5dd2275 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2128,7 +2128,7 @@ class html(HTMLGenerator, RequestHandler): if is_context_button: self.begin_context_buttons() # TODO: Check all calls. If done before, remove this! - if not onclick: + if not onclick and not disabled: onclick = "view_toggle_form(this.parentNode, '%s');" % id if disabled:

6 years, 11 months

Refactored speedometer snapin (use async ajax; moved to new snapin API)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a0ba26fbb14d7b860943e28edff4ffea25857c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a0ba26fbb14d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 07:44:27 2017 +0200 Refactored speedometer snapin (use async ajax; moved to new snapin API) Change-Id: Ibd4b793b40be7b3021618727461db4f452215020 --- web/htdocs/js/checkmk.js | 1 - web/htdocs/sidebar.py | 47 ---------- web/plugins/pages/shipped.py | 1 - web/plugins/sidebar/shipped.py | 204 +++++++++++++++++++++++++++++------------ 4 files changed, 147 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5a0ba26fbb…

6 years, 11 months

Cleaned up several synchronous ajax calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d5c5caa0fa9ffc5f767e86cae9be61cc092c981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d5c5caa0fa9ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 24 08:21:59 2017 +0200 Cleaned up several synchronous ajax calls Change-Id: I5d45b476fbcd2b43dce17b5325e7b044a6bdd5f7 --- web/htdocs/js/checkmk.js | 135 +++++++++++++++++++++++++++-------------- web/plugins/sidebar/shipped.py | 15 +++-- 2 files changed, 100 insertions(+), 50 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index e0114c5..cdbc417 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -531,12 +531,6 @@ function get_url(url, handler, data, errorHandler, addAjaxId) call_ajax(url, args); } -function get_url_sync(url) -{ - var AJAX = call_ajax(url, {sync:true}); - return AJAX.responseText; -} - function post_url(url, post_params, responseHandler, handler_data, errorHandler) { var args = { @@ -1318,9 +1312,19 @@ function toggle_tree_state(tree, name, oContainer, fetch_url) { var state; if (has_class(oContainer, 'closed')) { change_class(oContainer, 'closed', 'open'); + if (fetch_url && !oContainer.innerHTML) { - oContainer.innerHTML = get_url_sync(fetch_url); + call_ajax(fetch_url, { + method : "GET", + response_handler : function(handler_data, response_body) { + handler_data.container.innerHTML = response_body; + }, + handler_data : { + container: oContainer + } + }); } + state = 'on'; if (oContainer.tagName == 'TR') { // handle in-table toggling while (oContainer = oContainer.nextElementSibling) @@ -1353,13 +1357,17 @@ function toggle_foldable_container(treename, id, fetch_url) { var oImg = oNform.children[0]; var oTr = oNform.parentNode.nextElementSibling; toggle_tree_state(treename, id, oTr, fetch_url); - toggle_folding(oImg, !has_class(oTr, "closed")); + + if (oImg) + toggle_folding(oImg, !has_class(oTr, "closed")); } else { var oImg = document.getElementById('treeimg.' + treename + '.' + id); var oBox = document.getElementById('tree.' + treename + '.' + id); toggle_tree_state(treename, id, oBox, fetch_url); - toggle_folding(oImg, !has_class(oBox, "closed")); + + if (oImg) + toggle_folding(oImg, !has_class(oBox, "closed")); } } @@ -1919,7 +1927,10 @@ function count_context_button(oA) { // Extract view name from id of parent div element var id = oA.parentNode.id; - get_url_sync("count_context_button.py?id=" + id); + var AJAX = call_ajax("count_context_button.py?id=" + id, { + sync:true + }); + return AJAX.responseText; } function unhide_context_buttons(oA) @@ -2784,10 +2795,9 @@ function optiondial_wheel(event) { function view_dial_option(oDiv, viewname, option, choices) { // prevent double click from select text var new_choice = choices[0]; // in case not contained in choices - for (var c=0; c<choices.length; c++) { + for (var c = 0, choice = null, val = null; c < choices.length; c++) { choice = choices[c]; val = choice[0]; - title = choice[1]; if (has_class(oDiv, "val_" + val)) { var new_choice = choices[(c + choices.length + g_dial_direction) % choices.length]; change_class(oDiv, "val_" + val, "val_" + new_choice[0]); @@ -2796,23 +2806,42 @@ function view_dial_option(oDiv, viewname, option, choices) { } // Start animation - step = 0; - speed = 10; + var step = 0; + var speed = 10; + for (var way = 0; way <= 10; way +=1) { step += speed; - setTimeout("turn_dial('" + option + "', '', " + way + "," + g_dial_direction + ")", step); + setTimeout(function(option, text, way, direction) { + return function() { + turn_dial(option, text, way, direction); + }; + }(option, "", way, g_dial_direction), step); } + for (var way = -10; way <= 0; way +=1) { step += speed; - setTimeout("turn_dial('" + option + "', '" + new_choice[1] + "', " + way + "," + g_dial_direction + ")", step); + setTimeout(function(option, text, way, direction) { + return function() { + turn_dial(option, text, way, direction); + }; + }(option, new_choice[1], way, g_dial_direction), step); } - get_url_sync("ajax_set_viewoption.py?view_name=" + viewname + - "&option=" + option + "&value=" + new_choice[0]); - if (option == "refresh") - set_reload(new_choice[0]); - else - schedule_reload('', 400.0); + var url = "ajax_set_viewoption.py?view_name=" + viewname + + "&option=" + option + "&value=" + new_choice[0]; + call_ajax(url, { + method : "GET", + response_handler : function(handler_data, response_body) { + if (handler_data.option == "refresh") + set_reload(handler_data.new_value); + else + schedule_reload('', 400.0); + }, + handler_data : { + new_value : new_choice[0], + option : option + } + }); } // way ranges from -10 to 10 means centered (normal place) @@ -2846,16 +2875,26 @@ function view_switch_option(oDiv, viewname, option, choices) { } new_choice = [ new_value, '' ]; - get_url_sync("ajax_set_viewoption.py?view_name=" + viewname + - "&option=" + option + "&value=" + new_choice[0]); + var url = "ajax_set_viewoption.py?view_name=" + viewname + + "&option=" + option + "&value=" + new_choice[0]; - if (option == "refresh") { - set_reload(new_choice[0]); - } else if (option == "show_checkboxes") { - g_selection_enabled = new_value; - } + call_ajax(url, { + method : "GET", + response_handler : function(handler_data, response_body) { + if (handler_data.option == "refresh") { + set_reload(handler_data.new_value); + } else if (handler_data.option == "show_checkboxes") { + g_selection_enabled = handler_data.new_value; + } + + handleReload(''); + }, + handler_data : { + new_value : new_value, + option : option + } + }); - handleReload(''); } var g_hosttag_groups = {}; @@ -3189,23 +3228,29 @@ function pagetype_add_to_container(page_type, page_name) close_popup(); - response = get_url_sync('ajax_pagetype_add_element.py' - + '?page_type=' + page_type - + '&page_name=' + page_name - + '&element_type=' + element_type - + '&create_info=' + encodeURIComponent(create_info_json)); popup_data = null; - // We get to lines of response. The first is an URL we should be - // redirected to. The second is "true" if we should reload the - // sidebar. - if (response) { - var parts = response.split('\n'); - if (parts[1] == "true") - reload_sidebar(); - if (parts[0]) - window.location.href = parts[0]; - } + var url = 'ajax_pagetype_add_element.py' + + '?page_type=' + page_type + + '&page_name=' + page_name + + '&element_type=' + element_type + + '&create_info=' + encodeURIComponent(create_info_json); + + call_ajax(url, { + method : "GET", + response_handler : function(handler_data, response_body) { + // We get to lines of response. The first is an URL we should be + // redirected to. The second is "true" if we should reload the + // sidebar. + if (response_body) { + var parts = response_body.split('\n'); + if (parts[1] == "true") + reload_sidebar(); + if (parts[0]) + window.location.href = parts[0]; + } + } + }); } //#. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 59a965e..731bc51 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1031,7 +1031,6 @@ function speedometer_show_speed(last_perc, program_start, scheduled_rate) response_handler: function(handler_data, response_body) { try { var data = JSON.parse(response_body); - console.log(data); oDiv = document.getElementById('speedometer'); @@ -2173,14 +2172,20 @@ class VirtualHostTree(SidebarSnapin): function virtual_host_tree_changed(field) { var tree_id = field.value; - get_url_sync('sidebar_ajax_tag_tree.py?tree_id=' + escape(tree_id)); - refresh_single_snapin("tag_tree"); + call_ajax('sidebar_ajax_tag_tree.py?tree_id=' + escape(tree_id), { + response_handler : function(handler_data, response_body) { + refresh_single_snapin("tag_tree"); + } + }); } function virtual_host_tree_enter(path) { - get_url_sync('sidebar_ajax_tag_tree_enter.py?path=' + escape(path)); - refresh_single_snapin("tag_tree"); + call_ajax('sidebar_ajax_tag_tree_enter.py?path=' + escape(path), { + response_handler : function(handler_data, response_body) { + refresh_single_snapin("tag_tree"); + } + }); } """

6 years, 11 months

5003 FIX Fixed missing filtering by effective contact groups of events

by Lars Michelsen

Module: check_mk Branch: master Commit: d2a5d38d373b04cf316065bda90c53f40dbd1132 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2a5d38d373b04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 15:42:20 2017 +0200 5003 FIX Fixed missing filtering by effective contact groups of events Since 1.4 the Event console has the concept of "effective contact groups" for an event. The contact groups of an event can either be set by a matched host or by the matching rule. Or by both. For the later case there is an option to configure the precedence in the rule. The GUI was not correctly reflecting this feature because there was no painter and no filter for the effective contact groups. Change-Id: I81b0285f3f9b0dff8326ad58eabaf4c570e97a50 --- .werks/5003 | 17 +++++++++++++++ web/plugins/views/mkeventd.py | 28 ++++++++++++++++++++---- web/plugins/visuals/mkeventd.py | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 4 deletions(-) diff --git a/.werks/5003 b/.werks/5003 new file mode 100644 index 0000000..c9b64a7 --- /dev/null +++ b/.werks/5003 @@ -0,0 +1,17 @@ +Title: Fixed missing filtering by effective contact groups of events +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500557807 + +Since 1.4 the Event console has the concept of "effective contact groups" for +an event. The contact groups of an event can either be set by a matched host +or by the matching rule. Or by both. For the later case there is an option +to configure the precedence in the rule. + +The GUI was not correctly reflecting this feature because there was no painter +and no filter for the effective contact groups. diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 99c5420..e16e0a5 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -441,11 +441,31 @@ if mkeventd_enabled: multisite_painters["event_contact_groups"] = { "title" : _("Contact groups defined in rule"), - "short" : _("Rule Contact Groups"), + "short" : _("Rule contact groups"), "columns" : [ "event_contact_groups" ], "paint" : paint_event_contact_groups, } + def paint_event_effective_contact_groups(row): + if row["event_contact_groups_precedence"] == "host": + cgs = row["host_contact_groups"] + else: + cgs = row["event_contact_groups"] + + if cgs == None: + return "", "" + elif cgs: + return "", ", ".join(sorted(cgs)) + else: + return "", "<i>" + _("none") + "</i>" + + multisite_painters["event_effective_contact_groups"] = { + "title" : _("Contact groups effective (Host or rule contact groups)"), + "short" : _("Contact groups"), + "columns" : [ "event_contact_groups", "event_contact_groups_precedence", "host_contact_groups" ], + "paint" : paint_event_effective_contact_groups, + } + # Event History multisite_painters["history_line"] = { @@ -942,7 +962,7 @@ if mkeventd_enabled: ('event_count', None, None), ('event_sl', None, None), ('event_contact', None, None), - ('event_contact_groups', None, None), + ('event_effective_contact_groups', None, None), ('event_application', None, None), ('event_pid', None, None), ('event_priority', None, None), @@ -1044,7 +1064,7 @@ if mkeventd_enabled: ('event_count', None, None), ('event_sl', None, None), ('event_contact', None, None), - ('event_contact_groups', None, None), + ('event_effective_contact_groups', None, None), ('event_application', None, None), ('event_pid', None, None), ('event_priority', None, None), @@ -1176,7 +1196,7 @@ if mkeventd_enabled: ('event_count', None, None), ('event_sl', None, None), ('event_contact', None, None), - ('event_contact_groups', None, None), + ('event_effective_contact_groups', None, None), ('event_application', None, None), ('event_pid', None, None), ('event_priority', None, None), diff --git a/web/plugins/visuals/mkeventd.py b/web/plugins/visuals/mkeventd.py index b28acac..2d35e1d 100644 --- a/web/plugins/visuals/mkeventd.py +++ b/web/plugins/visuals/mkeventd.py @@ -196,3 +196,50 @@ if mkeventd_enabled: declare_filter(210, EventFilterDropdown("facility", _("Syslog Facility"), mkeventd.syslog_facilities)) declare_filter(211, EventFilterDropdown("sl", _("Service Level at least"), mkeventd.service_levels, operator='>=')) declare_filter(211, EventFilterDropdown("sl_max", _("Service Level at most"), mkeventd.service_levels, operator='<=', column="sl")) + + + class EventFilterEffectiveContactGroupCombo(FilterGroupCombo): + def __init__(self, enforce=False): + # TODO: Cleanup hierarchy here. The FilterGroupCombo constructor needs to be refactored + FilterGroupCombo.__init__(self, + what="event_effective_contact", + title=_("Contact group (effective)"), + enforce=enforce, + ) + self.what = "contact" + self.info = "event" + self.link_columns = [ "event_contact_groups", "event_contact_groups_precedence", "host_contact_groups" ] + + + def filter(self, infoname): + if not html.has_var(self.htmlvars[0]): + return "" # Skip if filter is not being set at all + + current_value = self.current_value() + if not current_value: + if not self.enforce: + return "" + current_value = sites.live().query_value("GET contactgroups\nCache: reload\nColumns: name\nLimit: 1\n", None) + + if current_value == None: + return "" # no {what}group exists! + + if not self.enforce and html.var(self.htmlvars[1]): + negate = "!" + else: + negate = "" + + return "Filter: event_contact_groups_precedence = host\n" \ + "Filter: host_contact_groups %s>= %s\n" \ + "And: 2\n" \ + "Filter: event_contact_groups_precedence = rule\n" \ + "Filter: event_contact_groups %s>= %s\n" \ + "And: 2\n" \ + "Or: 2\n" % (negate, lqencode(current_value), + negate, lqencode(current_value)) + + + def variable_settings(self, row): + return [] + + declare_filter(212, EventFilterEffectiveContactGroupCombo())

6 years, 11 months

5028 fortigate_sync_status, fortigate_sensors

by Jukka Aro

Module: check_mk Branch: master Commit: fbc7bd421ca12f0eac9e7516b06ee9e513f0a917 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbc7bd421ca12f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jul 14 13:52:44 2017 +0200 5028 fortigate_sync_status, fortigate_sensors Add two new checks for Fortigate firewall devices: * Check sync status of FortiGate cluster. * Check the combined alarm status of sensors of a Fortigate firewall device. Change-Id: I577f4c0cf7d91749c337f2da53f0a67aed65f593 --- .werks/5028 | 13 ++++++++ checkman/fortigate_sensors | 10 +++++++ checkman/fortigate_sync_status | 10 +++++++ checks/fortigate_sensors | 67 ++++++++++++++++++++++++++++++++++++++++++ checks/fortigate_sync_status | 53 +++++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+) diff --git a/.werks/5028 b/.werks/5028 new file mode 100644 index 0000000..e168ace --- /dev/null +++ b/.werks/5028 @@ -0,0 +1,13 @@ +Title: fortigate_sync_status, fortigate_sensors: New checks +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1500033135 +Class: feature + +Two new checks were added for Fortigate Firewall devices. The first +check monitors the synchronization statuses of Fortigate High-Availabity +Clusters. The second check monitors the overall alarm statuses of +sensors of Fortigate Firewall devices. diff --git a/checkman/fortigate_sensors b/checkman/fortigate_sensors new file mode 100644 index 0000000..85fe83e --- /dev/null +++ b/checkman/fortigate_sensors @@ -0,0 +1,10 @@ +title: FortiGate firewalls: Sensor Summary +agents: snmp +catalog: hw/network/fortinet +license: GPL +distribution: check_mk +description: + This check monitors the overall alarm status of sensors of a FortiGate Firewall device. The status of the check is OK if all of the sensors have the alarm status 'false' (0) and CRIT if at least one sensor has the alarm status 'true' (1). + +inventory: + One service will be created. diff --git a/checkman/fortigate_sync_status b/checkman/fortigate_sync_status new file mode 100644 index 0000000..09497fd --- /dev/null +++ b/checkman/fortigate_sync_status @@ -0,0 +1,10 @@ +title: FortiGate firewall cluster monitoring: Sync Status +agents: snmp +catalog: hw/network/fortinet +license: GPL +distribution: check_mk +description: + This check monitors the synchronization status of a FortiGate High-Availability cluster. The status 'synchronized' is considered OK and the status 'unsynchronized' CRIT. + +inventory: + One service per cluster (a master and a slave node together) will be created. No service will be created for standalone firewalls (if only a master node is present). diff --git a/checks/fortigate_sensors b/checks/fortigate_sensors new file mode 100644 index 0000000..bb0149e --- /dev/null +++ b/checks/fortigate_sensors @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inventory_fortigate_sensors(info): + return [(None, None)] + + +def check_fortigate_sensors(item, params, info): + sensors_in_alarm = [] + infotexts = ["%s sensors" % len(info)] + + for name, value, dev_status in info: + if value != "0" and dev_status == "1": + sensors_in_alarm.append(name) + + count_ok_sensors = len(info) - len(sensors_in_alarm) + if count_ok_sensors: + infotexts.append("%s OK" % count_ok_sensors) + + state = 0 + if sensors_in_alarm: + infotexts.append("%s with alarm: %s" % \ + (len(sensors_in_alarm), + ", ".join(sensors_in_alarm))) + state = 2 + + return state, " - ".join(infotexts) + + +check_info['fortigate_sensors'] = { + 'inventory_function' : inventory_fortigate_sensors, + 'check_function' : check_fortigate_sensors, + 'service_description' : 'Sensor Summary', + 'snmp_info' : ('.1.3.6.1.4.1.12356.101.4.3.2.1', [ + '2', # FORTINET-FORTIGATE-MIB::fgHwSensorEntName + '3', # FORTINET-FORTIGATE-MIB::fgHwSensorEntValue + '4', # FORTINET-FORTIGATE-MIB::fgHwSensorEntAlarmStatus + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ + '.1.3.6.1.4.1.12356.101.1.5004', + '.1.3.6.1.4.1.12356.101.1.10004', + ], +} diff --git a/checks/fortigate_sync_status b/checks/fortigate_sync_status new file mode 100644 index 0000000..22f3d60 --- /dev/null +++ b/checks/fortigate_sync_status @@ -0,0 +1,53 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inventory_fortigate_sync_status(info): + return [(None, None)] if len(info) > 1 else [] + + +def check_fortigate_sync_status(_no_item, _no_params, info): + map_statuses = { + "0": (2, "unsynchronized"), + "1": (0, "synchronized") + } + + for name, dev_status in info: + status, status_readable = map_statuses[dev_status] + yield status, "%s: %s" % (name, status_readable) + + +check_info["fortigate_sync_status"] = { + "check_function" : check_fortigate_sync_status, + "inventory_function" : inventory_fortigate_sync_status, + "service_description" : "Sync Status", + "snmp_scan_function" : lambda oid: ( + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356.101.1") and + oid(".1.3.6.1.4.1.12356.101.13.2.1.1.12.1") is not None), + "snmp_info" : ( + ".1.3.6.1.4.1.12356.101.13.2.1.1", + [ "11", "12" ]), # fgHaStatsHostname, fgHaStatsSyncStatus +}

6 years, 11 months

Fixed compat issue with older lockfile module versions

by Lars Michelsen

Module: check_mk Branch: master Commit: c7e36d35ecf5d56b0c263247d03842ad5cbcb2ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e36d35ecf5d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 14:28:26 2017 +0200 Fixed compat issue with older lockfile module versions Change-Id: I7d7ecfc1a7a36c38779aadc92b70407b8a544d36 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3b5b2ef..1bb6e5a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -354,7 +354,7 @@ class Site(object): raise Exception("The site %s already exists." % self.id) if not self.exists(): - with lockfile.LockFile("/tmp/cmk-test-create-site.lock"): + with lockfile.FileLock("/tmp/cmk-test-create-site.lock"): print("[%0.2f] Creating site '%s'" % (time.time(), self.id)) p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", "-V", self.version.version_directory(),

6 years, 11 months

Tests: Use simple file lock to prevent race conditions during site creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f297833c60ce03526a126c01163c76f8e0def57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f297833c60ce0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 20 14:22:36 2017 +0200 Tests: Use simple file lock to prevent race conditions during site creation Change-Id: Ibea515d893f03c4366064d5faad21eb0771f8a96 --- tests/Makefile | 1 + tests/testlib/__init__.py | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index c803afa..a6055f2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -49,6 +49,7 @@ setup: python-pip \ python-lxml \ python-enchant \ + python-lockfile \ chrpath sudo pip install --upgrade pip sudo pip install --upgrade \ diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d077f30..3b5b2ef 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -13,6 +13,7 @@ import pipes import subprocess import sys import shutil +import lockfile from urlparse import urlparse from bs4 import BeautifulSoup @@ -353,16 +354,17 @@ class Site(object): raise Exception("The site %s already exists." % self.id) if not self.exists(): - print("[%0.2f] Creating site '%s'" % (time.time(), self.id)) - p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", - "-V", self.version.version_directory(), - "create", - "--admin-password", "cmk", - "--apache-reload", self.id]) - exit_code = p.wait() - print("[%0.2f] Executed create command" % time.time()) - assert exit_code == 0 - assert os.path.exists("/omd/sites/%s" % self.id) + with lockfile.LockFile("/tmp/cmk-test-create-site.lock"): + print("[%0.2f] Creating site '%s'" % (time.time(), self.id)) + p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", + "-V", self.version.version_directory(), + "create", + "--admin-password", "cmk", + "--apache-reload", self.id]) + exit_code = p.wait() + print("[%0.2f] Executed create command" % time.time()) + assert exit_code == 0 + assert os.path.exists("/omd/sites/%s" % self.id) if self.update_with_git: self._update_with_f12_files()

6 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017